diff --git a/src/api/back/index.js b/src/api/back/index.js
index 43b1eff7..16fc9b61 100644
--- a/src/api/back/index.js
+++ b/src/api/back/index.js
@@ -78,6 +78,15 @@ export function editBackApply(data) {
   })
 }
 
+// 退料提交
+export function submitBackApply(data) {
+  return request({
+    url: '/material/back_apply_info/submitBackApply',
+    method: 'post',
+    data: data,
+  })
+}
+
 
 //新增编辑-编码类型-获取所有编码
 export function getMachineById(query) {
diff --git a/src/views/material/back/component/addReturn.vue b/src/views/material/back/component/addReturn.vue
index ef511680..bb38eec5 100644
--- a/src/views/material/back/component/addReturn.vue
+++ b/src/views/material/back/component/addReturn.vue
@@ -345,10 +345,7 @@
     </div>
 </template>
 
-<script>
-  import {
-    equipmentTypeTree, 
-} from '@/api/purchase/goodsArrived';
+<script> 
 import {
     getProjectList,
     getUnitList,
@@ -358,20 +355,7 @@ import {
     getBackApplyInfo,
     editBackApply,
     getMachineById
-} from '@/api/back/index.js'
-
-// import {
-//     getProData,
-//     getUnitData,
-//     getDeviceTypeTree,
-//     getAgreementInfoById,
-//     submitLeaseApply,
-//     getUseTypeTreee,
-//     getUseNumByTypeId,
-// } from '@/api/claimAndRefund/receive' 
-// import { 
-//     materialReturnNoteByApply, 
-// } from '@/api/claimAndRefund/return.js'
+} from '@/api/back/index.js' 
 import { mapState } from 'vuex'
 import { getInfo, h } from '@/api/login'
 import { getToken } from '@/utils/auth'
@@ -386,15 +370,7 @@ export default {
             type: [String, Number],
         }
     },
-    data() {
-        const validatePhone = (rule, value, callback) => {
-            const reg = /^[1][3-9][0-9]{9}$/
-            if (!reg.test(value)) {
-                this.queryParams.phone = ''
-            } else {
-                callback()
-            }
-        }
+    data() { 
         return {
             // 遮罩层
             loading: false,
@@ -504,10 +480,6 @@ export default {
                         trigger: 'blur',
                     },
                 ],
-                // phone: [
-                //   { validator: validatePhone, trigger: "blur"},
-                //   {required: true, message: '请输入正确的手机号', trigger: 'change'},
-                // ],
             },
             unitList: [], //单位 集合
             proList: [], // 工程 集合
diff --git a/src/views/material/back/component/home.vue b/src/views/material/back/component/home.vue
index 7fe19aaf..15d1238a 100644
--- a/src/views/material/back/component/home.vue
+++ b/src/views/material/back/component/home.vue
@@ -111,8 +111,7 @@
                 <el-button
                 type="warning"
                 plain
-                size="mini"
-                @click="handleSubmit" 
+                size="mini" 
                 >提交</el-button
                 >
             </el-col>
@@ -257,17 +256,28 @@
                     >
                     <el-button
                         size="mini"
-                        type="warning"
+                        type="primary"
                         plain
                         icon="el-icon-edit"
+                        v-if="scope.row.taskStatus!=2"
                         @click="handleUpdate(scope.row)" 
                         >编辑</el-button
                     >
+                    <el-button
+                        size="mini"
+                        type="success"
+                        plain
+                        icon="el-icon-edit"
+                        v-if="scope.row.taskStatus!=2"
+                        @click="handleSubmit(scope.row)" 
+                        >提交</el-button
+                    >
                      
                     <el-button
                         size="mini"
                         type="danger"
                         icon="el-icon-delete"
+                        v-if="scope.row.taskStatus!=2&&scope.row.taskStatus!=1"
                         @click="handleDelete(scope.row)"
                         >删除</el-button
                     >
@@ -351,8 +361,8 @@ import {
     getBackApplyList,
     getProjectList,
     getUnitList,
-    backApplyRemove
-  
+    backApplyRemove,
+    submitBackApply
 } from '@/api/back/index.js'
 // import { getInfo, h } from '@/api/login'
 // import {
@@ -540,16 +550,30 @@ export default {
             this.title = '查看'
             this.isShowOneFlag = true
         },
-        // 提交
-        handleSubmit() {
-            this.title = '确认操作'
-            this.openTextOne = '确认提交退料么?'
-            this.openTextTwo = '确认提交退料么?'
-            this.openOne = true
-        },
-        submitOpenOneForm() {
-            this.openTextThree = '提交成功！'
-            this.openTwo = true
+        // // 提交
+        // handleSubmit() {
+        //     this.title = '确认操作'
+        //     this.openTextOne = '确认提交退料么?'
+        //     this.openTextTwo = '确认提交退料么?'
+        //     this.openOne = true
+        // },
+        // submitOpenOneForm() {
+        //     this.openTextThree = '提交成功！'
+        //     this.openTwo = true
+        // },
+         
+        handleSubmit(row){
+            this.$modal.confirm('是否确认提交所选择的退料任务？') .then(() => {
+                    let param = {
+                        id:row.id,
+                        taskId:row.taskId
+                    }
+                    submitBackApply(param).then((res) => {
+                        this.getList() 
+                        this.$message.success('操作成功!')
+                    }) 
+                }).catch(() => { 
+                })
         },
         /** 删除按钮操作 */
         handleDelete(row) {
@@ -557,7 +581,7 @@ export default {
             //     id:row.id+ '',
             // }
             this.$modal
-                .confirm('是否确认删除所选择的数据项？')
+                .confirm('是否确认删除所选择的退料任务？')
                 .then(() => {
                     return backApplyRemove(row.id)
                 })
@@ -575,9 +599,11 @@ export default {
          /** 导出按钮操作 */
          handleExport() {
             this.download(
-                'material/backApply/export',
+                'material/back_apply_info/export',
                 {
                     ...this.queryParams,
+                    startTime:this.queryParams.time[0],
+                    endTime:this.queryParams.time[1]
                 },
                 `退料申请单_${new Date().getTime()}.xlsx`,
             )
diff --git a/src/views/material/back/component/queryReturn.vue b/src/views/material/back/component/queryReturn.vue
index e7c40b94..07cc7fa3 100644
--- a/src/views/material/back/component/queryReturn.vue
+++ b/src/views/material/back/component/queryReturn.vue
@@ -22,9 +22,9 @@
                     >
                         <el-option
                             v-for="item in unitList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
+                            :key="item.unitId"
+                            :label="item.unitName"
+                            :value="item.unitId"
                         >
                         </el-option>
                     </el-select>
@@ -41,9 +41,9 @@
                     >
                         <el-option
                             v-for="item in proList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
+                            :key="item.proId"
+                            :label="item.proName"
+                            :value="item.proId"
                         >
                         </el-option>
                     </el-select>
@@ -60,48 +60,46 @@
                     <el-input
                         v-model="queryParams.backPerson"
                         placeholder="请输入退料人"
-                        clearable :disabled="isView"
+                        clearable 
                         style="width: 240px"
+                        :disabled="isView"
                     />
                 </el-form-item>
                 <el-form-item label="退料人电话" prop="phone">
                     <el-input
                         v-model="queryParams.phone"
                         placeholder="请输入退料人电话"
-                        clearable :disabled="isView"
+                        clearable
                         style="width: 240px"
                         :maxlength="11"
+                        :disabled="isView"
                     />
                 </el-form-item>
-                <!-- <el-form-item label="物品类型" prop="status">
+                <!-- <el-form-item label="物品类型" prop="deviceType">
                     <el-cascader
-                        placeholder="请输入物品类型"
+                        :key="propsKey"
+                        v-model="deviceType"
+                        :show-all-levels="false"
                         :options="deviceTypeTree"
                         :props="deviceTypeTreeProps"
-                        v-model="deviceType"
-                        @change="deviceTypeChange"
-                        ref="deviceTypeCascader"
                         filterable
+                        collapse-tags
                         style="width: 240px"
+                        placeholder="请选择规格型号"
+                        ref="deviceTypeCascader"
+                        popper-class="popper-select"
+                        @change="deviceTypeChange"
                     ></el-cascader>
+                 
                 </el-form-item> -->
-                <el-form-item label="退料时间" prop="backTime">
-                    <el-date-picker
-                        v-model="queryParams.backTime"
-                        type="date" :disabled="isView"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择时间"
-                        style="width: 240px"
-                    >
-                    </el-date-picker>
-                </el-form-item>
+                 
                
                 <el-form-item label="备注" prop="roleName">
                     <el-input
                         v-model="queryParams.remark"
                         placeholder="请输入备注"
-                        clearable :disabled="isView"
-                        rows="1"
+                        clearable
+                        rows="1" :disabled="isView"
                         type="textarea"
                         style="width: 240px" 
                     />
@@ -145,7 +143,7 @@
         </el-row>
         <el-table
             v-loading="loading"
-            :data="backApplyDetails"
+            :data="equipmentList"
             @selection-change="handleSelectionChange"
         >
             <el-table-column
@@ -164,55 +162,61 @@
             <el-table-column
                 label="规格型号"
                 align="center"
-                prop="typeCode" 
+                prop="typeModel" 
                 :show-overflow-tooltip="true"
             />
             <el-table-column
                 label="计量单位"
                 align="center"
-                prop="unitNames" 
+                prop="unitName" 
             />
             <el-table-column
                 label="当前在用量"
                 align="center"
-                prop="useNum" 
+                prop="num" 
             >
             </el-table-column>
             <el-table-column
                 label="管理模式"
                 align="center"
-                prop="unitNames"
-            />
+                prop="manageType">
+                <template slot-scope="scope">
+                    <!-- 0编码1数量 -->
+                     <div v-if="scope.row.manageType==0">编码管理</div>
+                     <div v-if="scope.row.manageType==1">数量管理</div>
+                </template>
+            </el-table-column>
             <el-table-column
                 label="退料数量"
                 align="center"
-                prop="createTime" 
+                prop="preNum" 
                  min-width="100"
             >
                 <template slot-scope="scope">
+                    <div style="color: rgb(2, 167, 240);" @click="openAddCode(scope.row)" v-if="scope.row.manageType==0">添加编码</div>
                     <el-input
-                        v-model.number="scope.row.num"
+                        v-if="scope.row.manageType==1"
+                        v-model.number="scope.row.preNum"
                         placeholder="退料数量"
                         type="number"
                         min="1"
-                        clearable
+                        clearable :readonly="isView"
                         @input="checkNum(scope.row)"
                         style="width: 100%"
                     />
-                    <div style="color: rgb(2, 167, 240);" @click="openAddCode(scope.row)">添加编码</div>
                 </template>
             </el-table-column>
             <el-table-column
                 label="外观判定"
                 align="center"
-                prop="look"
+                prop="apDetection"
                 min-width="120"
             >
                 <template slot-scope="scope">
                     <el-input
-                        v-model.number="scope.row.look"
+                        v-model.number="scope.row.apDetection"
                         placeholder="外观判定"
-                        type="text" 
+                        type="text" :readonly="isView"
                         clearable  maxlength="20"
                         style="width: 100%"
                     />
@@ -228,7 +232,7 @@
                 <template slot-scope="scope">
                     <el-input
                         v-model="scope.row.remark"
-                        placeholder="备注"
+                        placeholder="备注" :readonly="isView"
                         clearable  maxlength="100"
                         style="width: 100%" 
                     />
@@ -240,7 +244,18 @@
                 prop="file"
             >
                 <template slot-scope="scope">
-                    <div style="color: rgb(2, 167, 240);">上传</div>
+                    <div style="display: flex;align-items: center;justify-content: center;">
+                        <!-- <el-upload ref="upload" :limit="1" :headers="upload.headers"
+                        :action="upload.url" :show-file-list="false" accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
+                        :on-success="handleFileSuccess"   :auto-upload="true">
+                        <el-button size="mini" type="text" @click="beforeFileUpload(scope.row)">
+                                上传
+                        </el-button>
+                        </el-upload> -->
+                        <el-button size="mini" type="text" @click="picturePreview(scope.row)" v-if="scope.row.bmFileInfos&&scope.row.bmFileInfos.length>0">
+                            查看
+                        </el-button>
+                    </div>
                 </template>
             </el-table-column>
 
@@ -257,33 +272,42 @@
         </el-table>
 
         <el-dialog title="编码退料" :visible.sync="open" width="1000px" append-to-body> 
-            <el-row :gutter="10" class="mb8">
+            <!-- <el-row :gutter="10" class="mb8">
                 <el-col :span="6">
                     <div style="width: 100%;height: 100%;display: flex;align-items: center;">
                         <span style="width: 80px;">编码：</span>
-                        <el-input v-model="devCode" placeholder="请输入编码" clearable style="width: 100%"/>
+                        <el-select v-model="maId" clearable filterable style="width: 240px" placeholder="请选择" @change="changeMachine">
+                            <el-option v-for="item in machineList"
+                                :key="item.maId"
+                                :label="item.maCode"
+                                :value="item.maId">
+                        </el-option>
+                    </el-select>
                     </div>
                 </el-col>
                 <el-col :span="1.5">
-                    <el-button type="primary" size="mini" @click="handleAddCode">保存</el-button>
+                    <el-button type="primary" size="mini" @click="handleAddCode">添加编码</el-button>
                 </el-col>
-            </el-row>
-            <el-table :data="codeDataList" width="100%" height="450px">
+            </el-row> -->
+            <el-table :data="maCodeList" width="100%" height="450px">
                 <el-table-column label="序号" type="index" width="55" align="center"/>
-                <el-table-column label="类型名称" prop="typeName" align="center" :show-overflow-tooltip="true">
+                <el-table-column label="类型名称" prop="materialName" align="center" :show-overflow-tooltip="true">
                 </el-table-column>
-                <el-table-column label="规格型号" prop="typeCode" align="center" :show-overflow-tooltip="true">
+                <el-table-column label="规格型号" prop="typeName" align="center" :show-overflow-tooltip="true">
                 </el-table-column> 
-                <el-table-column label="设备编码" prop="devCode" align="center" :show-overflow-tooltip="true">
+                <el-table-column label="设备编码" prop="maCode" align="center" :show-overflow-tooltip="true">
                 </el-table-column>
-                <el-table-column label="设备状态" prop="status" align="center" :show-overflow-tooltip="true">
+                <el-table-column label="设备状态" prop="maStatus" align="center" :show-overflow-tooltip="true">
+                    <template slot-scope="scope">
+                        <dict-tag :options="dict.type.ma_machine_status" :value="scope.row.maStatus"/>
+                    </template>
                 </el-table-column>
-                <el-table-column label="外观判定" prop="look" align="center" width="150" :show-overflow-tooltip="true">
+                <el-table-column label="外观判定" prop="apDetection" align="center" width="150" :show-overflow-tooltip="true">
                     <template slot-scope="scope">
                     <el-input
-                        v-model.number="scope.row.look"
+                        v-model.number="scope.row.apDetection"
                         placeholder="外观判定" maxlength="20"
-                        type="text"  clearable 
+                        type="text"  clearable :readonly="isView"
                         style="width: 100%"
                     />
                 </template>
@@ -291,29 +315,28 @@
                 <el-table-column label="附件" align="center" width="100">
                     <template slot-scope="scope">
                         <div style="display: flex;align-items: center;justify-content: center;">
-                            <el-upload ref="upload" :limit="1" :headers="upload.headers"
+                            <!-- <el-upload ref="upload" :limit="1" :headers="upload.headers"
                             :action="upload.url" :show-file-list="false" accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
-                            :on-success="handleFileSuccess"   :auto-upload="true"
-                            >
+                            :on-success="handleFileSuccess2"   :auto-upload="true">
                             <el-button size="mini" type="text" @click="beforeFileUpload(scope.row)">
                                     上传
                             </el-button>
-                            </el-upload>
-                            <el-button size="mini" type="text" @click="picturePreview(scope.row)" v-if="scope.row.fileInfos&&scope.row.fileInfos.length>0">
+                            </el-upload> -->
+                            <el-button size="mini" type="text" @click="picturePreview(scope.row)" v-if="scope.row.bmFileInfos&&scope.row.bmFileInfos.length>0">
                                 查看
                             </el-button>
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" align="center"   width="120px">
-                <template slot-scope="scope">
-                    <el-button size="mini" type="danger"
-                        @click="handleDeleteCode({ ...scope.row, index: scope.$index })">删除</el-button>
-                </template>
-            </el-table-column>
+                <!-- <el-table-column label="操作" align="center"   width="120px">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="danger"
+                            @click="handleDeleteCode({ ...scope.row, index: scope.$index })">删除</el-button>
+                    </template>
+                </el-table-column> -->
             </el-table>
             <div style="width: 100%;height: 50px;display: flex;justify-content: flex-end;align-items: center;">
-                <el-button type="primary" size="mini" @click="saveDevCode">保存</el-button>
+                <!-- <el-button type="primary" size="mini" @click="saveDevCode">保存</el-button> -->
                 <el-button type="normal" size="mini" @click="open=false">取消</el-button>
             </div>
         </el-dialog>
@@ -326,29 +349,23 @@
     </div>
 </template>
 
-<script>
-  import {
-    equipmentTypeTree, 
-} from '@/api/purchase/goodsArrived';
-// import {
-//     getProData,
-//     getUnitData,
-//     getDeviceTypeTree,
-//     getAgreementInfoById,
-//     submitLeaseApply,
-//     getUseTypeTreee,
-//     getUseNumByTypeId,
-// } from '@/api/claimAndRefund/receive'
-// import { submitBackApplyApi } from '@/api/claimAndRefund/return'
-// import { 
-//     materialReturnNoteByApply,
-//     submitRefuseBackApply,
-// } from '@/api/claimAndRefund/return.js'
+<script> 
+import {
+    getProjectList,
+    getUnitList,
+    getAgreementInfoById,
+    getDeviceTreeByAgreementId,
+    addBackApply,
+    getBackApplyInfo,
+    editBackApply,
+    getMachineById
+} from '@/api/back/index.js' 
 import { mapState } from 'vuex'
 import { getInfo, h } from '@/api/login'
 import { getToken } from '@/utils/auth'
 export default {
     name: 'ReturnApplyAdd',
+    dicts: ['ma_machine_status'],
     props: {
         backId: {
             type: [String, Number],
@@ -361,15 +378,7 @@ export default {
             default:true
         },
     },
-    data() {
-        const validatePhone = (rule, value, callback) => {
-            const reg = /^[1][3-9][0-9]{9}$/
-            if (!reg.test(value)) {
-                this.queryParams.phone = ''
-            } else {
-                callback()
-            }
-        }
+    data() { 
         return {
             // 遮罩层
             loading: false,
@@ -382,16 +391,16 @@ export default {
             // 显示搜索条件
             showSearch: true,
             // 总条数
-            total: 0,
-            // 角色表格数据
-            roleList: [],
+            total: 0, 
             // 弹出层标题
             title: '',
             // 是否显示弹出层
             open: false,
             rowData:{},
-            devCode:"",
-            codeDataList: [],
+            maId:"",
+            maData:{},
+            maCodeList: [],//编码表格
+            machineList: [], // 编码下拉选 集合
             //图片查看弹窗
             dialogImageUrl: '',
             dialogVisible: false,
@@ -403,37 +412,34 @@ export default {
                 // 上传的地址
                 url: process.env.VUE_APP_BASE_API + '/file/upload'
             },
+            unitId: null,
+            projectId: null,
             // 查询参数
             queryParams: {
-                types: 2, 
                 unitId: null,
                 proId: null,
                 agreementId: null, //协议id
                 agreementCode: null, //协议code
-                companyId: '', //登录信息中取
-                createBy: '', //用户名
-                taskType: 29,
-                taskStatus: 30,
-                backTime: '', //申请时间
+                // companyId: '', //登录信息中取
+                // createBy: '', //用户名 
+                // backTime: '', //申请时间
                 //退料人信息
-                leaseApplyInfo: {
-                    backPerson: '',
-                    phone: '',
-                    remark: '',
-                },
+                backPerson: '',
+                phone: '',
+                remark: '',
                 //退料详情集合
-                backApplyDetails: [],
+                equipmentList: [],
             },
-            backApplyDetails: [],
+            equipmentList: [],
             //退料详情单条模板
             leaseApplyDetailsItem: {
                 createBy: null,
-                companyId: null,
+                // companyId: null,
                 status: 0,
                 typeId: null, //  树结构第4级   规格id
                 typeName: '', //显示的设备类型
                 typeCode: '', //显示的设备规格
-                unitNames: '', //显示的设备 单位
+                unitName: '', //显示的设备 单位
                 useNum: '', //当前在用量
                 remark: '', //单条备注
                 preNum: 1, //预领数量
@@ -444,7 +450,7 @@ export default {
                     {
                         required: true,
                         message: '请选择退料单位',
-                        trigger: 'change',
+                        trigger: 'blur',
                         type: 'number',
                     },
                 ],
@@ -452,7 +458,7 @@ export default {
                     {
                         required: true,
                         message: '请选择退料工程',
-                        trigger: 'change',
+                        trigger: 'blur',
                         type: 'number',
                     },
                 ],
@@ -463,13 +469,13 @@ export default {
                         trigger: 'blur',
                     },
                 ],
-                backTime: [
-                    {
-                        required: true,
-                        message: '请选择退料时间',
-                        trigger: 'change',
-                    },
-                ],
+                // backTime: [
+                //     {
+                //         required: true,
+                //         message: '请选择退料时间',
+                //         trigger: 'change',
+                //     },
+                // ],
                 phone: [
                     {
                         required: true,
@@ -482,13 +488,10 @@ export default {
                         trigger: 'blur',
                     },
                 ],
-                // phone: [
-                //   { validator: validatePhone, trigger: "blur"},
-                //   {required: true, message: '请输入正确的手机号', trigger: 'change'},
-                // ],
             },
             unitList: [], //单位 集合
             proList: [], // 工程 集合
+           
             deviceTypeTree: [], // 设备 树结构数据
             // 设备 树显示 配置
             deviceTypeTreeProps: {
@@ -496,6 +499,7 @@ export default {
                 label: 'typeName',
                 // multiple: false,
                 value: 'typeId',
+                multiple: true,
             },
             // 选中的设备类型
             deviceType: null, 
@@ -503,22 +507,20 @@ export default {
             //   children: "children",
             //   label: "label"
             // },  
-            companyId: '',
+            // companyId: '',
             createBy: '',
             rowId: '',
+            propsKey: 1000,
         }
     },
     mounted() {
-        this.GetDeviceTypeTreeFn()
-        // this.GetUnitData()
-        // this.GetProData() 
+        this.GetUnitData()
+        this.GetProData() 
          
-        if (this.backId) {//查看
-            console.log("查看")
-            console.log(this.backId)
-            console.log(this.isView)
+        if (this.backId) {//编辑
+            console.log(this.backId) 
             this.rowId = this.backId;
-            this.GetViewByApply({id: this.backId,agreementId: this.agreementId})
+            this.GetViewByApply()
         }
         // getInfo().then((res) => {
         //     this.companyId = res.user.companyId
@@ -530,35 +532,97 @@ export default {
     },
     methods: {
         // 获取 来往单位 列表数据
-        async GetUnitData() {
-            const params = {
-                id: this.queryParams.proId /*  */,
-            }
-            // const res = await getUnitData(params)
-            // this.unitList = res.data
-            // this.GetAgreementInfoById()
+        async GetUnitData(val) {
+            // if(this.equipmentList.length>0){
+            //     this.$modal.confirm('是否确认更改退料单位，此操作将清空当前列表？').then(() => {
+                    
+            //         this.$message.success('操作成功!')
+            //     }).catch(() => { 
+            //         console.log(this.unitId)
+            //         setTimeout(()=>{
+            //             this.$set(this.queryParams,"unitId",this.unitId)
+            //             console.log(this.queryParams.unitId)
+            //             this.$forceUpdate()
+            //         },500)
+                    
+            //     })
+            // }else{
+            //     this.unitId=val
+                const params = {
+                    projectId: this.queryParams.proId /*  */,
+                }
+                const res = await getUnitList(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 GetProData(val) {
+            // if(this.equipmentList.length>0){
+                
+            //     this.$modal.confirm('是否确认更改退料工程，此操作将清空当前列表？').then(() => {
+                    
+            //         this.$message.success('操作成功!')
+            //     }).catch(() => {  
+            //         // this.queryParams.proId=this.projectId
+            //         console.log(this.projectId)
+            //         setTimeout(()=>{
+            //             this.$set(this.queryParams,"proId",this.projectId)  
+            //             console.log(this.queryParams.proId)
+            //             this.$forceUpdate()
+            //         },500)
+            //     })
+            // }else{
+            //     this.projectId=val
+                const params = {
+                    unitId: this.queryParams.unitId,
+                }
+                const res = await getProjectList(params)
+                this.proList = res.data
+                this.GetAgreementInfoById()
+            // }
         },
 
         // 获取 设备树结构数据
         async GetDeviceTypeTreeFn(agreementId) {
-            // const params = {
-            //     agreementId: agreementId,
-            // }
-            equipmentTypeTree().then((response) => {
-                this.deviceTypeTree = response.data
+            const params = {
+                agreementId: agreementId,
+            }
+            // equipmentTypeTree().then((response) => {
+            //     this.deviceTypeTree = response.data
+            // })
+            //
+            const res = await getDeviceTreeByAgreementId(params)
+            console.log('resgetUseTypeTreee==========', res)
+            this.deviceTypeTree = res.data;
+            //反显
+            let selectList = []
+            this.equipmentList.forEach((e) => {
+                selectList.push(
+                    this.getParentsById(this.deviceTypeTree, e.typeId),
+                )
             })
-            // const res = await getUseTypeTreee(params)
-            // console.log('resgetUseTypeTreee==========', res)
-            // this.deviceTypeTree = res.data
+            this.deviceType = selectList
+            this.$forceUpdate()
+            
+        },
+        //树结构数据获取父
+        getParentsById(list, id) {
+            for (let i in list) {
+                if (list[i].typeId == id) {
+                    //查询到就返回该数组对象的value
+                    return [list[i].typeId]
+                }
+                if (list[i].children) {
+                    let node = this.getParentsById(list[i].children, id)
+                    if (node !== undefined) {
+                        //查询到把父节把父节点加到数组前面
+                        node.unshift(list[i].typeId)
+                        return node
+                    }
+                }
+            }
         },
         // 获取 协议id
         async GetAgreementInfoById() {
@@ -567,45 +631,50 @@ export default {
                     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
-                //     this.GetDeviceTypeTreeFn(res.data.agreementId)
-                // }
+                const res = await getAgreementInfoById(params)
+                console.log(res)
+                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
+                    this.GetDeviceTypeTreeFn(res.data.agreementId)
+                }
             }
         },
 
         // 获取 任务详情数据
         async GetViewByApply(params) {
-            // const res = await materialReturnNoteByApply({
-            //     id: params.id,
-            //     agreementId: params.agreementId,
-            // })
-            // const data = res.data[0]
-            // // console.log(data) 
-            // this.queryParams.unitId = data.unitId
-            // this.queryParams.proId = Number(data.proId)
+            const res = await getBackApplyInfo(this.rowId)
+            console.log(res) 
+            const data = res.data
+            console.log(data) 
+            this.queryParams.unitId = data.backApplyInfo.unitId
+            this.queryParams.proId = data.backApplyInfo.proId
+            this.queryParams.phone = data.backApplyInfo.phone
+            this.queryParams.backPerson = data.backApplyInfo.backPerson
+            this.queryParams.agreementId = data.backApplyInfo.agreementId
+            this.queryParams.remark = data.backApplyInfo.remark
+            this.equipmentList = data.backApplyDetailsList
+            this.GetDeviceTypeTreeFn(data.backApplyInfo.agreementId)
             // this.$set(this.queryParams, 'phone', data.phone)
             // this.queryParams.backPerson = data.backPerson
             // this.queryParams.backTime = data.backTime
             // this.queryParams.agreementCode = data.agreementCode
             // this.queryParams.agreementId = data.agreementId
             // this.queryParams.remark = data.remark
-            // this.backApplyDetails = res.data
-            // this.GetDeviceTypeTreeFn(data.agreementId)
+            // this.equipmentList = res.data
+            // 
         }, 
          
         //是否可用勾选框
         selectable(row) {
             console.log(row)
-            if (row.num != 0) {
+            if (row.preNum != 0) {
                 return true
             } else {
                 return false
@@ -613,7 +682,7 @@ export default {
         },
         // 多选框选中数据
         handleSelectionChange(selection) {
-            this.queryParams.backApplyDetails = selection
+            this.queryParams.equipmentList = selection
         }, 
 
         /** 保存按钮操作 */
@@ -622,80 +691,87 @@ export default {
                 if (!valid) {
                     return false
                 } else {
-                    let backApplyInfo = []
-                    if (this.queryParams.backApplyDetails.length == 0) {
-                        this.$message.error('请添加数据')
+                    // let backApplyInfo = []
+                    if (this.equipmentList.length == 0) {
+                        this.$message.error('请先添加数据')
                         return
                     }
-                    // const isRemark = this.queryParams.backApplyDetails.some(
+                    if (this.queryParams.equipmentList.length == 0) {
+                        this.$message.error('请先勾选数据')
+                        return
+                    }
+                    // const isRemark = this.queryParams.equipmentList.some(
                     //   (item) => item.remark == '' || item.remark == undefined
                     // );
-                    const isNum = this.queryParams.backApplyDetails.some(
-                        (item) => item.num == '' || item.num == undefined,
+                    const isNum = this.queryParams.equipmentList.some(
+                        (item) => item.preNum == '' || item.preNum == undefined,
                     )
                     if (isNum) {
                         this.$message.error('退料数量不能为空！')
                         return
                     }
-
-                    this.queryParams.createBy = this.user.name
-                    this.queryParams.companyId = this.companyId
+                    // this.queryParams.createBy = this.user.name
+                    // this.queryParams.companyId = this.companyId
                     this.queryParams.backApplyInfo = {
                         backPerson: this.queryParams.backPerson,
                         phone: this.queryParams.phone,
                         remark: this.queryParams.remark,
-                        backTime: this.queryParams.backTime,
-                        companyId: this.companyId,
+                        agreementId: this.queryParams.agreementId,
+                        // backTime: this.queryParams.backTime,
+                        // createBy: this.queryParams.createBy,
+                        // companyId: this.queryParams.companyId,
                     }
                     if (this.rowId != '') {
                         let params = {
-                            companyId: this.companyId,
-                            createBy: this.createBy,
-                            id: this.rowId,
-                            agreementId: this.queryParams.agreementId,
+                            id:this.rowId,
                             backApplyInfo: this.queryParams.backApplyInfo,
-                            backApplyDetails:
-                                this.queryParams.backApplyDetails,
+                            backApplyDetailsList:
+                                this.queryParams.equipmentList,
+                        }
+                        const res = await editBackApply(params)
+                        if (res.code == 200) {
+                            this.$message({ type: 'success', message: res.msg })
+                            setTimeout(() => {
+                                this.$emit('goBackPage')
+                            }, 1000)
                         }
-                        // const res = await submitRefuseBackApply(params)
-                        // if (res.code == 200) {
-                        //     this.$message({ type: 'success', message: res.msg })
-                        //     setTimeout(() => {
-                        //         this.$emit('goBackPage')
-                        //         // this.$tab.closeOpenPage({
-                        //         //     path: '/claimAndRefund/return/returnApplyByCq',
-                        //         // })
-                        //     }, 1000)
-                        // }
                     } else {
                         let params = {
-                            companyId: this.companyId,
-                            createBy: this.createBy,
-                            agreementId: this.queryParams.agreementId,
                             backApplyInfo: this.queryParams.backApplyInfo,
-                            backApplyDetails:
-                                this.queryParams.backApplyDetails,
+                            backApplyDetailsList:
+                                this.queryParams.equipmentList,
+                        }
+                        const res = await addBackApply(params)
+                        if (res.code == 200) {
+                            this.$message({ type: 'success', message: res.msg })
+                            setTimeout(() => {
+                                this.$emit('goBackPage')
+                            }, 1000)
                         }
-                        // const res = await submitBackApplyApi(params)
-                        // if (res.code == 200) {
-                        //     this.$message({ type: 'success', message: res.msg })
-                        //     setTimeout(() => {
-                        //         this.$emit('goBackPage')
-                        //         // this.$tab.closeOpenPage({
-                        //         //     path: '/claimAndRefund/return/returnApplyByCq',
-                        //         // })
-                        //     }, 1000)
-                        // }
                     }
                 }
             })
         }, 
   
-       
-
         /** 删除按钮操作 */
         handleDelete(row) {
-            this.backApplyDetails.splice(row.index, 1)
+            this.$modal
+                .confirm('是否确认删除所选择的数据项？')
+                .then(() => {
+                    this.deviceType.forEach((e, index) => {
+                        if (e[3] === row.typeId) {
+                            this.deviceType.splice(index, 1)
+                            this.propsKey++
+                        }
+                    })
+                    this.equipmentList.forEach((item, index) => {
+                        if (item.id == row.id) {
+                            this.equipmentList.splice(index, 1)
+                        }
+                    })
+                })
+                .catch(() => {})
+            // this.equipmentList.splice(row.index, 1)
         },
         
         /** 导出按钮操作 */
@@ -709,46 +785,61 @@ export default {
             )
         },
         checkNum(row) {
-            let maxNum = row.useNum
-            if (row.num <= 1) {
-                row.num = 1
-            } else if (row.num >= maxNum) {
-                row.num = maxNum
+            let maxNum = row.num
+            if (row.preNum <= 1) {
+                row.preNum = 1
+            } else if (row.preNum >= maxNum) {
+                row.preNum = maxNum
             }
         },
         /////// 设备类型树  切换
         async deviceTypeChange(val) {
-            let nodes = null
-            console.log('vall1211221122',
-                this.$refs.deviceTypeCascader.getCheckedNodes().length,
-                this.$refs.deviceTypeCascader.getCheckedNodes(),
-                [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)],
-            )
-            nodes =
-                this.$refs.deviceTypeCascader.getCheckedNodes().length > 0
-                    ? this.$refs.deviceTypeCascader.getCheckedNodes()
-                    : [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)]
-            console.log('nodes', nodes)
-            // const res = await getUseNumByTypeId({ typeId: nodes[0].data.typeId })
-            nodes[0].data.useNum = nodes[0].data.num
-            if (nodes[0].level != 4) {
-                return
-            }
-            if (nodes[0].data.useNum < 1) {
-                this.$modal.msgError('所选机具类型当前无在用!')
-                return
-            }
-            for (let i = 0; i < this.backApplyDetails.length; i++) {
-                if (this.backApplyDetails[i].typeId == nodes[0].data.typeId) {
-                    this.backApplyDetails.splice(i, 1)
-                    break
+            
+            const deviceTypeList =
+                this.$refs.deviceTypeCascader.getCheckedNodes()
+            console.log(deviceTypeList)
+            let tempList = []
+            if (val.length > 0) {
+                const items = val.map((e) => {
+                    return e[3]
+                })
+                for (let i of items) {
+                    for (let z of deviceTypeList) {
+                        if (z.data.typeId === i) {
+                            const obj = JSON.parse(JSON.stringify(z.data))
+                            console.log(obj)
+                            obj.typeModel = obj.typeName
+                            obj.typeName = deviceTypeList[2].data.typeName
+                            obj.preNum = 0
+                            obj.apDetection = ''
+                            obj.remark = ''
+                            obj.maCodeList=[]
+                            obj.bmFileInfos=[]
+                            tempList.push(obj)
+                            break
+                        }
+                    }
                 }
+                const newDataListNew = [...this.equipmentList, ...tempList]
+                const map = new Map()
+                for (let item of newDataListNew) {
+                    if (!map.has(item.typeId)) {
+                        map.set(item.typeId, item)
+                    }
+                }
+                const newArray = [...map.values()]
+                let newArray_array = []
+                items.forEach((e) => {
+                    newArray.forEach((j) => {
+                        if (e == j.typeId) {
+                            newArray_array.push(j)
+                        }
+                    })
+                })
+                this.equipmentList = newArray_array
+            } else {
+                this.equipmentList = []
             }
-            this.backApplyDetails.push(this.handelTableItemData(nodes[0]))
-            // this.$refs.cascader.$refs.panel.clearCheckedNodes()
-            // // 设置为空可以让节点不高亮显示
-            // this.$refs.cascader.$refs.panel.activePath = []
-            this.deviceType = {}
         },
         //// 将数据处理成 表格中需要的数据
         handelTableItemData(node) {
@@ -757,9 +848,9 @@ export default {
             )
             template.createBy = this.createBy
             template.typeId = node.data.typeId
-            template.companyId = node.data.companyId
+            // template.companyId = node.data.companyId
             // template.typeId = node.data.id
-            template.unitNames = node.data.unitNames
+            template.unitName = node.data.unitName
             template.preNum = node.data.num
             template.typeName = node.pathLabels[2]
             template.typeCode = node.pathLabels[3]
@@ -767,74 +858,106 @@ export default {
             template.useNum = node.data.useNum
             return template
         },
-
-         //编码接受
-         openAddCode(row){
-          this.rowData=row; 
-          this.devCode=""
-          this.codeDataList=[]
-          if(this.rowData.codeDataList&&this.rowData.codeDataList.length>0){
-            this.codeDataList = this.rowData.codeDataList
-          }
-          this.open=true
+        //编码下拉选数据
+        getMachineById(typeId){
+            let param = {
+                unitId:this.queryParams.unitId,
+                proId:this.queryParams.proId,
+                typeId:typeId
+            }
+            getMachineById(param).then((res) => {
+                this.machineList=res.data
+            })
         },
+        changeMachine(val){
+            console.log(val)
+            this.maData = this.machineList.find(option => option.maId == val);
+            //  = this.machineList[index]
+        },
+        //编码类型-弹窗
+        openAddCode(row){
+            this.rowData=row;
+            this.getMachineById(row.typeId)
+            this.maId=""
+            this.maCodeList=[]
+            if(this.rowData.maCodeList&&this.rowData.maCodeList.length>0){
+                this.maCodeList = this.rowData.maCodeList
+            }
+            this.open=true;
+        },
+        //查询添加
         handleAddCode(){
             console.log(this.rowData)
-            if(this.devCode!=""){
+            console.log(this.maId)
+            console.log(this.maData)
+            if(this.maId!=""){
                 let obj = {
-                    typeName:this.rowData.typeName,
-                    typeId:this.rowData.typeId,
-                    typeCode:this.rowData.typeCode,
-                    devCode:this.devCode,
-                    status:this.rowData.status,
-                    fileInfos:[],
-                    look:"",
+                    materialName:this.maData.materialName,
+                    typeId:this.maData.typeId,
+                    typeName:this.maData.typeName,
+                    maId:this.maData.maId,
+                    maCode:this.maData.maCode,
+                    maStatus:this.maData.maStatus,
+                    bmFileInfos:[],
+                    apDetection:"",
                 }
-                let index = this.codeDataList.findIndex(v=>v.devCode==this.devCode)
+                let index = this.maCodeList.findIndex(v=>v.maId==this.maId)
                 if(index>-1){
                     this.$message.error('设备编码已存在！')
                 }else{
-                    this.codeDataList.push(obj)
+                    this.maCodeList.push(obj)
                 }
             }else{
                 this.$message.error('请先填写设备编码！')
             }
         },
-         /** 删除按钮操作 */
-         handleDeleteCode(row) {
-            this.codeDataList.splice(row.index, 1)
-        }, 
-        saveDevCode(){
-            console.log(this.rowData)
-            console.log(this.codeDataList)
-            this.rowData.codeDataList = this.codeDataList
-            console.log(this.backApplyDetails)
+        /** 删除按钮操作 */
+        handleDeleteCode(row) {
+            this.maCodeList.splice(row.index, 1)
         },
+        // 弹窗保存
+        saveDevCode(){
+            // console.log(this.rowData)
+            // console.log(this.maCodeList)
+            this.rowData.maCodeList = this.maCodeList;
+            this.rowData.preNum = this.maCodeList.length;
+            this.open=false
+            // console.log(this.equipmentList)
+        },
+        //文件上传前
         beforeFileUpload(row){ 
             this.fileData = row 
         },
-        // 文件上传成功处理
-        handleFileSuccess(response, file, fileList) { 
+         // 文件上传成功处理-退料列表上传
+         handleFileSuccess(response, file, fileList) { 
             if(response.code==200){
                 let obj = {
-                    "taskId": "",
-                    "taskType": "0",
                     "name": response.data.name,
                     "url": response.data.url,
-                    "modelId": this.rowData.typeId,
-                    // "fileType": this.rowData.fileType
                 }
-                let index = this.codeDataList.findIndex(v=>v.devCode==this.fileData.devCode)
-                this.codeDataList[index].fileInfos=[obj]
+                let index = this.equipmentList.findIndex(v=>v.typeId==this.fileData.typeId)
+                this.equipmentList[index].bmFileInfos=[obj]
+                 
+            }
+        },
+        // 文件上传成功处理-编码弹窗上传
+        handleFileSuccess2(response, file, fileList) { 
+            if(response.code==200){
+                let obj = {
+                    "name": response.data.name,
+                    "url": response.data.url,
+                }
+                let index = this.maCodeList.findIndex(v=>v.maCode==this.fileData.maCode)
+                this.maCodeList[index].bmFileInfos=[obj]
                  
             }
         },
         //图片查看
         picturePreview(row) {
             console.log(row)
-            console.log(row.fileInfos)
-            if(row.fileInfos.length>0){
-                let file = row.fileInfos[0]
+            console.log(row.bmFileInfos)
+            if(row.bmFileInfos.length>0){
+                let file = row.bmFileInfos[0]
                 this.dialogImageUrl = file.url;
                 const parts = file.name.split('.');
                 const extension = parts.pop();
@@ -849,3 +972,14 @@ export default {
     },
 }
 </script>
+<style lang="scss">
+.popper-select {
+    .el-cascader-panel .el-scrollbar .el-checkbox {
+        display: none;
+    }
+
+    .el-cascader-panel .el-scrollbar:nth-child(4) .el-checkbox {
+        display: block !important;
+    }
+}
+</style>
\ No newline at end of file