From b677a7ff119a84e340ec4fc11664805335abf37a Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 17 Apr 2024 13:20:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=82=AC=E5=8A=9E=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/api/index.js                      |    2 +-
 .../receive/receiveApplyAdd.vue               | 1391 ++++++++--------
 .../views/claimAndRefund/return/returnIn.vue  |  587 ++++---
 .../claimAndRefund/return/returnInDetail.vue  | 1422 ++++++++++-------
 sgzb-ui/src/views/index.vue                   |   23 +-
 sgzb-ui/src/views/inventoryLogs/index.vue     |    4 -
 .../src/views/scrapManage/Inventory/index.vue |   12 +
 .../views/scrapManage/forecastWaste/index.vue |   12 +
 sgzb-ui/src/views/scrapManage/scrap/index.vue |   12 +
 sgzb-ui/vue.config.js                         |    1 +
 10 files changed, 1948 insertions(+), 1518 deletions(-)
 create mode 100644 sgzb-ui/src/views/scrapManage/Inventory/index.vue
 create mode 100644 sgzb-ui/src/views/scrapManage/forecastWaste/index.vue
 create mode 100644 sgzb-ui/src/views/scrapManage/scrap/index.vue

diff --git a/sgzb-ui/src/api/index.js b/sgzb-ui/src/api/index.js
index 99e8fb89..225f20c8 100644
--- a/sgzb-ui/src/api/index.js
+++ b/sgzb-ui/src/api/index.js
@@ -32,7 +32,7 @@ export const getToPersonInfoAp = (data) => {
 
 /* 催办信息发送 */
 export const sendUrgingMessageApi = (data) => {
-  return request.post('/**', data)
+  return request.post('/material/todo/urgentProcessing', data)
 }
 
 
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
index e2e4e195..96aa98fb 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
@@ -1,93 +1,124 @@
 <template>
-  <div class="app-container" id="receiveApplyAdd">
-    <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" filterable 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" filterable 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 maxlength="50"  v-model="queryParams.agreementCode" disabled></el-input maxlength="50" >
-        </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="leasePerson">
-          <el-input maxlength="50" 
-            v-model="queryParams.leaseApplyInfo.leasePerson"
-            placeholder="请输入领料人"
-            clearable 
-          />
-        </el-form-item>
-        <el-form-item label="领料人电话" prop="phone">
-          <el-input maxlength="11" 
-            v-model="queryParams.leaseApplyInfo.phone"
-            placeholder="请输入领料人电话"
-            clearable
-            style="width: 240px" 
-          />
-        </el-form-item>
-        <el-form-item label="备注" prop="roleName">
-          <el-input maxlength="100" 
-            v-model="queryParams.leaseApplyInfo.remark"
-            placeholder="请输入备注"
-            clearable
-            rows="1"
-            type="textarea"
-            style="width: 240px" 
-          />
-        </el-form-item>
-      </el-row>
-      <el-row>
+    <div class="app-container" id="receiveApplyAdd">
+        <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"
+                        filterable
+                        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"
+                        filterable
+                        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
+                        maxlength="50"
+                        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="leasePerson">
+                    <el-input
+                        maxlength="50"
+                        v-model="queryParams.leaseApplyInfo.leasePerson"
+                        placeholder="请输入领料人"
+                        clearable
+                    />
+                </el-form-item>
+                <el-form-item label="领料人电话" prop="phone">
+                    <el-input
+                        maxlength="11"
+                        v-model="queryParams.leaseApplyInfo.phone"
+                        placeholder="请输入领料人电话"
+                        clearable
+                        style="width: 240px"
+                    />
+                </el-form-item>
+                <el-form-item label="备注" prop="roleName">
+                    <el-input
+                        maxlength="100"
+                        v-model="queryParams.leaseApplyInfo.remark"
+                        placeholder="请输入备注"
+                        clearable
+                        rows="1"
+                        type="textarea"
+                        style="width: 240px"
+                    />
+                </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="success"
+                    plain
+                    icon="el-icon-back"
+                    size="mini"
+                    @click="handleBack"
+                    >领料申请</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="primary"
+                    plain
+                    icon="el-icon-plus"
+                    size="mini"
+                    v-if="isEdit == 'true'"
+                    @click="handleAdd"
+                    >保存</el-button
+                >
+            </el-col>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-back"
-          size="mini"
-          @click="handleBack"
-        >领料申请</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          v-if="isEdit=='true'"
-          @click="handleAdd"
-        >保存</el-button>
-      </el-col>
-    
-      <!-- <el-col :span="1.5">
+            <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -96,563 +127,647 @@
           @click="handleExport"
         >导出</el-button>
       </el-col> -->
-    </el-row>
+        </el-row>
 
-    <el-table v-loading="loading" :data="leaseApplyDetails" @selection-change="handleSelectionChange">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="序号" type="index" width="80" />
-      <el-table-column label="类型名称" prop="typeCn" :show-overflow-tooltip="true"   />
-      <el-table-column label="规格型号" prop="guigeCn" :show-overflow-tooltip="true" />
-      <el-table-column label="计量单位" prop="unitCn"/>
-      <el-table-column label="库存数量" prop="num"/>
-      <el-table-column label="预领数量" align="center">
-        <template slot-scope="scope">
-          <el-input
-            v-model.number="scope.row.preNum"
-            placeholder="请输入预领数量"
-            type="number"
-            min="1" @input="checkNum(scope.row)"
-            clearable
-            style="width: 100%" 
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center">
-        <template slot-scope="scope">
-          <el-input maxlength="100" 
-            v-model="scope.row.remark"
-            placeholder="请输入备注"
-            clearable
-            style="width: 100%" 
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" v-if="isEdit=='true'">
-        <template slot-scope="scope">
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleBack(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>
+        <el-table
+            v-loading="loading"
+            :data="leaseApplyDetails"
+            @selection-change="handleSelectionChange"
+        >
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column label="序号" type="index" width="80" />
+            <el-table-column
+                label="类型名称"
+                prop="typeCn"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="规格型号"
+                prop="guigeCn"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column label="计量单位" prop="unitCn" />
+            <el-table-column label="库存数量" prop="num" />
+            <el-table-column label="预领数量" align="center">
+                <template slot-scope="scope">
+                    <el-input
+                        v-model.number="scope.row.preNum"
+                        placeholder="请输入预领数量"
+                        type="number"
+                        min="1"
+                        @input="checkNum(scope.row)"
+                        clearable
+                        style="width: 100%"
+                    />
+                </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center">
+                <template slot-scope="scope">
+                    <el-input
+                        maxlength="100"
+                        v-model="scope.row.remark"
+                        placeholder="请输入备注"
+                        clearable
+                        style="width: 100%"
+                    />
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="操作"
+                align="center"
+                fixed="right"
+                class-name="small-padding fixed-width"
+                v-if="isEdit == 'true'"
+            >
+                <template slot-scope="scope">
+                    <!--          <el-button-->
+                    <!--            size="mini"-->
+                    <!--            type="text"-->
+                    <!--            icon="el-icon-edit"-->
+                    <!--            @click="handleBack(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,
-  getLeaseListAll,
-  editLeaseApply,
-  getLeaseApplyListAll,
-  getLeaseApplyAuditListAll
-} from '@/api/claimAndRefund/receive'
-import { getInfo } from '@/api/login'
-export default {
-  name: "ReceiveApplyAdd",
-  data() {
-    const validatePhone = (rule, value, callback) => {
-      if (!value) {
-              callback(new Error("退料人电话不能为空"));
-              // this.$message.error("手机号不为空");
-      } else if (value.length < 11) {
-              callback(new Error("电话号码格式不正确"));
-              // this.$message.error("手机号格式不正确");
-      } else {
-              callback();
-      }
-    };
-    return {
-      user:null, // 用户信息
-      // 遮罩层
-      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,
-      isEdit:'true',
-      // 日期范围
-      dateRange: [],
-      // 数据范围选项
-      dataScopeOptions: [
-        {
-          value: "1",
-          label: "全部数据权限"
+    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,
+        getLeaseListAll,
+        editLeaseApply,
+        getLeaseApplyListAll,
+        getLeaseApplyAuditListAll,
+    } from '@/api/claimAndRefund/receive'
+    import { getInfo } from '@/api/login'
+    export default {
+        name: 'ReceiveApplyAdd',
+        data() {
+            const validatePhone = (rule, value, callback) => {
+                if (!value) {
+                    callback(new Error('退料人电话不能为空'))
+                    // this.$message.error("手机号不为空");
+                } else if (value.length < 11) {
+                    callback(new Error('电话号码格式不正确'))
+                    // this.$message.error("手机号格式不正确");
+                } else {
+                    callback()
+                }
+            }
+            return {
+                user: null, // 用户信息
+                // 遮罩层
+                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,
+                isEdit: 'true',
+                // 日期范围
+                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,
+                    //领料人信息
+                    leaseApplyInfo: {
+                        leasePerson: '',
+                        phone: '',
+                        remark: '',
+                    },
+                    //领料详情集合
+                    leaseApplyDetails: [],
+                },
+                leaseApplyDetails: [],
+
+                leaseApplyInfoList: [],
+
+                //领料详情单条模板
+                leaseApplyDetailsItem: {
+                    parenntId: null,
+                    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',
+                        },
+                    ],
+                    // leasePerson: [
+                    //   {
+                    //     required: true, message: '请输入领料人', trigger: 'blur',
+                    //   }
+                    // ],
+                    // phone: [
+                    //     {required: true, message: '请输入领料人手机号', trigger: 'change'},
+                    //     { validator: validatePhone, trigger: "blur" },
+                    //     { min: 11, message: "手机号不足11位", trigger: "blur" },
+                    // ],
+                },
+                unitList: [], //单位 集合
+                proList: [], // 工程 集合
+                deviceTypeTree: [], // 设备 树结构数据
+
+                taskId: null, // 是否编辑
+
+                // 设备 树显示 配置
+                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',
+                        },
+                    ],
+                },
+            }
         },
-        {
-          value: "2",
-          label: "自定数据权限"
+        created() {
+            this.GetUserInfo()
+
+            this.GetUnitData()
+
+            this.GetProData()
+
+            this.GetDeviceTypeTree()
+            // this.getList();
+            if (this.$route.query.taskId && !this.$route.query.isBack) {
+                this.GetTaskDetail(this.$route.query.taskId)
+            }
+            if (this.$route.query.taskId && this.$route.query.isBack) {
+                this.GetTaskDetail2(this.$route.query.taskId)
+            }
+            this.taskId = this.$route.query.taskId
+            this.isEdit = this.$route.query.isEdit
+            // console.log(typeof(this.isEdit))
+            // this.$set('isEdit',this.$route.query.isEdit)
         },
-        {
-          value: "3",
-          label: "本部门数据权限"
+
+        methods: {
+            // 获取用户信息
+            async GetUserInfo() {
+                const res = await getInfo()
+                this.user = res.user
+            },
+
+            // 获取 来往单位 列表数据
+            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 = {
+                    level: 4,
+                }
+                const res = await getDeviceTypeTree(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 getLeaseApplyListAll({ taskId })
+
+                const data = res.rows[0]
+
+                // unitId:null,
+                // proId:null,
+                // agreementId:null, //协议id
+                // agreementCode: null,
+                if (data.taskStatus == 100) {
+                    this.queryParams.taskStatus = 32
+                    this.queryParams.examineStatusId = '32'
+                }
+                this.queryParams.unitId = data.unitId
+                this.queryParams.proId = data.proId
+                this.queryParams.leaseApplyInfo.phone =
+                    data.leaseApplyInfoList[0].phone
+                this.queryParams.leaseApplyInfo.leasePerson =
+                    data.leaseApplyInfoList[0].leasePerson
+                this.queryParams.agreementCode = data.agreementCode
+                this.queryParams.agreementId = data.agreementId
+                this.queryParams.leaseApplyInfo.remark =
+                    data.leaseApplyInfoList[0].remark
+                this.leaseApplyInfoList = data.leaseApplyInfoList
+                this.leaseApplyDetails = data.leaseApplyDetails.map((item) => {
+                    return this.handelEchoData(item)
+                })
+            },
+            // 驳回提交 任务详情数据
+            async GetTaskDetail2(taskId) {
+                const res = await getLeaseApplyAuditListAll({ taskId })
+
+                const data = res.rows[0]
+
+                // unitId:null,
+                // proId:null,
+                // agreementId:null, //协议id
+                // agreementCode: null,
+                if (data.taskStatus == 100) {
+                    this.queryParams.taskStatus = 32
+                    this.queryParams.examineStatusId = '32'
+                }
+                this.queryParams.unitId = data.unitId
+                this.queryParams.proId = data.proId
+                this.queryParams.leaseApplyInfo.phone =
+                    data.leaseApplyInfoList[0].phone
+                this.queryParams.leaseApplyInfo.leasePerson =
+                    data.leaseApplyInfoList[0].leasePerson
+                this.queryParams.agreementCode = data.agreementCode
+                this.queryParams.agreementId = data.agreementId
+                this.queryParams.leaseApplyInfo.remark =
+                    data.leaseApplyInfoList[0].remark
+                this.leaseApplyInfoList = data.leaseApplyInfoList
+                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
+                template.parenntId = item.parenntId
+                template.num = item.num
+                return template
+            },
+
+            // 表单重置
+            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
+            },
+            /** 重置按钮操作 */
+            resetQuery() {
+                this.dateRange = []
+                this.resetForm('queryForm')
+            },
+            // 多选框选中数据
+            handleSelectionChange(selection) {
+                // this.queryParams.leaseApplyDetails = selection
+                this.single = selection.length != 1
+                this.multiple = !selection.length
+            },
+            // 更多操作触发
+            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 {
+                        this.queryParams.leaseApplyDetails =
+                            this.leaseApplyDetails
+                        if (this.queryParams.leaseApplyDetails.length == 0) {
+                            this.$message.error('请添加数据')
+                            return
+                        }
+                        this.queryParams.leaseApplyDetails.forEach((item) => {
+                            /*  if (item.num == 0) {
+                                this.$message.error(
+                                    '机具类型库存量为零无法领料',
+                                )
+                                return
+                            } */
+                            if (item.preNum == '') {
+                                this.$message.error('请填写预领数量')
+                                return
+                            }
+                        })
+                        this.queryParams.createBy = this.user.userName
+                        this.queryParams.companyId = this.user.companyId
+                        let res
+
+                        if (this.taskId) {
+                            this.leaseApplyInfoList.forEach((v) => {
+                                v = Object.assign(
+                                    v,
+                                    this.queryParams.leaseApplyInfo,
+                                )
+                                this.$set(
+                                    v,
+                                    'leaseApplyDetails',
+                                    this.queryParams.leaseApplyDetails,
+                                )
+                            })
+
+                            const params = {
+                                ...this.queryParams,
+                                taskId: this.taskId,
+                                leaseApplyInfoList: this.leaseApplyInfoList,
+                            }
+
+                            res = await editLeaseApply(params)
+                        } else {
+                            // console.log(this.queryParams)
+                            let isNum =
+                                this.queryParams.leaseApplyDetails.every(
+                                    (e) => e.num != 0,
+                                )
+
+                            if (!isNum) {
+                                this.$message.error(
+                                    '机具类型库存量为零无法领料',
+                                )
+                                return
+                            }
+                            res = await submitLeaseApply(this.queryParams)
+                        }
+                        if (res.code == 200) {
+                            this.$message({
+                                type: 'success',
+                                message: res.msg,
+                            })
+                            this.$tab.closeOpenPage({
+                                path: '/claimAndRefund/receive/receiveApply',
+                            })
+                        }
+                    }
+                })
+            },
+            /** 修改按钮操作 */
+            handleBack(row) {
+                this.$tab.closeOpenPage({
+                    path: '/claimAndRefund/receive/receiveApply',
+                })
+            },
+            /** 删除按钮操作 */
+            handleDelete(row) {
+                this.leaseApplyDetails.splice(row.index, 1)
+            },
+            /** 导出按钮操作 */
+            handleExport() {
+                // this.download('system/role/export', {
+                //   ...this.queryParams
+                // }, `role_${new Date().getTime()}.xlsx`)
+            },
+
+            checkNum(row) {
+                let maxNum = row.num
+                if (row.preNum <= 1) {
+                    row.preNum = 1
+                } else if (row.preNum >= maxNum) {
+                    row.preNum = maxNum
+                }
+            },
+            /////// 设备类型树  切换
+            deviceTypeChange(val) {
+                console.log(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
+                }
+                // console.log(this.leaseApplyDetails)
+                // console.log(nodes[0].data.id)
+                for (let i = 0; i < this.leaseApplyDetails.length; i++) {
+                    if (this.leaseApplyDetails[i].typeId == nodes[0].data.id) {
+                        this.leaseApplyDetails.splice(i, 1)
+                        break
+                    }
+                }
+                this.leaseApplyDetails.push(this.handelTableItemData(nodes[0]))
+                this.deviceType = {}
+            },
+            //// 将数据处理成 表格中需要的数据
+            handelTableItemData(node) {
+                const template = JSON.parse(
+                    JSON.stringify(this.leaseApplyDetailsItem),
+                )
+                template.createBy = this.user.name
+                console.log(node.data)
+                template.num = node.data.num
+                template.companyId = node.data.companyId
+                template.typeId = node.data.id
+                template.unitCn = node.data.unitName
+                template.typeCn = node.pathLabels[2]
+                template.guigeCn = node.pathLabels[3]
+
+                if (this.taskId) {
+                    const index = this.leaseApplyInfoList.find(
+                        (key) => key.companyId == node.data.companyId,
+                    )
+                    template.parenntId = index ? index.id : ''
+                }
+
+                return template
+            },
         },
-        {
-          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,
-        //领料人信息
-        leaseApplyInfo:{
-          leasePerson: '',
-          phone: '',
-          remark: ''
-        },
-        //领料详情集合
-        leaseApplyDetails:[]
-      },
-      leaseApplyDetails:[],
-
-      leaseApplyInfoList:[],
-
-      //领料详情单条模板
-      leaseApplyDetailsItem:{
-        parenntId:null,
-        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'
-          }
-        ],
-        // leasePerson: [
-        //   {
-        //     required: true, message: '请输入领料人', trigger: 'blur',
-        //   }
-        // ],
-        // phone: [
-        //     {required: true, message: '请输入领料人手机号', trigger: 'change'},
-        //     { validator: validatePhone, trigger: "blur" },
-        //     { min: 11, message: "手机号不足11位", trigger: "blur" },
-        // ],
-      },
-      unitList:[], //单位 集合
-      proList:[], // 工程 集合
-      deviceTypeTree: [], // 设备 树结构数据
-
-      taskId:null, // 是否编辑
-
-      // 设备 树显示 配置
-      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.GetUserInfo()
-
-    this.GetUnitData()
-
-    this.GetProData()
-
-    this.GetDeviceTypeTree()
-    // this.getList();
-    if(this.$route.query.taskId&&!this.$route.query.isBack){
-      this.GetTaskDetail(this.$route.query.taskId)
     }
-    if(this.$route.query.taskId&&this.$route.query.isBack){
-      this.GetTaskDetail2(this.$route.query.taskId)
-    }
-    this.taskId = this.$route.query.taskId
-    this.isEdit = this.$route.query.isEdit;
-    // console.log(typeof(this.isEdit))
-    // this.$set('isEdit',this.$route.query.isEdit)
-  },
-
-  methods: {
-    // 获取用户信息
-    async GetUserInfo(){
-      const res = await getInfo()
-      this.user = res.user
-    },
-
-    // 获取 来往单位 列表数据
-    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 = {
-        level:4
-      }
-      const res = await getDeviceTypeTree(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 getLeaseApplyListAll({taskId})
-
-      const data = res.rows[0]
-
-        // unitId:null,
-        // proId:null,
-        // agreementId:null, //协议id
-        // agreementCode: null,
-      if(data.taskStatus==100){
-        this.queryParams.taskStatus = 32
-        this.queryParams.examineStatusId = '32'
-      }
-      this.queryParams.unitId = data.unitId
-      this.queryParams.proId = data.proId
-      this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfoList[0].phone
-      this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson
-      this.queryParams.agreementCode = data.agreementCode
-      this.queryParams.agreementId = data.agreementId
-      this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark
-      this.leaseApplyInfoList = data.leaseApplyInfoList
-      this.leaseApplyDetails = data.leaseApplyDetails.map(item => {
-          return this.handelEchoData(item)
-      })
-
-    },
-    // 驳回提交 任务详情数据
-    async GetTaskDetail2(taskId){
-      const res = await getLeaseApplyAuditListAll({taskId})
-
-      const data = res.rows[0]
-
-        // unitId:null,
-        // proId:null,
-        // agreementId:null, //协议id
-        // agreementCode: null,
-      if(data.taskStatus==100){
-        this.queryParams.taskStatus = 32
-        this.queryParams.examineStatusId = '32'
-      }
-      this.queryParams.unitId = data.unitId
-      this.queryParams.proId = data.proId
-      this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfoList[0].phone
-      this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson
-      this.queryParams.agreementCode = data.agreementCode
-      this.queryParams.agreementId = data.agreementId
-      this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark
-      this.leaseApplyInfoList = data.leaseApplyInfoList
-      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
-      template.parenntId = item.parenntId
-      template.num = item.num
-      return template
-    }, 
-       
-    // 表单重置
-    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; 
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm"); 
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      // this.queryParams.leaseApplyDetails = selection
-      this.single = selection.length != 1
-      this.multiple = !selection.length
-    },
-    // 更多操作触发
-    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 {
-            this.queryParams.leaseApplyDetails = this.leaseApplyDetails
-            if( this.queryParams.leaseApplyDetails.length == 0 ){
-              this.$message.error('请添加数据');
-              return
-            }
-            this.queryParams.leaseApplyDetails.forEach(item=>{
-              if(item.num==0){
-                this.$message.error('机具类型库存量为零无法领料');
-                return
-              }
-              if(item.preNum==''){
-                this.$message.error('请填写预领数量');
-                return
-              }
-            })
-            this.queryParams.createBy = this.user.userName
-            this.queryParams.companyId = this.user.companyId
-            let res;
-
-            if(this.taskId){
-              this.leaseApplyInfoList.forEach(v => {
-                v = Object.assign(v,this.queryParams.leaseApplyInfo)
-                this.$set(v,'leaseApplyDetails',this.queryParams.leaseApplyDetails)
-              })
-              
-              const params = {
-                ...this.queryParams,taskId:this.taskId,
-                leaseApplyInfoList:this.leaseApplyInfoList
-              }
-             
-              res = await editLeaseApply(params)
-            }else {
-              // console.log(this.queryParams)
-              res = await submitLeaseApply(this.queryParams)
-            }
-            if(res.code == 200){
-              this.$message({
-                type:'success',
-                message: res.msg
-              }) 
-              this.$tab.closeOpenPage({ path: "/claimAndRefund/receive/receiveApply"});
-            }
-          }
-      })
-
-
-    },
-    /** 修改按钮操作 */
-    handleBack(row) {
-      this.$tab.closeOpenPage({ path: "/claimAndRefund/receive/receiveApply"});
-    }, 
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.leaseApplyDetails.splice(row.index,1)
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      // this.download('system/role/export', {
-      //   ...this.queryParams
-      // }, `role_${new Date().getTime()}.xlsx`)
-    },
-   
-    checkNum(row){
-      let maxNum = row.num
-      if(row.preNum<=1){
-        row.preNum = 1
-      }else if(row.preNum>=maxNum){
-        row.preNum = maxNum
-      }
-    },
-    /////// 设备类型树  切换
-    deviceTypeChange(val){
-      console.log(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
-      }
-      // console.log(this.leaseApplyDetails)
-      // console.log(nodes[0].data.id)
-      for(let i = 0; i < this.leaseApplyDetails.length; i++) {
-            if (this.leaseApplyDetails[i].typeId == nodes[0].data.id) {
-                this.leaseApplyDetails.splice(i,1)
-                break;
-            }
-      }
-      this.leaseApplyDetails.push(
-        this.handelTableItemData(nodes[0])
-      )
-      this.deviceType = {} 
-    },
-    //// 将数据处理成 表格中需要的数据
-    handelTableItemData(node){
-      const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
-      template.createBy = this.user.name
-      console.log(node.data)
-      template.num = node.data.num
-      template.companyId = node.data.companyId
-      template.typeId = node.data.id
-      template.unitCn = node.data.unitName
-      template.typeCn = node.pathLabels[2]
-      template.guigeCn = node.pathLabels[3]
-
-      if(this.taskId){
-        const index = this.leaseApplyInfoList.find(key => key.companyId == node.data.companyId)
-        template.parenntId = index ? index.id : ''
-      }
-
-      return template
-    }
-  }
-};
 </script>
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue b/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
index bc561f98..17b2ce7d 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
@@ -135,267 +135,338 @@
             >批量审核</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="typeName" :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" prop="taskName" :show-overflow-tooltip="true">
-        </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')" v-if="scope.row.taskStatus!='40'">
-                退料
-            </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>
+            <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="typeName"
+                :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"
+                prop="taskName"
+                :show-overflow-tooltip="true"
+            >
+            </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')"
+                        v-if="scope.row.taskStatus != '40'"
+                    >
+                        退料
+                    </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,getBackReceiveList } 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: ''
+</template>
+
+<script>
+    import {
+        getBackAuditList,
+        getViewByExamine,
+        ApiBackApplyAudit,
+        ApiBackApplyRefuse,
+        getBackReceiveList,
+    } 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: {},
+            }
         },
-        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.dateRange[0]
-        this.queryParams.endTime = this.dateRange[1]
-        try {
-          let params = {
-            flag:1,
-            companyId: this.companyId,
-            ...this.queryParams
-          }
-          console.log("paramsparamsparams", params)
-          const res = await getBackReceiveList(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.initSelectData()
-        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,
-                taskId:row.taskId
-            }
-             
-        })
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-         this.download('base/backReceive/export', {
-          ...this.queryParams
-        }, `退料接收_${new Date().getTime()}.xlsx`)
-      },
- 
-     
-    }}
+        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.dateRange[0]
+                this.queryParams.endTime = this.dateRange[1]
+                try {
+                    let params = {
+                        flag: 1,
+                        companyId: this.companyId,
+                        ...this.queryParams,
+                    }
+                    console.log('paramsparamsparams', params)
+                    const res = await getBackReceiveList(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.initSelectData()
+                this.handleQuery()
+            },
+            //打开退料单
+            handlePrint(row) {
+                // this.title = "退料单";
+                this.isShowOneFlag = true
+                this.rowObj = row
+            },
+            //查看按钮
+            handleSee(row) {
+                this.$tab.closeOpenPage({
+                    path: '/claimAndRefund/return/returnInDetail',
+                    query: {
+                        Id: row.id,
+                        isView: true,
+                    },
+                })
+            },
+            //退料按钮
+            handleReturn(row) {
+                this.$tab.closeOpenPage({
+                    path: '/claimAndRefund/return/returnInDetail',
+                    query: {
+                        Id: row.id,
+                        taskId: row.taskId,
+                    },
+                })
+            },
+            /** 导出按钮操作 */
+            handleExport() {
+                this.download(
+                    'base/backReceive/export',
+                    {
+                        ...this.queryParams,
+                    },
+                    `退料接收_${new Date().getTime()}.xlsx`,
+                )
+            },
+        },
+    }
 </script>
 <style lang="scss" scoped>
     .submit_box {
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
index 75419576..fe66c414 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
@@ -1,7 +1,14 @@
 <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-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="请输入关键字"
@@ -10,632 +17,841 @@
             @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-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" @click="completeBack"
+                    >完成退料</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-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" @click="completeBack"
-          >完成退料</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="typeCode" :show-overflow-tooltip="true" />
-        <el-table-column label="申请数量" align="center" prop="preNum" :show-overflow-tooltip="true"/>
-        <el-table-column label="退料数量" align="center" prop="num" :show-overflow-tooltip="true" />
-        <!-- <el-table-column label="维修数量" align="center" prop="" :show-overflow-tooltip="true"/>
+            <el-table-column
+                label="规格型号"
+                align="center"
+                prop="typeCode"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="申请数量"
+                align="center"
+                prop="preNum"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="退料数量"
+                align="center"
+                prop="num"
+                :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="status" :show-overflow-tooltip="true">
+            <!-- <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.status==0">待审批</span>
             <span v-if="scope.row.status==1">进行中</span>
             <span v-if="scope.row.status==2">已出库</span>
           </template>
         </el-table-column> -->
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
-          <template slot-scope="scope">
-            <el-button size="mini" @click="handleViewCode(scope.row)" v-if="scope.row.manageType=='0'">
-                查看
-            </el-button>
-            <el-button size="mini" @click="handleViewNum(scope.row)" v-if="scope.row.manageType=='1'">
-                查看
-            </el-button>
-            <el-button size="mini" type="primary" @click="handleCodeReturn(scope.row)" v-if="!isView&&scope.row.manageType=='0'&&scope.row.num>0">
-                编码退料
-            </el-button>
-            <el-button size="mini" type="primary" @click="handleNumReturn(scope.row)" v-if="!isView&&scope.row.manageType=='1'&&scope.row.num>0">
-                数量退料
-            </el-button>
-            <!-- <el-button size="mini" icon="el-icon-zoom-in">
+            <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+                width="300"
+            >
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        @click="handleViewCode(scope.row)"
+                        v-if="scope.row.manageType == '0'"
+                    >
+                        查看
+                    </el-button>
+                    <el-button
+                        size="mini"
+                        @click="handleViewNum(scope.row)"
+                        v-if="scope.row.manageType == '1'"
+                    >
+                        查看
+                    </el-button>
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        @click="handleCodeReturn(scope.row)"
+                        v-if="
+                            !isView &&
+                            scope.row.manageType == '0' &&
+                            scope.row.num > 0
+                        "
+                    >
+                        编码退料
+                    </el-button>
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        @click="handleNumReturn(scope.row)"
+                        v-if="
+                            !isView &&
+                            scope.row.manageType == '1' &&
+                            scope.row.num > 0
+                        "
+                    >
+                        数量退料
+                    </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="success"
-                size="mini"
-                :disabled="multiple"
-                @click="saveCodeBackBatch(1)"
-                >批量合格</el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button
-                type="primary"
-                size="mini"
-                :disabled="multiple"
-                @click="saveCodeBackBatch(2)"
-                >批量维修</el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button
-                type="warning"
-                size="mini"
-                :disabled="multiple"
-                @click="saveCodeBackBatch(3)"
-                >批量报废</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" width="250">
-                <template slot-scope="scope">
-                    <el-button size="mini" type="success" @click="saveCodeBack(scope.row,1)">
-                        合格
-                    </el-button>
-                    <el-button size="mini" type="primary" @click="saveCodeBack(scope.row,2)">
-                        待维修
-                    </el-button>
-                    <el-button size="mini" type="warning" @click="saveCodeBack(scope.row,3)">
-                        预报废
-                    </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"
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
         />
-    </el-dialog>
 
-      <!-- 数量退料弹窗 -->
-      <el-dialog :title="title" :visible.sync="openNum" width="1200px" append-to-body>
-        <div style="margin-left: 40px;margin-bottom: 10px;">
-        退料数量：{{returnNum}}
-        </div>
-        <el-row :gutter="10" class="mb8" v-if="!dialogIsView">
-            <el-col :span="1.5">
-                <el-button
-                type="primary"
-                size="mini"
-                v-if="returnNum>0"
-                @click="saveNumReturn"
-                >保存</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="typeCode" :show-overflow-tooltip="true" />
-          <el-table-column label="退料数量" align="center" prop="backNum" :show-overflow-tooltip="true" />
-          <el-table-column label="合格数量" align="center" prop="qualifiedNum" :show-overflow-tooltip="true" >
-            <template slot-scope="scope">
-              <el-input
-                v-model.number="scope.row.qualifiedNum"
-                placeholder="请输入合格数量" 
-                type="number" min="0"
-                clearable :disabled="dialogIsView"
-                style="width: 100%" 
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="待维修数量" align="center" prop="serviceNum" :show-overflow-tooltip="true">
-            <template slot-scope="scope">
-              <el-input
-                v-model.number="scope.row.serviceNum"
-                placeholder="请输入待维修数量"
-                type="number" min="0"
-                clearable :disabled="dialogIsView"
-                style="width: 100%" 
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="待报废数量" align="center" prop="scrapNum">
-            <template slot-scope="scope">
-              <el-input
-                v-model.number="scope.row.scrapNum"
-                placeholder="请输入待报废数量"
-                type="number" min="0"
-                clearable :disabled="dialogIsView"
-                style="width: 100%" 
-              />
-            </template>
-          </el-table-column>
-          <!-- <el-table-column label="报废信息" align="center" prop="" :show-overflow-tooltip="true" /> -->
-        </el-table>
-      </el-dialog>
+        <!-- 编码退料弹窗 -->
+        <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="success"
+                        size="mini"
+                        :disabled="multiple"
+                        @click="saveCodeBackBatch(1)"
+                        >批量合格</el-button
+                    >
+                </el-col>
+                <el-col :span="1.5">
+                    <el-button
+                        type="primary"
+                        size="mini"
+                        :disabled="multiple"
+                        @click="saveCodeBackBatch(2)"
+                        >批量维修</el-button
+                    >
+                </el-col>
+                <el-col :span="1.5">
+                    <el-button
+                        type="warning"
+                        size="mini"
+                        :disabled="multiple"
+                        @click="saveCodeBackBatch(3)"
+                        >批量报废</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"
+                    width="250"
+                >
+                    <template slot-scope="scope">
+                        <el-button
+                            size="mini"
+                            type="success"
+                            @click="saveCodeBack(scope.row, 1)"
+                        >
+                            合格
+                        </el-button>
+                        <el-button
+                            size="mini"
+                            type="primary"
+                            @click="saveCodeBack(scope.row, 2)"
+                        >
+                            待维修
+                        </el-button>
+                        <el-button
+                            size="mini"
+                            type="warning"
+                            @click="saveCodeBack(scope.row, 3)"
+                        >
+                            预报废
+                        </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
+        >
+            <div style="margin-left: 40px; margin-bottom: 10px">
+                退料数量：{{ returnNum }}
+            </div>
+            <el-row :gutter="10" class="mb8" v-if="!dialogIsView">
+                <el-col :span="1.5">
+                    <el-button
+                        type="primary"
+                        size="mini"
+                        v-if="returnNum > 0"
+                        @click="saveNumReturn"
+                        >保存</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="typeCode"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="退料数量"
+                    align="center"
+                    prop="backNum"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="合格数量"
+                    align="center"
+                    prop="qualifiedNum"
+                    :show-overflow-tooltip="true"
+                >
+                    <template slot-scope="scope">
+                        <el-input
+                            v-model.number="scope.row.qualifiedNum"
+                            placeholder="请输入合格数量"
+                            type="number"
+                            min="0"
+                            clearable
+                            :disabled="dialogIsView"
+                            style="width: 100%"
+                        />
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    label="待维修数量"
+                    align="center"
+                    prop="serviceNum"
+                    :show-overflow-tooltip="true"
+                >
+                    <template slot-scope="scope">
+                        <el-input
+                            v-model.number="scope.row.serviceNum"
+                            placeholder="请输入待维修数量"
+                            type="number"
+                            min="0"
+                            clearable
+                            :disabled="dialogIsView"
+                            style="width: 100%"
+                        />
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    label="待报废数量"
+                    align="center"
+                    prop="scrapNum"
+                >
+                    <template slot-scope="scope">
+                        <el-input
+                            v-model.number="scope.row.scrapNum"
+                            placeholder="请输入待报废数量"
+                            type="number"
+                            min="0"
+                            clearable
+                            :disabled="dialogIsView"
+                            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 { receiveView ,getBackMachine,backReceiveRecordWeb,setNumBack,setCodeBack, getRecord, endBack } from "@/api/claimAndRefund/return";
-  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";
-  import { getInfo } from "@/api/login";
-  export default {
-    // name: "returnInDetail",
-    components: { Treeselect },
-    data() {
-      return {
-        createBy: '', //用户名
-        // 遮罩层
-        loading: false,
-        // 选中数组
-        codeSelectList: [],
-        // 非单个禁用
-        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
-        }
-        if (this.$route.query.Id) {
-            this.queryParams.id = this.$route.query.Id;
-        }
-        if (this.$route.query.taskId) {
-          this.queryParams.taskId = this.$route.query.taskId;
-        }
-        this.getTypeList();
+</template>
 
-        this.equipmentType();
-  
-        this.getList();
+<script>
+    import {
+        receiveView,
+        getBackMachine,
+        backReceiveRecordWeb,
+        setNumBack,
+        setCodeBack,
+        getRecord,
+        endBack,
+    } from '@/api/claimAndRefund/return'
+    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'
+    import { getInfo } from '@/api/login'
+    export default {
+        // name: "returnInDetail",
+        components: { Treeselect },
+        data() {
+            return {
+                createBy: '', //用户名
+                // 遮罩层
+                loading: false,
+                // 选中数组
+                codeSelectList: [],
+                // 非单个禁用
+                single: true,
+                // 非多个禁用
+                multiple: true,
+                // 显示搜索条件
+                showSearch: true,
+                // 总条数
+                total: 0,
+                // 表格数据
+                deviceList: [],
+                // 弹出层标题
+                title: '',
+                isView: false, //是否为查看
+                dialogIsView: false, //弹窗是否为查看
+                openIn: false,
+                // 日期范围
+                dateRange: [],
+                //搜索下拉数据
+                typeList: [],
+                equipmentTypeList: [],
+                // 查询参数
+                queryParams: {
+                    pageNum: 1,
+                    pageSize: 10,
 
-        getInfo().then(res => {
-          this.createBy = res.user.userId
-        })
-    },
-    methods: {
-        //机具类型
-        getTypeList() {
-            getTypeList({level:'3'}).then(response => {
-                this.typeList = response.data;
-                }
-            )
+                    unitId: undefined,
+                    modelId: undefined,
+                    typeId: undefined,
+                },
+                openCode: false, //编码弹窗开关
+                openNum: false, //数量弹窗开关
+                returnNum: 0, //退料数量
+                codeQuery: {
+                    //编码出库-搜索条件
+                    pageNum: 1,
+                    pageSize: 20,
+                    maCode: undefined,
+                },
+                codeTotal: 0, //编码弹窗分页-总数
+                codeList: [], //编码弹窗表格数据
+                numList: [], //数量弹窗表格数据
+            }
         },
-        //规格型号
-        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);
+        created() {
+            if (this.$route.query.isView) {
+                this.isView = this.$route.query.isView
+            } else {
+                this.isView = false
+            }
+            if (this.$route.query.Id) {
+                this.queryParams.id = this.$route.query.Id
+            }
+            if (this.$route.query.taskId) {
+                this.queryParams.taskId = this.$route.query.taskId
+            }
+            this.getTypeList()
+
+            this.equipmentType()
+
+            this.getList()
+
+            getInfo().then((res) => {
+                this.createBy = res.user.userId
+            })
+        },
+        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
+                receiveView(this.queryParams).then((response) => {
+                    this.deviceList = response.data.rows
+                    this.total = response.data.total
+                    this.loading = false
+                })
+            },
+            /** 搜索按钮操作 */
+            handleQuery() {
+                this.queryParams.pageNum = 1
+                this.getList()
+            },
+            /** 重置按钮操作 */
+            resetQuery() {
+                this.resetForm('queryForm')
+                this.handleQuery()
+            },
+            //返回
+            back() {
+                this.$tab.closeOpenPage({
+                    path: '/claimAndRefund/return/returnIn',
+                })
+            },
+            //完成退料接收
+            async completeBack() {
+                let param1 = {
+                    parentId: this.queryParams.id,
+                }
+                const res1 = await getRecord(param1)
+                console.log(res1)
+                if (res1.code == 200) {
+                    let param = {
+                        createBy: this.createBy,
+                        parentId: this.queryParams.id,
+                        taskId: this.queryParams.taskId,
                     }
+                    endBack(param).then((response) => {
+                        if (response.code == 200) {
+                            this.$modal.msgSuccess('操作成功')
+                            this.back()
+                        }
                     })
                 }
-                })
-            });
-        },
-        /** 查询列表 */
-        getList() {
-            this.loading = true;
-            receiveView(this.queryParams).then(response => {
-                this.deviceList = response.data.rows;
-                this.total = response.data.total;
-                this.loading = false;
+            },
+            //查看编码数据
+            handleViewCode(row) {
+                this.title = '查看'
+                this.openCode = true
+                this.resetForm('codeQuery')
+                this.codeQuery.parentId = row.id
+                this.codeQuery.typeId = row.modelId
+                this.dialogIsView = true
+                this.returnNum = Number(row.num)
+                this.handleCodeQuery()
+            },
+            //查看数量数据
+            handleViewNum(row) {
+                let param = {
+                    parentId: row.id,
+                    typeId: row.modelId,
                 }
-            );
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.pageNum = 1;
-            this.getList();
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.resetForm("queryForm");
-            this.handleQuery();
-        },
-        //返回
-        back(){
-            this.$tab.closeOpenPage({ path: "/claimAndRefund/returnIn"});
-        },
-        //完成退料接收
-        async completeBack(){
-          let param1 = {
-            parentId:this.queryParams.id
-          }
-          const res1 = await getRecord(param1)
-          console.log(res1)
-          if(res1.code==200){
-            let param = {
-              createBy:this.createBy,
-              parentId:this.queryParams.id,
-              taskId:this.queryParams.taskId
-            }
-            endBack(param).then(response => {
-                  if(response.code==200){
-                    this.$modal.msgSuccess("操作成功");
-                    this.back();
-                  }
-            });
-          }
-
-        },
-        //查看编码数据
-        handleViewCode(row){
-            this.title = '查看';
-            this.openCode = true;
-            this.resetForm("codeQuery");
-            this.codeQuery.parentId = row.id;
-            this.codeQuery.typeId = row.modelId;
-            this.dialogIsView = true;
-            this.returnNum = Number(row.num);
-            this.handleCodeQuery()
-        },
-         //查看数量数据
-        handleViewNum(row){
-          let param = {
-            parentId:row.id,
-            typeId:row.modelId
-          }
-          backReceiveRecordWeb(param).then(res=>{
-            if(res.code==200){
-              this.title = '查看';
-              this.openNum = true;
-              this.dialogIsView = true;
-              this.numList=res.data.rows;
-              this.numList.forEach(item=>{
-                if(item.backStatus=='1'){item.qualifiedNum = item.backNum;item.serviceNum=0;item.scrapNum=0;}
-                if(item.backStatus=='2'){item.serviceNum = item.backNum;item.qualifiedNum=0;item.scrapNum=0;}
-                if(item.backStatus=='3'){item.scrapNum = item.backNum;item.qualifiedNum=0;item.serviceNum=0;}
-              })
-            }
-
-          })
-        },
-        //编码退料
-        handleCodeReturn(row){
-            this.title = '编码退料';
-            this.openCode = true;
-            this.resetForm("codeQuery");
-            this.codeQuery.parentId = row.id;
-            this.codeQuery.taskId = row.taskId;
-            this.codeQuery.typeId = row.modelId;
-            this.dialogIsView = false;
-            this.returnNum = Number(row.num);
-            this.handleCodeQuery()
-        },
-        //数量退料
-        handleNumReturn(row){
-            this.title = '数量退料';
-            this.openNum = true;
-            this.dialogIsView = false
-            let obj = {}
-            this.$set(obj,'taskId',row.taskId)
-            this.$set(obj,'parentId',row.id)
-            this.$set(obj,'typeName',row.typeName)
-            this.$set(obj,'typeCode',row.typeCode)
-            this.$set(obj,'typeId',row.modelId)
-            this.$set(obj,'backNum',row.num)//退料数量 
-            this.returnNum = Number(row.num);
-            this.$set(obj,'qualifiedNum',0)//合格数量
-            this.$set(obj,'serviceNum',0)//待维修数量
-            this.$set(obj,'scrapNum',0)//待报废数量
-            this.numList = [obj]
-            // this.getNumList()
-        },
-        //编码退料查询
-        handleCodeQuery() {
-            this.codeQuery.pageNum = 1;
-            if(this.dialogIsView){
-              this.getCodeViewList()
-            }else{
-              this.getCodeList();
-            }
-            
-        },
-        //编码退料重置
-        resetCodeQuery() {
-            this.resetForm("codeQuery");
-            this.handleCodeQuery();
-        },
-        //获取退料编码列表
-        getCodeList() {
-            getBackMachine(this.codeQuery).then(response => {
-                this.codeList = response.data.rows;
-                this.codeTotal = response.data.total;
-            });
-        },
-        //获取退料编码查看列表
-        getCodeViewList() {
-          backReceiveRecordWeb(this.codeQuery).then(response => {
-                this.codeList = response.data.rows;
-                this.codeList
-                this.codeList.forEach(item=>{
-                  item.typeModelName = item.typeCode
-                if(item.backStatus=='1'){item.maStatus = '合格'}
-                if(item.backStatus=='2'){item.maStatus = '维修'}
-                if(item.backStatus=='3'){item.maStatus = '报废'}
-              })
-                this.codeTotal = response.data.total;
-            });
-        },
-
-        /** 数量退料按钮 */
-        saveNumReturn() {
-          let data = this.numList[0]
-          let sumUnmber = data.qualifiedNum+data.serviceNum+data.scrapNum;
-          if(sumUnmber>this.returnNum){
-            this.$modal.msgError("退料总量已大于待退料数量！");
-          }else{
-            let arr = []
-            if(data.qualifiedNum>0){
-              let obj = {
-                parentId:data.parentId,
-                typeId:data.typeId,
-                manageType:1,
-                createBy:this.createBy,
-                backStatus:1,
-                backNum:data.qualifiedNum
-              }
-              arr.push(obj)
-            }
-            if(data.serviceNum>0){
-              let obj = {
-                parentId:data.parentId,
-                typeId:data.typeId,
-                manageType:1,
-                createBy:this.createBy,
-                backStatus:2,
-                backNum:data.serviceNum
-              }
-              arr.push(obj)
-            }
-            if(data.scrapNum>0){
-              let obj = {
-                parentId:data.parentId,
-                typeId:data.typeId,
-                manageType:1,
-                createBy:this.createBy,
-                backStatus:3,
-                backNum:data.scrapNum
-              }
-              arr.push(obj)
-            }
-            let param = {
-              taskId:data.taskId,
-              arr:arr
-            }
-            // console.log(arr)
-            // console.log(param)
-            setNumBack(param).then(response => {
-                if(response.code==200){
-                  this.$modal.msgSuccess("操作成功");
-                  this.openNum = false;
-                  this.handleQuery();
-                }
-            });   
-          }
-        },
-        /** 编码退料按钮 */
-        saveCodeBack(row,type){
-          if(this.returnNum==0){
-            this.$modal.msgError("退料数量为零，无法操作！");
-          }else{
-            let arr = [{
-                  parentId:this.codeQuery.parentId,
-                  typeId:row.typeId,
-                  backNum:1,
-                  backStatus:type,
-                  manageType:0,
-                  createBy:this.createBy,
-                  maId:row.maId
-                
-            }]
-            let param = {
-              taskId:this.codeQuery.taskId,
-              arr:arr
-            }
-            setCodeBack(param).then(response => {
-                  if(response.code==200){
-                    this.$modal.msgSuccess("操作成功");
-                    // this.openCode = false;
-                    this.returnNum = Number(this.returnNum)-1;
-                    this.handleCodeQuery();
-                    this.handleQuery();
-                  }
-            });              
-          }
- 
-        },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-          this.codeSelectList = selection
-          this.single = selection.length!=1
-          this.multiple = !selection.length
-        },
-         /** 编码退料 - 批量操作 */
-        saveCodeBackBatch(type){
-
-          if(this.codeSelectList.length>this.returnNum){
-            this.$modal.msgError("退料总量已大于待退料数量！");
-          }else{
-            let arr = [];
-            arr = this.codeSelectList.map(item=>{
-              return {
-                      parentId:this.codeQuery.parentId,
-                      typeId:item.typeId,
-                      backNum:1,
-                      backStatus:type,
-                      manageType:0,
-                      createBy:this.createBy,
-                      maId:item.maId
+                backReceiveRecordWeb(param).then((res) => {
+                    if (res.code == 200) {
+                        this.title = '查看'
+                        this.openNum = true
+                        this.dialogIsView = true
+                        this.numList = res.data.rows
+                        this.numList.forEach((item) => {
+                            if (item.backStatus == '1') {
+                                item.qualifiedNum = item.backNum
+                                item.serviceNum = 0
+                                item.scrapNum = 0
+                            }
+                            if (item.backStatus == '2') {
+                                item.serviceNum = item.backNum
+                                item.qualifiedNum = 0
+                                item.scrapNum = 0
+                            }
+                            if (item.backStatus == '3') {
+                                item.scrapNum = item.backNum
+                                item.qualifiedNum = 0
+                                item.serviceNum = 0
+                            }
+                        })
                     }
-            })
-            let param = {
-              taskId:this.codeQuery.taskId,
-              arr:arr
-            }
-            // console.log(param)
-            setCodeBack(param).then(response => {
-                  if(response.code==200){
-                    this.$modal.msgSuccess("操作成功");
-                    // this.openCode = false;
-                    this.returnNum = Number(this.returnNum)-this.codeSelectList.length;
-                    this.handleCodeQuery();
-                    this.handleQuery();
-                  }
-            });
-          }
-        }
+                })
+            },
+            //编码退料
+            handleCodeReturn(row) {
+                this.title = '编码退料'
+                this.openCode = true
+                this.resetForm('codeQuery')
+                this.codeQuery.parentId = row.id
+                this.codeQuery.taskId = row.taskId
+                this.codeQuery.typeId = row.modelId
+                this.dialogIsView = false
+                this.returnNum = Number(row.num)
+                this.handleCodeQuery()
+            },
+            //数量退料
+            handleNumReturn(row) {
+                this.title = '数量退料'
+                this.openNum = true
+                this.dialogIsView = false
+                let obj = {}
+                this.$set(obj, 'taskId', row.taskId)
+                this.$set(obj, 'parentId', row.id)
+                this.$set(obj, 'typeName', row.typeName)
+                this.$set(obj, 'typeCode', row.typeCode)
+                this.$set(obj, 'typeId', row.modelId)
+                this.$set(obj, 'backNum', row.num) //退料数量
+                this.returnNum = Number(row.num)
+                this.$set(obj, 'qualifiedNum', 0) //合格数量
+                this.$set(obj, 'serviceNum', 0) //待维修数量
+                this.$set(obj, 'scrapNum', 0) //待报废数量
+                this.numList = [obj]
+                // this.getNumList()
+            },
+            //编码退料查询
+            handleCodeQuery() {
+                this.codeQuery.pageNum = 1
+                if (this.dialogIsView) {
+                    this.getCodeViewList()
+                } else {
+                    this.getCodeList()
+                }
+            },
+            //编码退料重置
+            resetCodeQuery() {
+                this.resetForm('codeQuery')
+                this.handleCodeQuery()
+            },
+            //获取退料编码列表
+            getCodeList() {
+                getBackMachine(this.codeQuery).then((response) => {
+                    this.codeList = response.data.rows
+                    this.codeTotal = response.data.total
+                })
+            },
+            //获取退料编码查看列表
+            getCodeViewList() {
+                backReceiveRecordWeb(this.codeQuery).then((response) => {
+                    this.codeList = response.data.rows
+                    this.codeList
+                    this.codeList.forEach((item) => {
+                        item.typeModelName = item.typeCode
+                        if (item.backStatus == '1') {
+                            item.maStatus = '合格'
+                        }
+                        if (item.backStatus == '2') {
+                            item.maStatus = '维修'
+                        }
+                        if (item.backStatus == '3') {
+                            item.maStatus = '报废'
+                        }
+                    })
+                    this.codeTotal = response.data.total
+                })
+            },
+
+            /** 数量退料按钮 */
+            saveNumReturn() {
+                let data = this.numList[0]
+                let sumUnmber =
+                    data.qualifiedNum + data.serviceNum + data.scrapNum
+                if (sumUnmber > this.returnNum) {
+                    this.$modal.msgError('退料总量已大于待退料数量！')
+                } else {
+                    let arr = []
+                    if (data.qualifiedNum > 0) {
+                        let obj = {
+                            parentId: data.parentId,
+                            typeId: data.typeId,
+                            manageType: 1,
+                            createBy: this.createBy,
+                            backStatus: 1,
+                            backNum: data.qualifiedNum,
+                        }
+                        arr.push(obj)
+                    }
+                    if (data.serviceNum > 0) {
+                        let obj = {
+                            parentId: data.parentId,
+                            typeId: data.typeId,
+                            manageType: 1,
+                            createBy: this.createBy,
+                            backStatus: 2,
+                            backNum: data.serviceNum,
+                        }
+                        arr.push(obj)
+                    }
+                    if (data.scrapNum > 0) {
+                        let obj = {
+                            parentId: data.parentId,
+                            typeId: data.typeId,
+                            manageType: 1,
+                            createBy: this.createBy,
+                            backStatus: 3,
+                            backNum: data.scrapNum,
+                        }
+                        arr.push(obj)
+                    }
+                    let param = {
+                        taskId: data.taskId,
+                        arr: arr,
+                    }
+                    // console.log(arr)
+                    // console.log(param)
+                    setNumBack(param).then((response) => {
+                        if (response.code == 200) {
+                            this.$modal.msgSuccess('操作成功')
+                            this.openNum = false
+                            this.handleQuery()
+                        }
+                    })
+                }
+            },
+            /** 编码退料按钮 */
+            saveCodeBack(row, type) {
+                if (this.returnNum == 0) {
+                    this.$modal.msgError('退料数量为零，无法操作！')
+                } else {
+                    let arr = [
+                        {
+                            parentId: this.codeQuery.parentId,
+                            typeId: row.typeId,
+                            backNum: 1,
+                            backStatus: type,
+                            manageType: 0,
+                            createBy: this.createBy,
+                            maId: row.maId,
+                        },
+                    ]
+                    let param = {
+                        taskId: this.codeQuery.taskId,
+                        arr: arr,
+                    }
+                    setCodeBack(param).then((response) => {
+                        if (response.code == 200) {
+                            this.$modal.msgSuccess('操作成功')
+                            // this.openCode = false;
+                            this.returnNum = Number(this.returnNum) - 1
+                            this.handleCodeQuery()
+                            this.handleQuery()
+                        }
+                    })
+                }
+            },
+            // 多选框选中数据
+            handleSelectionChange(selection) {
+                this.codeSelectList = selection
+                this.single = selection.length != 1
+                this.multiple = !selection.length
+            },
+            /** 编码退料 - 批量操作 */
+            saveCodeBackBatch(type) {
+                if (this.codeSelectList.length > this.returnNum) {
+                    this.$modal.msgError('退料总量已大于待退料数量！')
+                } else {
+                    let arr = []
+                    arr = this.codeSelectList.map((item) => {
+                        return {
+                            parentId: this.codeQuery.parentId,
+                            typeId: item.typeId,
+                            backNum: 1,
+                            backStatus: type,
+                            manageType: 0,
+                            createBy: this.createBy,
+                            maId: item.maId,
+                        }
+                    })
+                    let param = {
+                        taskId: this.codeQuery.taskId,
+                        arr: arr,
+                    }
+                    // console.log(param)
+                    setCodeBack(param).then((response) => {
+                        if (response.code == 200) {
+                            this.$modal.msgSuccess('操作成功')
+                            // this.openCode = false;
+                            this.returnNum =
+                                Number(this.returnNum) -
+                                this.codeSelectList.length
+                            this.handleCodeQuery()
+                            this.handleQuery()
+                        }
+                    })
+                }
+            },
+        },
     }
-  };
-  </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
+</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>
diff --git a/sgzb-ui/src/views/index.vue b/sgzb-ui/src/views/index.vue
index 6c07e317..5c965a22 100644
--- a/sgzb-ui/src/views/index.vue
+++ b/sgzb-ui/src/views/index.vue
@@ -122,7 +122,7 @@
                         >查 看</el-button
                     >
 
-                    <!-- 代办事件为新购任务时显示催办按钮 -->
+                    <!-- 代办事件为领料任务时显示催办按钮 -->
                     <el-button
                         size="mini"
                         type="text"
@@ -321,15 +321,13 @@
                     taskStatus,
                 })
                 res.map((e) => {
-                    if (e.phonenumber) {
-                        this.toPersonInfo.push({
-                            noticeUser: e.userId,
-                            phone: e.phonenumber,
-                            modelName: '领料催办',
-                            companyId: e.companyId,
-                            v_name: e.nickName,
-                        })
-                    }
+                    this.toPersonInfo.push({
+                        noticeUser: e.userId,
+                        phone: e.phonenumber,
+                        modelName: '领料催办',
+                        companyId: e.companyId,
+                        v_name: e.nickName,
+                    })
                 })
 
                 this.sendMessageParams.message = `宁夏送变电工程有限公司提示：您有一条任务单号为 ${taskCode} 的待办任务未处理，请及时处理。`
@@ -346,10 +344,7 @@
             /* 催办发送 */
             async submitForm() {
                 this.sendMessageParams.bmNoticeInfoList = this.toPersonInfo
-                const { data: res } = await sendUrgingMessageApi(
-                    this.sendMessageParams,
-                )
-
+                const res = await sendUrgingMessageApi(this.sendMessageParams)
                 if (res.code == 200) {
                     this.$message.success('发送成功！')
                     this.toPersonInfo = []
diff --git a/sgzb-ui/src/views/inventoryLogs/index.vue b/sgzb-ui/src/views/inventoryLogs/index.vue
index 3cef2250..5ac085a8 100644
--- a/sgzb-ui/src/views/inventoryLogs/index.vue
+++ b/sgzb-ui/src/views/inventoryLogs/index.vue
@@ -208,10 +208,6 @@
 </script>
 
 <style scoped>
-    .el-table :empty::before {
-        content: '-';
-        color: gray;
-    }
     .margin-top {
         margin-top: -15px;
     }
diff --git a/sgzb-ui/src/views/scrapManage/Inventory/index.vue b/sgzb-ui/src/views/scrapManage/Inventory/index.vue
new file mode 100644
index 00000000..2f4b7aaa
--- /dev/null
+++ b/sgzb-ui/src/views/scrapManage/Inventory/index.vue
@@ -0,0 +1,12 @@
+<template>
+    <div>
+        <!-- 盘点报废 -->
+        盘点报废
+    </div>
+</template>
+
+<script>
+    export default {}
+</script>
+
+<style></style>
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/index.vue
new file mode 100644
index 00000000..0b941727
--- /dev/null
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/index.vue
@@ -0,0 +1,12 @@
+<template>
+    <div>
+        <!-- 预报废管理 -->
+        预报废管理
+    </div>
+</template>
+
+<script>
+    export default {}
+</script>
+
+<style></style>
diff --git a/sgzb-ui/src/views/scrapManage/scrap/index.vue b/sgzb-ui/src/views/scrapManage/scrap/index.vue
new file mode 100644
index 00000000..81136f28
--- /dev/null
+++ b/sgzb-ui/src/views/scrapManage/scrap/index.vue
@@ -0,0 +1,12 @@
+<template>
+    <div>
+        <!-- 报废管理 -->
+        报废管理
+    </div>
+</template>
+
+<script>
+    export default {}
+</script>
+
+<style></style>
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index f428e364..b1114c88 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -43,6 +43,7 @@ module.exports = {
         // target: `https://z.csgmall.com.cn`,
 
         target: `http://10.40.92.14:8080`, //福
+        // target: `http://10.40.92.8:8080`, //福
 
         //******** 注意事项  ********* */
         //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址;