diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
index fc2da1c2..75663fc3 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
@@ -83,7 +83,6 @@
           icon="el-icon-plus"
           size="mini"
           v-if="isEdit=='true'"
-          :disabled="multiple"
           @click="handleAdd"
         >保存</el-button>
       </el-col>
@@ -100,7 +99,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="leaseApplyDetails" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <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" />
@@ -520,7 +519,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.queryParams.leaseApplyDetails = selection
+      // this.queryParams.leaseApplyDetails = selection
       this.single = selection.length != 1
       this.multiple = !selection.length
     },
@@ -544,6 +543,7 @@ export default {
           if(!valid){
             return false
           }else {
+            this.queryParams.leaseApplyDetails = this.leaseApplyDetails
             if( this.queryParams.leaseApplyDetails.length == 0 ){
               this.$message.error('请添加数据');
               return
@@ -559,10 +559,10 @@ export default {
             let res;
 
             if(this.taskId){
-              // this.leaseApplyInfoList.forEach(v => {
-              //   v = Object.assign(v,this.queryParams.leaseApplyInfo)
-              //   this.$set(v,'leaseApplyDetails',this.queryParams.leaseApplyDetails)
-              // })
+              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,
@@ -617,18 +617,20 @@ export default {
       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.$refs.cascader.$refs.panel.clearCheckedNodes()
-      // // 设置为空可以让节点不高亮显示
-      // this.$refs.cascader.$refs.panel.activePath = []
       this.deviceType = {} 
     },
     //// 将数据处理成 表格中需要的数据
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
index 7f79caf7..b63f6f05 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
@@ -80,7 +80,6 @@
             placeholder="请输入退料人电话"
             clearable
             style="width: 240px"
-            @keyup.enter.native="handleQuery"
           />
         </el-form-item>
         <el-form-item label="备注" prop="roleName">
@@ -490,9 +489,10 @@ export default {
     async GetViewByApply(Id) {
       const res = await materialReturnNoteByApply({ id:Id })
       const data = res.data[0]
+      // console.log(data)
       this.queryParams.unitId = data.unitId
-      this.queryParams.proId = data.proId
-      this.queryParams.phone = data.phone
+      this.queryParams.proId = Number(data.proId)
+      this.$set(this.queryParams,'phone',data.phone)
       this.queryParams.backPerson = data.backPerson
       this.queryParams.backTime = data.backTime
       
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
index fdc1c17e..8b309240 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
@@ -349,12 +349,14 @@ export default {
       equipmentTypeTree().then(response => {
         this.equipmentTypeList = response.data;
         this.equipmentTypeList.forEach((item,index)=>{
-          if(item.children.length>0){
+          if(item.children&&item.children.length>0){
             item.children.forEach((item2,index2)=>{
-              if(item2.children.length>0){
+              if(item2.children&&item2.children.length>0){
                 item2.children.forEach(item3=>{
-                  if(item3.children.length>0){
+                  // console.log(item3,'item3')
+                  if(item3.children&&item3.children.length>0){
                     item3.children.forEach(item4=>{ 
+                      // console.log(item4,'item4')
                       item4.machineTypeName = item3.typeName
                       item4.specificationType = item4.typeName
                       // item4.purchasePrice = 1
@@ -363,7 +365,7 @@ export default {
                       this.$set(item4, 'purchaseNum', 1);
                     })
                   }
-                  
+
                 })
               }