Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/maintenanceReceive/index.vue

@@ -281,11 +281,15 @@ export default {
     },
     toOut() {
       if (this.sids.length === 1) {
-        if (this.selectionList[0].repairState === '维修中') {
+        if (this.selectionList[0].isLL) {
-          this.viewState = 2
+          if (this.selectionList[0].repairState === '维修中') {
-          this.$refs['divOutInfo'].showAdd(this.sids[0])
+            this.viewState = 2
+            this.$refs['divOutInfo'].showAdd(this.sids[0])
+          } else {
+            this.$message({ showClose: true, type: 'error', message: '请选择维修状态为维修中的记录进行操作' })
+          }
         } else {
-          this.$message({ showClose: true, type: 'error', message: '请选择维修状态为维修中的记录进行操作' })
+          this.$message({ showClose: true, type: 'error', message: '请先盘点完成后再进行操作' })
         }
       } else {
         this.$message({ showClose: true, type: 'warning', message: '请选择一条记录进行操作' })
@@ -293,11 +297,15 @@ export default {
     },
     toReturn() {
       if (this.sids.length === 1) {
-        if (this.selectionList[0].nodeName === '维修') {
+        if (this.selectionList[0].isLL) {
-          this.viewState = 3
+          if (this.selectionList[0].nodeName === '维修') {
-          this.$refs['divReturnInfo'].showAdd(this.sids[0])
+            this.viewState = 3
+            this.$refs['divReturnInfo'].showAdd(this.sids[0])
+          } else {
+            this.$message({ showClose: true, type: 'error', message: '请选择维修单处于维修阶段的进行操作' })
+          }
         } else {
-          this.$message({ showClose: true, type: 'error', message: '请选择维修单处于维修阶段的进行操作' })
+          this.$message({ showClose: true, type: 'error', message: '请先盘点完成后再进行操作' })
         }
       } else {
         this.$message({