Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev

sgzb-ui/src/views/claimAndRefund/return/returnIn.vue

@@ -176,9 +176,9 @@
             <el-button size="mini" plain icon="el-icon-zoom-in" @click="handleSee(scope.row, 'see')">
                 查看
             </el-button>
-            <!-- <el-button size="mini" type="warning" @click="handleReturn(scope.row, 'see')">
+            <el-button size="mini" type="warning" @click="handleReturn(scope.row, 'see')">
                 退料
-            </el-button> -->
+            </el-button>
             <el-button size="mini" type="primary" @click="handlePrint(scope.row)">
                 退料单
             </el-button>

sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue

@@ -340,13 +340,14 @@
         handleCodeReturn(row){
             this.title = '编码退料';
             this.openCode = true;
+            this.dialogIsView = false
             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.parentId)