代码更新：

1. 修复非计划领料
2. 备料执行和完成界面优化

src/layout/clcNoPlan.vue

@@ -164,6 +164,19 @@
                                             </div>
                                         </div>
                                     </div>
+                                    <div style="display: flex; flex-direction: column;">
+                                        <div class="display-title-div">
+                                            <span class="display-title-text">剩余数量</span>
+                                        </div>
+                                        <div style="display: flex; margin-top: 20px;">
+                                            <div class="display-form-div-left">
+                                                <el-input-number v-model.number="confirmFormEntity.remainNum" controls-position="right" :min="0" />
+                                            </div>
+                                            <div class="display-form-div-right">
+                                                <span class="display-form-text-right">PC</span>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                             <div style="margin: 10px;">
@@ -210,7 +223,8 @@ export default {
             confirmFormEntity: reactive({
                 vehicleId: '',
                 goodsId: '',
-                realPickNum: null
+                realPickNum: null,
+                remainNum: null
             }),
             rules: reactive({
                 goodsId: [
@@ -245,10 +259,10 @@ export default {
             })
         },
         getCurrentGoodsPickNumMethod() {
-            if (this.confirmFormEntity.vehicleId == '' || this.confirmFormEntity.vehicleId == null | undefined) {
+            if (this.confirmFormEntity.vehicleId == '' || this.confirmFormEntity.vehicleId == null|undefined) {
                 this.$refs.confirmVehicleId.focus()
             }
-            if (this.confirmFormEntity.goodsId == '' || this.confirmFormEntity.goodsId == null | undefined) {
+            if (this.confirmFormEntity.goodsId == '' || this.confirmFormEntity.goodsId == null|undefined) {
                 this.$refs.confirmGoodsId.focus()
             }
             if (this.confirmFormEntity.realPickNum == null | undefined) {
@@ -265,13 +279,14 @@ export default {
                 smallVehicleNo: '',
                 callReason: ''
             })
-            this.$refs.goodsId.focus()
+            this.$refs.needGoodsId.focus()
         },
         resetConfirmForms() {
             this.confirmFormEntity = reactive({
                 vehicleId: '',
                 goodsId: '',
-                realPickNum: null
+                realPickNum: null,
+                remainNum: null
             })
         },
         // 确认完成工作
@@ -305,8 +320,8 @@ export default {
         },
         // 确认回库
         confirmPick() {
-            if (this.standId == '' || this.workFormEntity.goodsId == '') {
+            if (this.standId == '' || this.confirmFormEntity.goodsId == '' || this.confirmFormEntity.vehicleId == '' || this.confirmFormEntity.realPickNum == null) {
-                errorBox('站台号和料号不可缺少')
+                errorBox('站台号、箱号、料号、领料数量不可缺少。')
                 return
             }
             const confirmParams = {
@@ -314,6 +329,7 @@ export default {
                 goodsId: this.confirmFormEntity.goodsId,
                 vehicleId: this.confirmFormEntity.vehicleId,
                 realPickNum: this.confirmFormEntity.realPickNum,
+                remainNum: this.confirmFormEntity.remainNum,
                 userName: store.getters.getUserName
             }
             clcNoPlanConfirmBack(confirmParams).then(res => {

src/layout/doKitting.vue

@@ -231,6 +231,10 @@ export default {
                 const response = res.data
                 if (response.code == 0) {
                     if (response.returnData != null && response.returnData.tip != '') {
+                        this.workFormEntity.finishedRows = response.returnData.finishedRows
+                        this.workFormEntity.totalRows = response.returnData.totalRows
+                        this.workFormEntity.finishedCounts = response.returnData.finishedCounts
+                        this.workFormEntity.totalCounts = response.returnData.totalCounts
                         this.workFormEntity.tip = response.returnData.tip
                         warningBox(this.workFormEntity.tip)
                     } else {
@@ -269,9 +273,11 @@ export default {
                 if (response.code == 0) {
                     if (response.returnData != null && response.returnData.tip != '') {
                         this.workFormEntity.tip = response.returnData.tip
+                        warningBox(this.workFormEntity.tip)
+                    } else {
+                        ElMessage.success(response.message)
                     }
                     this.resetForms()
-                    ElMessage.success(response.message)
                 } else {
                     errorBox(response.message)
                 }

src/layout/finishKitting.vue

@@ -226,7 +226,7 @@ export default {
             confirmFinishedWork(confirmParams).then(res => {
                 const response = res.data
                 if (response.code == 0) {
-                    ElMessage.success('response.message')
+                    ElMessage.success(response.message)
                     this.resetForms()
                 } else {
                     errorBox(response.message)