| 
					
				 | 
			
			
				@@ -139,17 +139,17 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         >修改 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </el-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </el-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <el-col :span="1.5"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <el-button 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            type="danger" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            icon="el-icon-delete" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            size="mini" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            :disabled="multiple" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            @click="handleDelete" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            v-hasPermi="['warehouseBusiness:storageFeeCalculation:remove']" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        >删除 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        </el-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      </el-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<!--      <el-col :span="1.5">--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<!--        <el-button--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<!--            type="danger"--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<!--            icon="el-icon-delete"--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<!--            size="mini"--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<!--            :disabled="multiple"--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<!--            @click="handleDelete"--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<!--            v-hasPermi="['warehouseBusiness:storageFeeCalculation:remove']"--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<!--        >删除--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<!--        </el-button>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+<!--      </el-col>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-col :span="1.5"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <el-button 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             type="warning" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1648,7 +1648,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.total = response.total; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.loading = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 根据浏览器高度设置初始高度 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        setInterval(() => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        setTimeout(() => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 300) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2017,9 +2017,17 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 删除按钮操作 */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     handleDelete(row) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      const fIds = row.fId || this.ids.fId; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      console.log(this.ids) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      let ids_FId = []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.ids.forEach(item => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        ids_FId.push(item.fId) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      // const fIds = row.fId || this.ids.fId; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      const fIds = row.fId || ids_FId; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      console.log(fIds) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       let tips = '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       delstorageFeeCalculation_s(fIds).then(data => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        console.log(data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         switch (data.msg) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           case '0': { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             this.$message.error('当前数据已被其他操作员操作请刷新页面') 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2027,12 +2035,12 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           case '1': { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             tips = '当前主表有数据从表无数据是否删除' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            this.delete_S(fIds, tips) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            this.delete_s(fIds, tips) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             break 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           case '2': { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             tips = '当前主表有数据从表有数据是否删除' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            this.delete_S(fIds, tips) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            this.delete_s(fIds, tips) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             break 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           default: { 
			 |