From b42e9e9ab3a6481a94d809ba0d16dd83d82b3c3d Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Thu, 28 Mar 2024 09:29:57 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InventoryAndWarehousingController.java    | 36 ++++++++
 .../material/domain/PutInStorageBean.java     | 88 +++++++++++++++++++
 .../mapper/InventoryAndWarehousingMapper.java | 23 +++++
 .../InventoryAndWarehousingService.java       | 21 +++++
 .../InventoryAndWarehousingServiceImpl.java   | 26 ++++++
 .../InventoryAndWarehousingMapper.xml         | 25 ++++++
 6 files changed, 219 insertions(+)
 create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InventoryAndWarehousingController.java
 create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PutInStorageBean.java
 create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java
 create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/InventoryAndWarehousingService.java
 create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
 create mode 100644 sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InventoryAndWarehousingController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InventoryAndWarehousingController.java
new file mode 100644
index 00000000..e9111005
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InventoryAndWarehousingController.java
@@ -0,0 +1,36 @@
+package com.bonus.sgzb.material.controller;
+
+import com.bonus.sgzb.common.core.web.controller.BaseController;
+import com.bonus.sgzb.common.core.web.page.TableDataInfo;
+import com.bonus.sgzb.material.domain.PutInStorageBean;
+import com.bonus.sgzb.material.service.InventoryAndWarehousingService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+* @description 入库盘点
+* @author hay
+* @date   2024/3/27 13:28
+*/
+@Api(tags = " 入库盘点")
+@RestController
+@RequestMapping("/inventoryAndWarehousing")
+public class InventoryAndWarehousingController extends BaseController {
+    @Autowired
+    private InventoryAndWarehousingService inventoryAndWarehousingService;
+
+    /**
+     * 查询入库盘点列表
+     */
+    @ApiOperation(value = "获取入库盘点列表")
+    @GetMapping("/getList")
+    public TableDataInfo getList(PutInStorageBean bean) {
+        startPage();
+        List<PutInStorageBean> list = inventoryAndWarehousingService.getList(bean);
+        return getDataTable(list);
+    }
+}
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PutInStorageBean.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PutInStorageBean.java
new file mode 100644
index 00000000..b240ee45
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PutInStorageBean.java
@@ -0,0 +1,88 @@
+package com.bonus.sgzb.material.domain;
+
+import com.bonus.sgzb.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+* @description 入库盘点
+* @author hay
+* @date   2024/3/27 16:30
+*/
+@Data
+public class PutInStorageBean extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+    /** 入库形式 */
+    @ApiModelProperty(value = "入库形式")
+    private String putInType;
+
+    /** 入库数量 */
+    @ApiModelProperty(value = "入库数量")
+    private BigDecimal num;
+
+    /** 创建者 */
+    @ApiModelProperty(value = "创建者")
+    private Integer creator;
+
+    /** 入库人 */
+    @ApiModelProperty(value = "入库人")
+    private String userName;
+
+    /** 盘点入库单号 */
+    @ApiModelProperty(value = "盘点入库单号")
+    private String code;
+
+    /** 单位ID */
+    @ApiModelProperty(value = "单位ID")
+    private String unitId;
+
+    /** 单位名称 */
+    @ApiModelProperty(value = "单位名称")
+    private String unitName;
+
+    /** 工程ID */
+    @ApiModelProperty(value = "工程ID")
+    private String projectId;
+
+    /** 工程名称 */
+    @ApiModelProperty(value = "工程名称")
+    private String projectName;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期")
+    private String createDate;
+
+    /** 备注 */
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+    /** 主信息 */
+    @ApiModelProperty(value = "主信息")
+    private Integer info;
+
+    /** 库房 */
+    @ApiModelProperty(value = "库房")
+    private Integer ram;
+
+    /** 设备工器具类型 */
+    @ApiModelProperty(value = "设备工器具类型")
+    private Integer type;
+
+    /** 设备工器具类型名称 */
+    @ApiModelProperty(value = "设备工器具类型名称")
+    private String typeName;
+
+    /** 设备主键 */
+    @ApiModelProperty(value = "设备主键")
+    private Integer machine;
+
+}
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java
new file mode 100644
index 00000000..1b0a8047
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java
@@ -0,0 +1,23 @@
+package com.bonus.sgzb.material.mapper;
+
+import com.bonus.sgzb.material.domain.PutInStorageBean;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+* @description 入库盘点
+* @author hay
+* @date   2024/3/27 13:33
+*/
+@Mapper
+public interface InventoryAndWarehousingMapper {
+
+    /**
+     * 查询入库盘点列表
+     * @param bean
+     * @return 结果
+     */
+    List<PutInStorageBean> getList(PutInStorageBean bean);
+
+}
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/InventoryAndWarehousingService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/InventoryAndWarehousingService.java
new file mode 100644
index 00000000..1f4eab8c
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/InventoryAndWarehousingService.java
@@ -0,0 +1,21 @@
+package com.bonus.sgzb.material.service;
+
+
+import com.bonus.sgzb.material.domain.PutInStorageBean;
+
+import java.util.List;
+
+/**
+* @description 入库盘点
+* @author hay
+* @date   2024/3/27 13:31
+*/
+public interface InventoryAndWarehousingService {
+
+    /**
+    * 查询入库盘点列表
+    * @param bean
+    * @return 结果
+    */
+    List<PutInStorageBean> getList(PutInStorageBean bean);
+}
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
new file mode 100644
index 00000000..974a1d22
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
@@ -0,0 +1,26 @@
+package com.bonus.sgzb.material.service.impl;
+
+import com.bonus.sgzb.material.domain.PutInStorageBean;
+import com.bonus.sgzb.material.mapper.InventoryAndWarehousingMapper;
+import com.bonus.sgzb.material.service.InventoryAndWarehousingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @description 入库盘点
+* @author hay
+* @date   2024/3/27 13:32
+*/
+@Service
+public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousingService {
+
+    @Autowired
+    private InventoryAndWarehousingMapper inventoryAndWarehousingMapper;
+
+    @Override
+    public List<PutInStorageBean> getList(PutInStorageBean bean) {
+        return inventoryAndWarehousingMapper.getList(bean);
+    }
+}
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml
new file mode 100644
index 00000000..3f06814d
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bonus.sgzb.material.mapper.InventoryAndWarehousingMapper">
+
+    <select id="getList" resultType="com.bonus.sgzb.material.domain.PutInStorageBean">
+        SELECT
+            pisi.PUT_IN_TYPE as putInType,
+            lot.lot_name as projectName,
+            bui.unit_name as unitName,
+            pisi.`CODE` as code,
+            mt2.type_name as typeName,
+            su.user_name as userName,
+            pisi.CREATE_DATE as createDate
+        FROM
+            ma_type_put_in_storage_info pisi
+                LEFT JOIN ma_type_put_in_storage_details pisd on pisi.id=pisd.INFO
+                LEFT JOIN bm_project_lot lot on lot.lot_id=pisi.PROJECT_ID
+                LEFT JOIN bm_unit_info bui on bui.unit_id=pisi.UNIT_ID
+                LEFT JOIN ma_type mt on mt.type_id=pisd.TYPE
+                LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id
+                LEFT JOIN sys_user su on su.user_id=pisi.CREATOR
+    </select>
+</mapper>
\ No newline at end of file

From a9110b28d49a5857b4b6d96c164c263a7874726a Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Thu, 28 Mar 2024 09:43:17 +0800
Subject: [PATCH 2/5] test

---
 .../main/java/com/bonus/sgzb/app/controller/AppController.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java
index f6a91ac3..92bce39a 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java
@@ -53,6 +53,7 @@ public class AppController {
     @Log(title = "获取app版本信息", businessType = BusinessType.QUERY)
     @GetMapping("/getVersion")
     public AjaxResult getVersion() {
+
         try {
             List<AppVersion> list = service.getVersion();
             return success(list);

From 7508ee35d79dcae344a712b49f61b6a5d15c4766 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Thu, 28 Mar 2024 09:48:27 +0800
Subject: [PATCH 3/5] test

---
 .../main/java/com/bonus/sgzb/app/controller/AppController.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java
index 92bce39a..f6a91ac3 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java
@@ -53,7 +53,6 @@ public class AppController {
     @Log(title = "获取app版本信息", businessType = BusinessType.QUERY)
     @GetMapping("/getVersion")
     public AjaxResult getVersion() {
-
         try {
             List<AppVersion> list = service.getVersion();
             return success(list);

From 546b65a536aaa3abe7dc339b7dfe7736969d39b5 Mon Sep 17 00:00:00 2001
From: zhouzy062 <zhouzy062@tydic.com>
Date: Thu, 28 Mar 2024 10:02:48 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/api/claimAndRefund/receive.js     |  20 +-
 sgzb-ui/src/utils/dict/Dict.js                |   2 +-
 sgzb-ui/src/utils/globalUrl.js                |   6 +-
 .../claimAndRefund/receive/receiveOut.vue     | 474 +++++++++---------
 .../secondStore/inStoreBook.vue               |   6 +-
 .../secondStore/outStoreBook.vue              |   6 +-
 .../secondStore/secondStore.vue               |   8 +-
 .../newBuy/newDevices/newDevicesArrival.vue   |   4 -
 sgzb-ui/vue.config.js                         |   9 +-
 9 files changed, 273 insertions(+), 262 deletions(-)

diff --git a/sgzb-ui/src/api/claimAndRefund/receive.js b/sgzb-ui/src/api/claimAndRefund/receive.js
index e031c340..80a07407 100644
--- a/sgzb-ui/src/api/claimAndRefund/receive.js
+++ b/sgzb-ui/src/api/claimAndRefund/receive.js
@@ -227,8 +227,24 @@ export function getLeaseApplyAuditListAll(query) {
 }
 
 
-
-
+//领料出库 列表
+export function getLeaseAuditList(query) {
+  return request({
+    url: '/base/tm_task/getLeaseAuditList',
+    method: 'get',
+    params: query
+  })
+}
+
+
+//领料出库 详情
+export function getLeaseAuditListDetail(query) {
+  return request({
+    url: '/base/tm_task/getLeaseAuditListDetail',
+    method: 'get',
+    params: query
+  })
+}
 
 
 
diff --git a/sgzb-ui/src/utils/dict/Dict.js b/sgzb-ui/src/utils/dict/Dict.js
index 88ec49de..8fb6ca0f 100644
--- a/sgzb-ui/src/utils/dict/Dict.js
+++ b/sgzb-ui/src/utils/dict/Dict.js
@@ -77,7 +77,7 @@ function loadDict(dict, dictMeta) {
       dicts.forEach(d => {
         Vue.set(dict.label[type], d.value, d.label)
       })
-      console.log(dict)
+      // console.log(dict)
       return dicts
     })
 }
diff --git a/sgzb-ui/src/utils/globalUrl.js b/sgzb-ui/src/utils/globalUrl.js
index 2b906e1c..c5a6e866 100644
--- a/sgzb-ui/src/utils/globalUrl.js
+++ b/sgzb-ui/src/utils/globalUrl.js
@@ -1,8 +1,8 @@
 
-// const qrUrl = 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='; //测试
-const qrUrl = 'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode='; //重庆
+const qrUrl = 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='; //测试
+// const qrUrl = 'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode='; //重庆
 // const qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='; //宁夏
-
+// const qrUrl = 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode='; //南网
 
 
 
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
index 4f14cf60..0d4c7fe4 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
@@ -1,10 +1,10 @@
 <template>
-    <div class="app-container" id="secondStore">
+    <div class="app-container" id="receiveOut">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-        <el-form-item label="领料单号" prop="keyword">
+        <el-form-item label="领料单号" prop="code">
           <el-input
-            v-model="queryParams.keyword"
-            placeholder="请输入关键字"
+            v-model="queryParams.code"
+            placeholder="请输入领料单号"
             clearable
             style="width: 240px"
             @keyup.enter.native="handleQuery"
@@ -28,8 +28,8 @@
                 </el-option>
             </el-select>
         </el-form-item>
-        <el-form-item label="出库状态" prop="leaseStatus">
-          <el-select v-model="queryParams.leaseStatus" placeholder="请选择出库状态"  clearable>
+        <el-form-item label="出库状态" prop="taskStatus">
+          <el-select v-model="queryParams.taskStatus" placeholder="请选择出库状态"  clearable>
             <el-option
               v-for="item in statusList" filterable 
               :key="item.id" :label="item.name" :value="item.id" 
@@ -56,7 +56,7 @@
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
   
-      <el-table v-loading="loading" :data="leaseList" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :data="leaseList" >
         <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <el-table-column label="序号" align="center" type="index" />
         <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
@@ -98,104 +98,52 @@
         @pagination="getList"
       />
   
-        <!-- 出库弹窗 -->
-      <el-dialog :title="title" :visible.sync="openOut" width="600px" append-to-body :close-on-click-modal="false">
-        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-          <el-form-item label="类型名称:" prop="typeName">
-            <el-input v-model="form.typeName" placeholder="请输入类型名称" disabled/>
-          </el-form-item>
-          <el-form-item label="规格型号" prop="modelName">
-            <el-input v-model="form.modelName" placeholder="请输入规格型号" disabled/>
-          </el-form-item>
-          <el-form-item label="在库数量" prop="zkNum">
-            <el-input v-model="form.zkNum" placeholder="请输入在库数量" disabled/>
-          </el-form-item>
-  
-          <el-form-item label="出库数量" prop="num">
-            <el-input v-model="form.num" placeholder="请输入出库数量" />
-          </el-form-item>
-          <el-form-item label="班组名称" prop="teamName">
-            <el-input v-model="form.teamName" placeholder="请输入班组名称" maxlength="50" />
-          </el-form-item>
-          <el-form-item label="领用人员" prop="leaseMan">
-            <el-input v-model="form.leaseMan" placeholder="请输入领用人员" maxlength="50" />
-          </el-form-item>
-          <el-form-item label="联系电话" prop="phone">
-            <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer" style="text-align: center">
-          <el-button type="primary" @click="submitForm(1)">确 定</el-button>
-          <el-button @click="openOut=false">取 消</el-button>
-        </div>
-      </el-dialog>
-  
-      <!-- 进库弹窗 -->
-      <el-dialog :title="title" :visible.sync="openIn" width="600px" append-to-body :close-on-click-modal="false">
-        <el-form ref="nform" :model="nform" :rules="nrules" label-width="120px">
-          <el-form-item label="类型名称:" prop="typeName">
-            <el-input v-model="nform.typeName" placeholder="请输入类型名称" disabled/>
-          </el-form-item>
-          <el-form-item label="规格型号" prop="modelName">
-            <el-input v-model="nform.modelName" placeholder="请输入规格型号" disabled/>
-          </el-form-item>
-  
-          <el-form-item label="退库数量" prop="num">
-            <el-input v-model="nform.num" placeholder="请输入退库数量"/>
-          </el-form-item>
-          <el-form-item label="班组名称" prop="teamName">
-            <el-input v-model="nform.teamName" placeholder="请输入班组名称" maxlength="50" />
-          </el-form-item>
-          <el-form-item label="退库人员" prop="leaseMan">
-            <el-input v-model="nform.leaseMan" placeholder="请输入退库人员" maxlength="50" />
-          </el-form-item>
-          <el-form-item label="联系电话" prop="phone">
-            <el-input v-model="nform.phone" placeholder="请输入联系电话" maxlength="11" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer" style="text-align: center">
-          <el-button type="primary" @click="submitForm(2)">确 定</el-button>
-          <el-button @click="openIn=false">取 消</el-button>
-        </div>
-      </el-dialog>
-  
-       <!-- 记录弹窗 -->
-       <el-dialog :title="title" :visible.sync="openRecord" width="1200px" append-to-body>
-        <el-form :model="dialogQuery" ref="dialogQuery" size="small" :inline="true" label-width="80px">
-        <el-form-item label="记录时间" prop="startTime">
-          <el-date-picker
-                v-model="dialogQuery.startTime"
-                style="width: 240px"
-                value-format="yyyy-MM-dd"
-                type="date"
-                placeholder="记录时间"
-            ></el-date-picker>
+      <!-- 出库弹窗 -->
+      <el-dialog :title="title" :visible.sync="openLeaseDevices" width="1200px" append-to-body>
+        <el-form :model="dialogQuery" ref="dialogQuery" size="small" :inline="true" label-width="100px">
+        <el-form-item label="设备负责人" prop="director">
+          <el-input v-model="dialogQuery.director" maxlength="20"/>
         </el-form-item>
-        <el-form-item label="类型名称" prop="typeName">
-          <el-input
-            v-model="dialogQuery.typeName"
-           disabled
-          />
+        <el-form-item label="机具类型" prop="typeId">
+          <treeselect
+            v-model="queryParams.modelId"
+            default-expand-all :options="equipmentTypeList"
+            placeholder="请选择规格型号"
+
+            :disable-branch-nodes="true"
+            style="width: 240px;"
+            noChildrenText="没有数据了"
+            noOptionsText="没有数据"
+            noResultsText="没有搜索结果"/>
         </el-form-item>
-        <el-form-item label="规格型号" prop="modelName">
-          <el-input v-model="dialogQuery.modelName" disabled />
-        </el-form-item>
-  
-  
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery">查询</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetDialogQuery">重置</el-button>
         </el-form-item>
       </el-form>
        
-      <el-table v-loading="loading" :data="dialogList">
+      <el-table v-loading="loading" :data="dialogList" height="600">
         <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="modelName" :show-overflow-tooltip="true" />
-        <el-table-column label="数量" align="center" prop="num" :show-overflow-tooltip="true" />
-        <el-table-column label="记录时间" align="center" prop="startTime" :show-overflow-tooltip="true" />
-        <el-table-column label="操作类型" align="center" prop="" :show-overflow-tooltip="true" />
-        
+        <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
+        <el-table-column label="待出库数量" align="center" prop="outNum" :show-overflow-tooltip="true" />
+        <el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true" />
+        <el-table-column label="设备负责人" align="center" prop="userName" :show-overflow-tooltip="true" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="!isView">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              @click="codeOut(scope.row)"
+              v-if="scope.row.manageType==0"
+            >编码出库</el-button>
+            <el-button
+              size="mini"
+              type="primary"
+              v-if="scope.row.manageType==1"
+              @click="numOut(scope.row)"
+            >数量出库</el-button>
+          </template>
+        </el-table-column>
         
       </el-table>
   
@@ -208,20 +156,101 @@
       />
   
       </el-dialog>
+      
+      <!-- 编码出库 -->
+      <el-dialog :title="title" :visible.sync="openCode" width="1200px" append-to-body>
+        <el-form :model="codeOutForm" ref="codeOutForm" size="small" :inline="true" label-width="100px">
+          <span style="margin-right: 50px;"> 
+            待出库数量：{{outNum}}
+          </span>
+          <el-form-item label="请输入车牌号" prop="carCode">
+            <el-input v-model="codeOutForm.carCode" maxlength="20"/>
+          </el-form-item>
+          <span style="margin-right: 50px;color: red;"> 
+            部分设备出库时，需进行装车,需记录车牌号码
+          </span>
+        
+        </el-form>
+      
+        
+        <el-form :model="outQuery" ref="outQuery" size="small" :inline="true" label-width="100px">
+          <el-form-item label="设备编码" prop="maCode">
+            <el-input v-model="outQuery.maCode" maxlength="20"/>
+          </el-form-item>
+          
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleOutQuery">查询</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetOutQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+       
+      <el-table v-loading="loading" :data="outCodeList" height="500" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" 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="typeModelName" :show-overflow-tooltip="true" />
+        <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
+        <el-table-column label="设备状态" align="center" prop="maStatus" :show-overflow-tooltip="true" />
+      </el-table>
   
+      <pagination
+        v-show="outTotal>0"
+        :total="outTotal"
+        :page.sync="outQuery.pageNum"
+        :limit.sync="outQuery.pageSize"
+        @pagination="getCodeList"
+      />
+  
+      </el-dialog>
+
+      <!-- 数量出库 -->
+      <el-dialog :title="title" :visible.sync="openNum" width="1200px" append-to-body>
+        <el-form :model="numOutForm" ref="numOutForm" size="small" :inline="true" label-width="100px">
+          <!-- <span style="margin-right: 50px;"> 
+            待出库数量：{{outNum}}
+          </span> -->
+          <el-form-item label="请输入车牌号" prop="carCode">
+            <el-input v-model="numOutForm.carCode" maxlength="20"/>
+          </el-form-item>
+          <span style="margin-right: 50px;color: red;"> 
+            部分设备出库时，需进行装车,需记录车牌号码
+          </span>
+        
+        </el-form>
+       
+      <el-table v-loading="loading" :data="outCodeList" height="500">
+        <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="typeModelName" :show-overflow-tooltip="true" />
+        <el-table-column label="库存数量" align="center" prop="" :show-overflow-tooltip="true" />
+        <el-table-column label="待出库数量" align="center" prop="outNum" :show-overflow-tooltip="true" />
+        <el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true" />
+        <el-table-column label="出库数量" align="center">
+        <template slot-scope="scope">
+          <el-input
+            v-model.number="scope.row.outNum"
+            placeholder="请输入出库数量"
+            type="number"
+            min="1" @input="checkNum(scope.row)"
+            clearable
+            style="width: 100%" 
+          />
+        </template>
+      </el-table-column>
+      </el-table>
+      </el-dialog>
     </div>
   </template>
   
   <script>
   import { operate,getRecords  } from "@/api/claimAndRefund/secondStore";
-  import { getUnitData,getProData,getLeaseAuditListAll } from "@/api/claimAndRefund/receive.js"
+  import { getUnitData,getProData,getLeaseAuditList,getLeaseAuditListDetail } from "@/api/claimAndRefund/receive.js"
   import { getTypeList } from "@/api/store/warehousing";
   import { equipmentTypeTree } from "@/api/store/tools";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   export default {
-    name: "SecondStore",
-    dicts: ['sys_normal_disable'],
+    name: "receiveOut",
     components: { Treeselect },
     data() {
       return {
@@ -241,11 +270,6 @@
         leaseList: [],
         // 弹出层标题
         title: "",
-        // 是否显示弹出层
-        openOut: false,
-        openIn: false,
-        // 日期范围
-        dateRange: [],
         // 单位数据
         unitList: [],
         proList:[], //工程集合
@@ -257,45 +281,45 @@
         queryParams: {
           pageNum: 1,
           pageSize: 10,
-         
+          flag:1,
+          code: undefined,
           unitId: undefined,
-          modelId: undefined,
-          typeId: undefined
+          proId: undefined,
+          taskStatus: undefined
         },
         // 表单参数 出库
         form: {},
-        // 表单校验
-        rules: {
-          num: [
-            { required: true, message: "出库数量不能为空", trigger: "blur" }
-          ],
-          teamName: [
-            { required: true, message: "班组名称不能为空", trigger: "blur" }
-          ]
-        },
-        // 表单参数 退库
-        nform:{},
-        nrules: {
-          num: [
-            { required: true, message: "退库数量不能为空", trigger: "blur" }
-          ],
-          teamName: [
-            { required: true, message: "班组名称不能为空", trigger: "blur" }
-          ]
-        },
         //记录弹窗
-        openRecord:false,
+        openLeaseDevices:false,
+        isView:false,
         dialogQuery: {
           pageNum: 1,
           pageSize: 10,
-          startTime: undefined,
-          unitId: undefined,
-          modelId: undefined,
+          director: undefined,
           typeId: undefined
         },
         dialogList:[],
-        queryType:1,
         dialogTotal: 0,
+
+        openCode:false,//编码弹窗开关
+        openNum:false,//数量弹窗开关
+        outNum:0,//待出库数量
+        codeOutForm:{//编码表单-车牌号
+          carCode: undefined,
+        },
+        numOutForm:{//数量表单-车牌号
+          carCode: undefined,
+        },
+        outQuery: {//编码出库-搜索条件
+          pageNum: 1,
+          pageSize: 20,
+          maCode: undefined,
+        },
+        outTotal: 0,//编码弹窗分页-总数
+        outCodeList:[],//编码弹窗表格数据
+        outNumParam:{},
+        outNumList:[],//数量弹窗表格数据
+       
       };
     },
     created() {
@@ -330,18 +354,16 @@
         equipmentTypeTree().then(response => {
           this.equipmentTypeList = response.data;
           this.equipmentTypeList.forEach((item,index)=>{
-            if(item.children.length>0){
+            if(item.children&&item.children.length>0){
               item.children.forEach((item2,index2)=>{
-                if(item2.children.length>0){
+                if(item2.children&&item2.children.length>0){
                   item2.children.forEach(item3=>{
-                    if(item3.children.length>0){
+                    if(item3.children&&item3.children.length>0){
                       item3.children.forEach(item4=>{ 
                         item4.machineTypeName = item3.typeName
                         item4.specificationType = item4.typeName
-                        // item4.purchasePrice = 1
-                        // item4.purchaseNum = 1
-                        this.$set(item4, 'purchasePrice', 0);
-                        this.$set(item4, 'purchaseNum', 1);
+                        // this.$set(item4, 'purchasePrice', 0);
+                        // this.$set(item4, 'purchaseNum', 1);
                       })
                     }
                   })
@@ -356,49 +378,99 @@
         this.queryParams.pageNum = 1;
         this.getList();
       },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
       /** 查询列表 */
       getList() {
         this.loading = true;
-        getLeaseAuditListAll(this.queryParams).then(response => {
+        getLeaseAuditList(this.queryParams).then(response => {
             this.leaseList = response.data.rows;
             this.total = response.data.total;
             this.loading = false;
           }
         );
       },
-      handleView(){
-        
+      //查看按钮
+      handleView(row){
+        this.openLeaseDevices = true;
+        this.isView = true;
+        this.dialogQuery.id = row.id;
+        this.resetDialogQuery()
+        // this.getDialogList();
       },
-      // 取消按钮
-      cancel() {
-        this.openOut = false;
-        this.openIn = false;
-        this.reset();
+      /** 查询列表 */
+      getDialogList() {
+        console.log(this.dialogQuery)
+        getLeaseAuditListDetail(this.dialogQuery).then(response => {
+            this.dialogList = response.data.rows;
+            this.dialogTotal = response.data.total;
+          }
+        );
       },
-      // 表单重置
-      reset() {
-        this.form = {
-         
-        };
-        this.resetForm("form");
-        this.nform = {
-       
-        };
-        this.resetForm("nform");
-      },
-      
       handleDialogQuery() {
         this.dialogQuery.pageNum = 1;
         this.getDialogList();
       },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
       resetDialogQuery() {
         this.resetForm("dialogQuery");
         this.handleDialogQuery();
+      },
+       /** 出库按钮操作 */
+       handleOut(row) {
+        this.openLeaseDevices = true;
+        this.isView = false;
+        this.dialogQuery.id = row.id;
+        this.resetDialogQuery()
+        this.getDialogList();
+      },
+      
+     
+      //编码出库
+      codeOut(row){
+        this.title='编码出库'
+        this.openCode=true;
+        this.outNum = row.outNum
+        this.handleOutQuery()
+      },
+      //数量出库
+      numOut(row){
+        this.title='数量出库'
+        this.openNum=true
+        this.outNumParam = {}
+        
+        this.getNumList()
+      },
+      handleOutQuery() {
+        this.outQuery.pageNum = 1;
+        this.getCodeList();
+      },
+      resetOutQuery() {
+        this.resetForm("outQuery");
+        this.handleOutQuery();
+      },
+      getCodeList() {
+
+        // getLeaseAuditListDetail(this.outQuery).then(response => {
+        //     this.outCodeList = response.data.rows;
+        //     this.outTotal = response.data.total;
+        //   }
+        // );
+      },
+
+      getNumList() {
+        // getLeaseAuditListDetail(this.outQuery).then(response => {
+        //     this.outNumList = response.data.rows;
+        //   }
+        // );
+      },
+      //输入出库数量
+      checkNum(row){
+        if(row.outNum<=1){
+          row.outNum = 1
+        }
       },
       // 多选框选中数据
       handleSelectionChange(selection) {
@@ -406,84 +478,12 @@
         this.single = selection.length!=1
         this.multiple = !selection.length
       },    
-      /** 按钮操作 */
-      handleOut(row) {//1
-        this.reset();
-        // this.form = row;
-        console.log(row)
-        this.$set(this.form,'unitId',row.unitId)
-        this.$set(this.form,'typeId',row.typeId)
-        this.$set(this.form,'unitName',row.unitName)
-        this.$set(this.form,'typeName',row.typeName)
-        this.$set(this.form,'modelName',row.modelName)
-        this.$set(this.form,'zkNum',row.zkNum)
-        console.log(this.form)
-        this.openOut = true;
-        this.title = "出库";
-      },
-      handleIn(row) {//2
-        this.reset();
-        // this.nform = row;
-        this.$set(this.nform,'unitId',row.unitId)
-        this.$set(this.nform,'typeId',row.typeId)
-        this.$set(this.nform,'unitName',row.unitName)
-        this.$set(this.nform,'typeName',row.typeName)
-        this.$set(this.nform,'modelName',row.modelName)
-        this.openIn = true;
-        this.title = "退库";
-      },
+     
       /** 提交按钮 */
       submitForm: function(type) {
-        if(type==1){
-          this.$refs["form"].validate(valid => {
-            if (valid) {
-              let param = {}
-              param = this.form
-              param.type=1
-              operate(param).then(response => {
-                this.$modal.msgSuccess("操作成功");
-                this.openOut = false;
-                this.getList();
-              });
-            }
-          });
-        }
-        if(type==2){
-          this.$refs["nform"].validate(valid => {
-            if (valid) {
-              let param = {}
-              param = this.nform
-              param.type=2
-              operate(param).then(response => {
-                this.$modal.msgSuccess("操作成功");
-                this.openIn = false;
-                this.getList();
-              });
-            }
-          });
-        }
-      },
-  
-      //查看记录
-      openRecords(row,type){
-        this.openRecord = true;
-        this.queryType = type
-        this.dialogQuery.typeName = row.typeName;
-        this.dialogQuery.modelName = row.modelName;
-        this.dialogQuery.unitId = row.unitId;
-        this.dialogQuery.typeId = row.typeId;
-        
-        this.getDialogList();
-      },
-      /** 查询列表 */
-      getDialogList() {
-        this.dialogQuery.queryType = this.queryType;
-        getRecords(this.dialogQuery).then(response => {
-            this.dialogList = response.rows;
-            this.dialogTotal = response.total;
-          }
-        );
+      
       },
+    
       /** 导出按钮操作 */
       handleExport() {
         this.downloadJson('material/secondaryWarehouse/exportList',JSON.stringify(this.queryParams), `二级库_${new Date().getTime()}.xlsx`)
diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue
index a862381f..0681fd66 100644
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue
@@ -179,11 +179,11 @@ export default {
       equipmentTypeTree().then(response => {
         this.equipmentTypeList = response.data;
         this.equipmentTypeList.forEach((item,index)=>{
-          if(item.children.length>0){
+          if(item.children&&item.children.length>0){
             item.children.forEach((item2,index2)=>{
-              if(item2.children.length>0){
+              if(item2.children&&item2.children.length>0){
                 item2.children.forEach(item3=>{
-                  if(item3.children.length>0){
+                  if(item3.children&&item3.children.length>0){
                     item3.children.forEach(item4=>{ 
                       item4.machineTypeName = item3.typeName
                       item4.specificationType = item4.typeName
diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue
index 78066af2..3494c5ea 100644
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue
@@ -177,11 +177,11 @@ export default {
       equipmentTypeTree().then(response => {
         this.equipmentTypeList = response.data;
         this.equipmentTypeList.forEach((item,index)=>{
-          if(item.children.length>0){
+          if(item.children&&item.children.length>0){
             item.children.forEach((item2,index2)=>{
-              if(item2.children.length>0){
+              if(item2.children&&item2.children.length>0){
                 item2.children.forEach(item3=>{
-                  if(item3.children.length>0){
+                  if(item3.children&&item3.children.length>0){
                     item3.children.forEach(item4=>{ 
                       item4.machineTypeName = item3.typeName
                       item4.specificationType = item4.typeName
diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
index 08472ecb..a95fea34 100644
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
@@ -362,16 +362,14 @@ export default {
       equipmentTypeTree().then(response => {
         this.equipmentTypeList = response.data;
         this.equipmentTypeList.forEach((item,index)=>{
-          if(item.children.length>0){
+          if(item.children&&item.children.length>0){
             item.children.forEach((item2,index2)=>{
-              if(item2.children.length>0){
+              if(item2.children&&item2.children.length>0){
                 item2.children.forEach(item3=>{
-                  if(item3.children.length>0){
+                  if(item3.children&&item3.children.length>0){
                     item3.children.forEach(item4=>{
                       item4.machineTypeName = item3.typeName
                       item4.specificationType = item4.typeName
-                      // item4.purchasePrice = 1
-                      // item4.purchaseNum = 1
                       this.$set(item4, 'purchasePrice', 0);
                       this.$set(item4, 'purchaseNum', 1);
                     })
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
index 94fa2651..3f463279 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
@@ -373,14 +373,10 @@ export default {
             item.children.forEach((item2,index2)=>{
               if(item2.children&&item2.children.length>0){
                 item2.children.forEach(item3=>{
-                  // console.log(item3,'item3')
                   if(item3.children&&item3.children.length>0){
                     item3.children.forEach(item4=>{ 
-                      // console.log(item4,'item4')
                       item4.machineTypeName = item3.typeName
                       item4.specificationType = item4.typeName
-                      // item4.purchasePrice = 1
-                      // item4.purchaseNum = 1
                       this.$set(item4, 'purchasePrice', 0);
                       this.$set(item4, 'purchaseNum', 1);
                     })
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index 2cecc9fa..57811dcf 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -18,7 +18,7 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
+  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",///gl/
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
@@ -40,9 +40,9 @@ module.exports = {
         // target: `http://192.168.0.14:21624`,//线上环境/
         // target: `http://1.12.248.179:23028`,//线上环境-南网
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
-        target: `https://z.csgmall.com.cn`,
+        // target: `https://z.csgmall.com.cn`,
 
-        // target: `http://10.40.92.8:8080`,//超
+        target: `http://10.40.92.8:8080`,//超
         // target: `http://10.40.92.253:8080`,//韩
         // target: `http://10.40.92.209:8080`,//川/
 
@@ -52,7 +52,8 @@ module.exports = {
         //2.打开view文件夹根目录dashboard.vue 更换大屏项目发布的跳转地址，打开大屏项目config/index.js更改请求地址，大屏打包node<16.0.0;
         //3.只有南网项目产线gl发布打包时候需要注意：
         //  将 publicPath:'static' 改为 '/gl/',还有env.development和env.production中的VUE_APP_BASE_API改为'/gl/dev-api';
-        //  登录跳转地址从/login换成/gl/login;
+        //  router/indx.js 中base放开
+        //  登录跳转地址从/login换成/gl/login 3处;
         //4. 重庆环境的时候需要将领料管理线上菜单修改
         //******** 注意事项  ********* */
 

From 59043e9b673782341f0535a4ade0a3d07221d0c5 Mon Sep 17 00:00:00 2001
From: zhouzy062 <zhouzy062@tydic.com>
Date: Thu, 28 Mar 2024 17:59:26 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5=EF=BC=8C=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E6=8E=A5=E6=94=B6=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/api/claimAndRefund/receive.js     |  20 +-
 .../claimAndRefund/receive/receiveOut.vue     | 175 ++++---
 .../views/claimAndRefund/return/returnIn.vue  | 453 ++++++++++++++++++
 .../claimAndRefund/return/returnInDetail.vue  | 408 ++++++++++++++++
 4 files changed, 990 insertions(+), 66 deletions(-)
 create mode 100644 sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
 create mode 100644 sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue

diff --git a/sgzb-ui/src/api/claimAndRefund/receive.js b/sgzb-ui/src/api/claimAndRefund/receive.js
index 80a07407..e291ad56 100644
--- a/sgzb-ui/src/api/claimAndRefund/receive.js
+++ b/sgzb-ui/src/api/claimAndRefund/receive.js
@@ -246,9 +246,23 @@ export function getLeaseAuditListDetail(query) {
   })
 }
 
-
-
-
+//领料出库 编码出库获取编码
+export function getDetailsByTypeId(query) {
+  return request({
+    url: '/base/leaseOutDetails/getDetailsByTypeId',
+    method: 'get',
+    params: query
+  })
+}
+
+// 领料出库  编码出库 保存
+export function submitOut(params){
+  return request({
+    url: '/base/leaseOutDetails/submitOut',
+    method: 'post',
+    data: params
+  })
+}
 
 
 
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
index 0d4c7fe4..cf7d9261 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
@@ -169,21 +169,26 @@
           <span style="margin-right: 50px;color: red;"> 
             部分设备出库时，需进行装车,需记录车牌号码
           </span>
-        
         </el-form>
-      
-        
+
         <el-form :model="outQuery" ref="outQuery" size="small" :inline="true" label-width="100px">
           <el-form-item label="设备编码" prop="maCode">
             <el-input v-model="outQuery.maCode" maxlength="20"/>
           </el-form-item>
-          
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleOutQuery">查询</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetOutQuery">重置</el-button>
           </el-form-item>
         </el-form>
-       
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              size="mini"
+              @click="saveCodeOut"
+            >出库</el-button>
+          </el-col>
+        </el-row>
       <el-table v-loading="loading" :data="outCodeList" height="500" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" type="index" /> 
@@ -215,36 +220,42 @@
           <span style="margin-right: 50px;color: red;"> 
             部分设备出库时，需进行装车,需记录车牌号码
           </span>
-        
         </el-form>
-       
-      <el-table v-loading="loading" :data="outCodeList" height="500">
-        <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="typeModelName" :show-overflow-tooltip="true" />
-        <el-table-column label="库存数量" align="center" prop="" :show-overflow-tooltip="true" />
-        <el-table-column label="待出库数量" align="center" prop="outNum" :show-overflow-tooltip="true" />
-        <el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true" />
-        <el-table-column label="出库数量" align="center">
-        <template slot-scope="scope">
-          <el-input
-            v-model.number="scope.row.outNum"
-            placeholder="请输入出库数量"
-            type="number"
-            min="1" @input="checkNum(scope.row)"
-            clearable
-            style="width: 100%" 
-          />
-        </template>
-      </el-table-column>
-      </el-table>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              size="mini"
+              @click="saveCodeOut"
+            >出库</el-button>
+          </el-col>
+        </el-row>
+        <el-table v-loading="loading" :data="outNumList" height="500">
+          <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="typeModelName" :show-overflow-tooltip="true" />
+          <el-table-column label="库存数量" align="center" prop="" :show-overflow-tooltip="true" />
+          <el-table-column label="待出库数量" align="center" prop="outNum" :show-overflow-tooltip="true" />
+          <el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true" />
+          <el-table-column label="出库数量" align="center" prop="inputNum">
+            <template slot-scope="scope">
+              <el-input
+                v-model.number="scope.row.inputNum"
+                placeholder="请输入出库数量"
+                type="number" min="1"
+                @input="checkNum(scope.row)"
+                clearable
+                style="width: 100%" 
+              />
+            </template>
+          </el-table-column>
+        </el-table>
       </el-dialog>
     </div>
   </template>
   
   <script>
-  import { operate,getRecords  } from "@/api/claimAndRefund/secondStore";
-  import { getUnitData,getProData,getLeaseAuditList,getLeaseAuditListDetail } from "@/api/claimAndRefund/receive.js"
+  import { getUnitData,getProData,getLeaseAuditList,getLeaseAuditListDetail,getDetailsByTypeId,submitOut } from "@/api/claimAndRefund/receive.js"
   import { getTypeList } from "@/api/store/warehousing";
   import { equipmentTypeTree } from "@/api/store/tools";
   import Treeselect from "@riophae/vue-treeselect";
@@ -257,7 +268,7 @@
         // 遮罩层
         loading: false,
         // 选中数组
-        ids: [],
+        maCodeList: [],
         // 非单个禁用
         single: true,
         // 非多个禁用
@@ -289,7 +300,7 @@
         },
         // 表单参数 出库
         form: {},
-        //记录弹窗
+        //弹窗
         openLeaseDevices:false,
         isView:false,
         dialogQuery: {
@@ -300,7 +311,7 @@
         },
         dialogList:[],
         dialogTotal: 0,
-
+        outObj:{},
         openCode:false,//编码弹窗开关
         openNum:false,//数量弹窗开关
         outNum:0,//待出库数量
@@ -317,9 +328,8 @@
         },
         outTotal: 0,//编码弹窗分页-总数
         outCodeList:[],//编码弹窗表格数据
-        outNumParam:{},
         outNumList:[],//数量弹窗表格数据
-       
+        
       };
     },
     created() {
@@ -403,7 +413,7 @@
       },
       /** 查询列表 */
       getDialogList() {
-        console.log(this.dialogQuery)
+        // console.log(this.dialogQuery)
         getLeaseAuditListDetail(this.dialogQuery).then(response => {
             this.dialogList = response.data.rows;
             this.dialogTotal = response.data.total;
@@ -432,16 +442,27 @@
       codeOut(row){
         this.title='编码出库'
         this.openCode=true;
-        this.outNum = row.outNum
+        this.outNum = row.outNum;
+        this.outQuery.typeId = row.typeId;
+        this.outObj = row
         this.handleOutQuery()
       },
       //数量出库
       numOut(row){
         this.title='数量出库'
         this.openNum=true
-        this.outNumParam = {}
-        
-        this.getNumList()
+        this.resetForm("numOutForm");
+        // console.log(row)
+        let obj = {}
+        this.$set(obj,'taskId',row.taskId)
+        this.$set(obj,'parentId',row.parentId)
+        this.$set(obj,'typeName',row.typeName)
+        this.$set(obj,'typeModelName',row.typeModelName)
+        this.$set(obj,'typeId',row.typeId)
+        this.$set(obj,'alNum  ',row.alNum)//已出库数量
+        this.$set(obj,'outNum',row.outNum)//待出库数量
+        this.$set(obj,'inputNum',1)//出库数量
+        this.outNumList = [obj]
       },
       handleOutQuery() {
         this.outQuery.pageNum = 1;
@@ -452,32 +473,60 @@
         this.handleOutQuery();
       },
       getCodeList() {
-
-        // getLeaseAuditListDetail(this.outQuery).then(response => {
-        //     this.outCodeList = response.data.rows;
-        //     this.outTotal = response.data.total;
-        //   }
-        // );
-      },
-
-      getNumList() {
-        // getLeaseAuditListDetail(this.outQuery).then(response => {
-        //     this.outNumList = response.data.rows;
-        //   }
-        // );
-      },
-      //输入出库数量
-      checkNum(row){
-        if(row.outNum<=1){
-          row.outNum = 1
-        }
+        getDetailsByTypeId(this.outQuery).then(response => {
+            this.outCodeList = response.data.rows;
+            if(response.data.total){
+              this.outTotal = response.data.total;
+            }
+          }
+        );
       },
       // 多选框选中数据
       handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.dictId)
-        this.single = selection.length!=1
-        this.multiple = !selection.length
-      },    
+        this.maCodeList = selection.map(item => item.maId)
+      }, 
+      //编码出库保存
+      saveCodeOut(){
+        console.log(this.outObj)
+
+        let params = this.maCodeList.map(item=>{
+          let obj = {
+            id:this.outObj.id,
+            maId:item,
+            manageType:0,
+            typeId:this.outObj.typeId,
+            parentId:this.outObj.parentId,
+            outNum:this.outObj.outNum,
+            taskId:this.outObj.taskId,
+          }
+          return obj
+        })
+        console.log(params)
+
+
+        // let params = {
+        //   id:this.outObj.id,
+        //   // maId:this.outQuery.maId,
+        //   typeId:this.outObj.typeId,
+        //   parentId:this.outObj.parentId,
+        //   outNum:this.outObj.outNum,
+        //   taskId:this.outObj.taskId,
+        // }
+        submitOut(params).then(response => {
+            // this.outCodeList = response.rows;
+            // this.outTotal = response.total;
+          }
+        );
+      },
+      
+      
+      //输入出库数量
+      checkNum(row){
+        if(row.inputNum<=1){
+          row.inputNum = 1
+        }
+      },
+         
      
       /** 提交按钮 */
       submitForm: function(type) {
@@ -486,7 +535,7 @@
     
       /** 导出按钮操作 */
       handleExport() {
-        this.downloadJson('material/secondaryWarehouse/exportList',JSON.stringify(this.queryParams), `二级库_${new Date().getTime()}.xlsx`)
+        // this.downloadJson('material/secondaryWarehouse/exportList',JSON.stringify(this.queryParams), `二级库_${new Date().getTime()}.xlsx`)
       },
     }
   };
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue b/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
new file mode 100644
index 00000000..a315047c
--- /dev/null
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
@@ -0,0 +1,453 @@
+<template>
+    <div class="app-container">
+      <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-form-item>
+        <el-form-item label="单位名称" prop="unitId">
+          <el-select
+            v-model="queryParams.unitId"
+            clearable filterable
+            @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 filterable
+            @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-form-item>
+        <el-form-item label="协议号" prop="agreementCode">
+          <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 filterable
+            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>
+        </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-form-item>
+      </el-form>
+  
+      <el-row :gutter="10" class="mb8">
+        <!-- <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            size="mini"
+            @click="handleExam"
+            :disabled="multiple"
+            >批量审核</el-button
+          >
+        </el-col> -->
+        <el-col :span="1.5">
+          <el-button
+            type="success"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            >导出</el-button
+          >
+        </el-col>
+  
+        <right-toolbar
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+        ></right-toolbar>
+      </el-row>
+  
+      <el-table v-loading="loading" :data="typeList">
+        <el-table-column label="序号" sortable align="center" type="index" />
+        <el-table-column label="退料单号" align="center" prop="code"  :show-overflow-tooltip="true"/>
+        <el-table-column label="退料单位" align="center"  prop="unitName" :show-overflow-tooltip="true"/>
+        <el-table-column label="退料工程"  align="center" prop="lotName" :show-overflow-tooltip="true"/>
+        <el-table-column label="退料人员" align="center" prop="backPerson"  :show-overflow-tooltip="true"/>
+        <el-table-column label="联系电话" align="center" prop="phone"  :show-overflow-tooltip="true"/>
+        <el-table-column label="申请时间" align="center" prop="backTime"  :show-overflow-tooltip="true"/>
+        <el-table-column label="协议号" align="center" prop="agreementCode"  :show-overflow-tooltip="true"/>
+        <el-table-column label="退料状态" align="center"  :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <!-- 状态 37-待审核 38-已审核 -->
+            <el-button type="text" v-if="scope.row.applyStatus == '0'">
+              待审核
+            </el-button>
+            <el-button type="text" style="color: #67c23a" v-if="scope.row.applyStatus == '1'||scope.row.applyStatus == '3'">
+              退料通过
+            </el-button>
+            <el-button type="text" style="color: red" v-if="scope.row.applyStatus == '2'||scope.row.applyStatus == '4'">
+              退料驳回
+            </el-button>
+            <el-button type="text" style="color: #67c23a" v-if="scope.row.taskStatus == '40'&& scope.row.applyStatus != '0'">
+              退料完成
+            </el-button>
+          </template>
+        </el-table-column>
+        
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
+          <template slot-scope="scope">
+            <el-button size="mini" plain icon="el-icon-zoom-in" @click="handleSee(scope.row, 'see')">
+                查看
+            </el-button>
+            <el-button size="mini" type="warning" @click="handleReturn(scope.row, 'see')">
+                退料
+            </el-button>
+            <el-button size="mini" type="primary" @click="handlePrint(scope.row)">
+                退料单
+            </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"
+      />
+      
+      <!-- 退料单 -->
+      <dialogForm
+        :dialogTitle="title"
+        :isShowFlag.sync="isShowOneFlag"
+        :rowObj="rowObj"
+        :priKey="priKey"
+      ></dialogForm>
+
+    </div>
+  </template>
+  
+  <script>
+  import { getBackAuditList, getViewByExamine, ApiBackApplyAudit,ApiBackApplyRefuse } from "@/api/claimAndRefund/return.js"
+  import { getInfo } from "@/api/login";
+  import { getUnitData, getProData, getAgreementInfoById, } from "@/api/claimAndRefund/receive.js"
+  import dialogForm from "./dialogFormExame.vue";
+  export default {
+    // name: "ReturnExamine",
+    components: { dialogForm, },
+    data() {
+      return {
+        type: '',
+        isShowOneFlag: false,//退料单
+        priKey: '',
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 字典表格数据
+        typeList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 日期范围
+        dateRange: [],
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          keyWord: '',//关键字 
+          unitId: "",//单位id
+          lotId: '',//工程id
+          taskStatus: '',//状态  
+          typeId: '',//工机具类型
+          time: '',
+          agreementCode: '',//协议
+          startTime: '',
+          endTime: ''
+        },
+        companyId: '',
+        deptOptions: [],
+        unitList: [],
+        proList: [],
+        taskStatusList: [
+          {
+            name: '待审核',
+            id: '37'
+          },
+          {
+            name: '已审核',
+            id: '38'
+          }
+        ],
+        rowObj: {},
+      };
+    },
+    created() {
+      this.initSelectData()
+      this.InitIGetInfo()
+    },
+    methods: {
+      InitIGetInfo() {
+        getInfo().then(res => {
+          this.companyId = res.user.companyId
+          this.getList();
+        })
+      },
+      //机具类型下拉点击
+      handleNodeClick(ev) {
+  
+      },
+      //获取渲染下拉数据
+      initSelectData() {
+        this.GetUnitData()
+        this.GetProData()
+      },
+      // 获取 来往单位 列表数据
+      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
+        }
+        const res = await getProData(params)
+        this.proList = res.data
+  
+        console.log('GetProData ======================', res)
+      },
+      // 获取 工程名称 列表数据
+      async InitGetAgreementInfoById() {
+        const {
+          unitId,
+          proId
+        } = this.queryParams
+        if (!unitId || !proId) {
+          return
+        }
+        const params = {
+          unitId: unitId,
+          projectId: proId
+        }
+        const res = await getAgreementInfoById(params)
+        // this.proList = res.data
+        console.log('getAgreementInfoById ======================', res)
+        this.queryParams.agreementCode = res.data.agreementCode
+      },
+      getAgreementByProId() {
+        this.InitGetAgreementInfoById()
+      },
+      getAgreementByUnit() {
+        this.GetProData()
+      },
+      /** 查询字典类型列表 startTime,结束日期endTime  */
+      async getList() {
+        this.loading = true;
+        this.queryParams.startTime = this.queryParams.time[0]
+        this.queryParams.endTime = this.queryParams.time[1]
+        try {
+          let params = {
+            companyId: this.companyId,
+            ...this.queryParams
+          }
+          console.log("paramsparamsparams", params)
+          const res = await getBackAuditList(params)
+          this.typeList = res.data.rows;
+          this.total = res.data.total;
+          this.loading = false;
+        } catch (error) {
+        }
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.dateRange = [];
+        // this.resetForm("queryForm");
+        this.$refs.queryForm.resetFields()
+        this.handleQuery();
+      },
+      //打开退料单
+      handlePrint(row) {
+        // this.title = "退料单";
+        this.isShowOneFlag = true
+        this.rowObj = row
+      },
+      //查看按钮
+      handleSee(row) {
+        this.$tab.closeOpenPage({
+            path:'/claimAndRefund/returnInDetail',
+            query:{
+                // Id:row.id,
+                isView:true,
+            }
+        })
+      },
+      //退料按钮
+      handleReturn(row) {
+        this.$tab.closeOpenPage({
+            path:'/claimAndRefund/returnInDetail',
+            // query:{
+            // Id:row.id,
+            // isEdit:true,
+            // }
+        })
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        //  this.download('material/backApply/exportExamine', {
+        //   ...this.queryParams
+        // }, `退料审核单_${new Date().getTime()}.xlsx`)
+      },
+
+  
+  
+  
+    }
+  };
+  </script>
+  <style lang="scss" scoped>
+  .submit_box {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  
+    .submit_box_title {
+      display: flex;
+      flex-direction: column;
+      margin-left: 15px;
+  
+      :first-child {
+        font-size: 14px;
+        font-weight: 600;
+      }
+  
+      :last-child {
+        margin-top: 6px;
+        font-size: 12px;
+      }
+    }
+  }
+  
+  .submit_box_two {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-items: center;
+    margin-left: 30%;
+  
+    .submit_box_title {
+      display: flex;
+      flex-direction: column;
+      margin-left: 10px;
+      font-size: 18px;
+      font-weight: 600;
+    }
+  }
+  
+  ::v-deep.el-table .fixed-width .el-button--mini {
+    width: 60px !important;
+    margin-bottom: 10px;
+  }
+  .dialog-footer {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
+  </style>
+  
\ No newline at end of file
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
new file mode 100644
index 00000000..c84a2847
--- /dev/null
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
@@ -0,0 +1,408 @@
+<template>
+    <div class="app-container" id="returnInDetail">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+        <el-form-item label="关键字" prop="keyword">
+          <el-input
+            v-model="queryParams.keyword"
+            placeholder="请输入关键字"
+            clearable
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+         
+        <el-form-item label="类型名称" prop="typeId">
+          <el-select
+            v-model="queryParams.typeId"
+            placeholder="请选择类型名称"
+            clearable filterable
+            style="width: 240px"
+          >
+            <el-option
+              v-for="typeItem in typeList"
+              :key="typeItem.typeId"
+              :label="typeItem.typeName"
+              :value="typeItem.typeId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="规格型号" prop="modelId">
+          <treeselect
+            v-model="queryParams.modelId"
+            default-expand-all :options="equipmentTypeList"
+            placeholder="请选择规格型号"
+  
+            :disable-branch-nodes="true"
+            style="width: 240px;"
+            noChildrenText="没有数据了"
+            noOptionsText="没有数据"
+            noResultsText="没有搜索结果"/>
+        </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-form-item>
+      </el-form>
+  
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            icon="el-icon-back"
+            size="mini"
+            @click="back"
+          >返回</el-button>
+        </el-col>
+        <el-col :span="1.5" v-if="!isView">
+          <el-button
+            type="primary"
+            size="mini"
+          >完成退料</el-button>
+        </el-col>
+      </el-row>
+  
+      <el-table v-loading="loading" :data="deviceList">
+        <!-- <el-table-column type="selection" width="55" 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="modelName" :show-overflow-tooltip="true" />
+        <el-table-column label="退料数量" align="center" prop="" :show-overflow-tooltip="true"/>
+        <el-table-column label="合格数量" align="center" prop="" :show-overflow-tooltip="true" />
+        <el-table-column label="维修数量" align="center" prop="" :show-overflow-tooltip="true"/>
+        <el-table-column label="预报废数量" align="center" prop="" :show-overflow-tooltip="true"/>
+        <el-table-column label="状态" align="center" prop="" :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" @click="handleView(scope.row)">
+                查看
+            </el-button>
+            <el-button size="mini" type="primary" @click="handleCodeReturn(scope.row)" v-if="!isView">
+                编码退料
+            </el-button>
+            <el-button size="mini" type="primary" @click="handleNumReturn(scope.row)" v-if="!isView">
+                数量退料
+            </el-button>
+            <!-- <el-button size="mini" icon="el-icon-zoom-in">
+                撤回
+            </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"
+      />
+
+   
+    <!-- 编码退料弹窗 -->
+    <el-dialog :title="title" :visible.sync="openCode" width="1200px" append-to-body>
+        <div style="margin-left: 40px;margin-bottom: 10px;">
+        退料数量：{{returnNum}}
+        </div>
+        <el-form :model="codeQuery" ref="codeQuery" size="small" :inline="true" label-width="100px">
+          <el-form-item label="设备编码" prop="maCode">
+            <el-input v-model="codeQuery.maCode" maxlength="20"/>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleCodeQuery">查询</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetCodeQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8" v-if="!dialogIsView">
+            <el-col :span="1.5">
+                <el-button
+                type="primary"
+                size="mini"
+                >保存</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                type="success"
+                size="mini"
+                >批量合格</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                type="primary"
+                size="mini"
+                >批量维修</el-button>
+            </el-col>
+        </el-row>
+        <el-table v-loading="loading" :data="codeList" height="500" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" 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="typeModelName" :show-overflow-tooltip="true" />
+            <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
+            <el-table-column label="退料状态" align="center" prop="maStatus" :show-overflow-tooltip="true" />
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="!dialogIsView">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="success" icon="el-icon-zoom-in">
+                        合格
+                    </el-button>
+                    <el-button size="mini" type="primary" icon="el-icon-zoom-in">
+                        待维修
+                    </el-button>
+                    <el-button size="mini" type="warning" icon="el-icon-zoom-in">
+                        预报废
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination
+            v-show="codeTotal>0"
+            :total="codeTotal"
+            :page.sync="codeQuery.pageNum"
+            :limit.sync="codeQuery.pageSize"
+            @pagination="getCodeList"
+        />
+    </el-dialog>
+
+      <!-- 数量退料弹窗 -->
+      <el-dialog :title="title" :visible.sync="openNum" width="1200px" append-to-body>
+        <el-row :gutter="10" class="mb8" v-if="!dialogIsView">
+            <el-col :span="1.5">
+                <el-button
+                type="primary"
+                size="mini"
+                >保存</el-button>
+            </el-col>
+        </el-row>
+        <el-table v-loading="loading" :data="numList" height="500">
+          <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="typeModelName" :show-overflow-tooltip="true" />
+          <el-table-column label="退料数量" align="center" prop="" :show-overflow-tooltip="true" />
+          <el-table-column label="合格数量" align="center" prop="outNum" :show-overflow-tooltip="true" />
+          <el-table-column label="待维修数量" align="center" prop="alNum" :show-overflow-tooltip="true" />
+          <el-table-column label="待报废数量" align="center" prop="inputNum">
+            <template slot-scope="scope">
+              <el-input
+                v-model.number="scope.row.inputNum"
+                placeholder="请输入出库数量"
+                type="number" min="1"
+                @input="checkNum(scope.row)"
+                clearable
+                style="width: 100%" 
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="报废信息" align="center" prop="" :show-overflow-tooltip="true" />
+        </el-table>
+      </el-dialog>
+    </div>
+  </template>
+  
+  <script>
+  import { secondaryWarehouseList  } from "@/api/claimAndRefund/secondStore";
+  import { getTypeList } from "@/api/store/warehousing";
+  import { equipmentTypeTree } from "@/api/store/tools";
+  import Treeselect from "@riophae/vue-treeselect";
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+  export default {
+    // name: "returnInDetail",
+    components: { Treeselect },
+    data() {
+      return {
+        // 遮罩层
+        loading: false,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 表格数据
+        deviceList: [],
+        // 弹出层标题
+        title: "",
+        isView: false,//是否为查看
+        dialogIsView: false,//弹窗是否为查看
+        openIn: false,
+        // 日期范围
+        dateRange: [],
+        //搜索下拉数据
+        typeList: [],
+        equipmentTypeList: [],
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+  
+          unitId: undefined,
+          modelId: undefined,
+          typeId: undefined
+        },
+        openCode:false,//编码弹窗开关
+        openNum:false,//数量弹窗开关
+        returnNum:0,//退料数量
+        codeQuery: {//编码出库-搜索条件
+          pageNum: 1,
+          pageSize: 20,
+          maCode: undefined,
+        },
+        codeTotal: 0,//编码弹窗分页-总数
+        codeList:[],//编码弹窗表格数据
+        numList:[],//数量弹窗表格数据
+      };
+    },
+    created() {
+        if (this.$route.query.isView) {
+            this.isView = this.$route.query.isView
+        }else{
+            this.isView = false
+        }
+        this.getTypeList();
+
+        this.equipmentType();
+  
+        this.getList();
+    },
+    methods: {
+        //机具类型
+        getTypeList() {
+            getTypeList({level:'3'}).then(response => {
+                this.typeList = response.data;
+                }
+            )
+        },
+        //规格型号
+        equipmentType() {
+            equipmentTypeTree().then(response => {
+                this.equipmentTypeList = response.data;
+                this.equipmentTypeList.forEach((item,index)=>{
+                if(item.children&&item.children.length>0){
+                    item.children.forEach((item2,index2)=>{
+                    if(item2.children&&item2.children.length>0){
+                        item2.children.forEach(item3=>{
+                        if(item3.children&&item3.children.length>0){
+                            item3.children.forEach(item4=>{
+                            item4.machineTypeName = item3.typeName
+                            item4.specificationType = item4.typeName
+                            this.$set(item4, 'purchasePrice', 0);
+                            this.$set(item4, 'purchaseNum', 1);
+                            })
+                        }
+                        })
+                    }
+                    })
+                }
+                })
+            });
+        },
+        /** 查询列表 */
+        getList() {
+            this.loading = true;
+            secondaryWarehouseList(this.queryParams).then(response => {
+                this.deviceList = response.rows;
+                this.total = response.total;
+                this.loading = false;
+                }
+            );
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        back(){
+            this.$tab.closeOpenPage({ path: "/claimAndRefund/returnIn"});
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map(item => item.dictId)
+            this.single = selection.length!=1
+            this.multiple = !selection.length
+        },
+        //查看
+        handleView(row){
+            this.title = '查看';
+            this.openCode = true;
+            this.dialogIsView = true;
+        },
+        //编码退料
+        handleCodeReturn(row){
+            this.title = '编码退料';
+            this.openCode = true;
+            this.handleCodeQuery()
+        },
+        //数量退料
+        handleNumReturn(row){
+            this.title = '数量退料';
+            this.openNum = true;
+
+            let obj = {}
+            this.$set(obj,'taskId',row.taskId)
+            this.$set(obj,'parentId',row.parentId)
+            this.$set(obj,'typeName',row.typeName)
+            this.$set(obj,'typeModelName',row.typeModelName)
+            this.$set(obj,'typeId',row.typeId)
+            // this.$set(obj,'alNum  ',row.alNum)//已出库数量
+            // this.$set(obj,'outNum',row.outNum)//待出库数量
+            // this.$set(obj,'inputNum',1)//出库数量
+            this.outNumList = [obj]
+
+            // this.getNumList()
+        },
+        //编码退料查询
+        handleCodeQuery() {
+            this.codeQuery.pageNum = 1;
+            this.getCodeList();
+        },
+        //编码退料重置
+        resetCodeQuery() {
+            this.resetForm("codeQuery");
+            this.handleCodeQuery();
+        },
+        //获取退料编码列表
+        getCodeList() {
+            console.log('获取退料编码列表')
+            // getLeaseAuditListDetail(this.codeQuery).then(response => {
+            //     this.outCodeList = response.data.rows;
+            //     this.outTotal = response.data.total;
+            //   }
+            // );
+        },
+        //获取退料数量列表
+        getNumList() {
+            console.log('获取退料数量列表')
+            // getLeaseAuditListDetail(this.codeQuery).then(response => {
+            //     this.outCodeList = response.data.rows;
+            //     this.outTotal = response.data.total;
+            //   }
+            // );
+        },
+        /** 提交按钮 */
+        submitForm() {
+
+        },
+    }
+  };
+  </script>
+  <style lang="scss" scoped>
+  ::v-deep.el-table .fixed-width .el-button--mini {
+    width: 60px !important;
+    margin-bottom: 10px;
+  }
+  .clickText{
+    color: #02A7F0;
+    cursor: pointer;
+  }
+  </style>
+  
\ No newline at end of file