From a2918c1ac131a6029433868fa1f16658317b3da2 Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Tue, 24 Dec 2024 17:40:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?=
 =?UTF-8?q?=201.=20=E5=A2=9E=E5=8A=A0=E9=9D=9E=E8=AE=A1=E5=88=92=E9=A2=86?=
 =?UTF-8?q?=E6=96=99=E7=9A=84=E9=85=8D=E7=BD=AE=E3=80=82=202.=20=E5=A4=87?=
 =?UTF-8?q?=E6=96=99=E7=95=8C=E9=9D=A2=E7=9A=84=E5=A4=87=E6=96=99=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=E5=A2=9E=E5=8A=A0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/doKitting.vue     |  2 +-
 src/layout/standSettings.vue | 39 +++++++++++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/layout/doKitting.vue b/src/layout/doKitting.vue
index 527f079..2891fb8 100644
--- a/src/layout/doKitting.vue
+++ b/src/layout/doKitting.vue
@@ -221,7 +221,7 @@ export default {
         this.$refs.goodsId.focus()
         this.timer = setInterval(() => {
             this.queryFinish()
-            // this.getWorkList()
+            this.getWorkList()
         }, 1500)
     },
     beforeUnmount() {
diff --git a/src/layout/standSettings.vue b/src/layout/standSettings.vue
index 5b93127..dd81166 100644
--- a/src/layout/standSettings.vue
+++ b/src/layout/standSettings.vue
@@ -38,6 +38,8 @@
                 <el-table-column prop="pickVehicle" label="拣选箱号" show-overflow-tooltip min-width="120px" />
                 <el-table-column prop="pickTip" label="提示" show-overflow-tooltip min-width="120px" />
                 <el-table-column prop="pickVehicleCount" label="站台料箱数量" min-width="120px" />
+                <el-table-column prop="allowNoPlan" label="非计划" :formatter="allowNoPlanFormat" show-overflow-tooltip
+                    min-width="120px" />
                 <el-table-column fixed="right" label="操作" width="120px">
                     <template v-slot="scope">
                         <el-button plain type="primary" @click="editCurrentRow(scope.row)">编辑</el-button>
@@ -90,7 +92,17 @@
                             <el-col :span="12">
                                 <el-form-item label="站台料箱数量" prop="pickVehicleCount">
                                     <el-input-number v-model.number="standFormEntity.pickVehicleCount"
-                                        controls-position="right" clearable />
+                                        controls-position="right" :disabled="standFormEntity.standType != 2"
+                                        clearable />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="16">
+                            <el-col :span="12" :offset="0">
+                                <el-form-item label="非计划" prop="allowNoPlan">
+                                    <el-select-v2 v-model="standFormEntity.allowNoPlan" placeholder="请选择是否允许非计划领料"
+                                        :options="allowNoPlanOptions"
+                                        :disabled="standFormEntity.standType != 2"></el-select-v2>
                                 </el-form-item>
                             </el-col>
                         </el-row>
@@ -175,6 +187,16 @@ export default {
                     label: '不可用'
                 },
             ],
+            allowNoPlanOptions: [
+                {
+                    value: 1,
+                    label: '允许'
+                },
+                {
+                    value: 0,
+                    label: '不允许'
+                },
+            ]
         }
     },
     mounted() {
@@ -242,6 +264,16 @@ export default {
                     return '未知'
             }
         },
+        allowNoPlanFormat: (row, column, cellValue, index) => {
+            switch (cellValue) {
+                case 0:
+                    return '不允许'
+                case 1:
+                    return '允许'
+                default:
+                    return '无效'
+            }
+        },
         reset() {
             this.standIdQuery = ''
             this.standTypeQuery = -99
@@ -256,10 +288,14 @@ export default {
                 standStatus: row.standStatus,
                 lastUseTime: row.lastUseTime,
                 pickVehicleCount: row.pickVehicleCount,
+                allowNoPlan: row.allowNoPlan
             }
             this.dialogVisible = true
         },
         submitInfo(formData) {
+            if (formData.standType == 3) {
+                return errorBox('堆垛机不允许非计划。')
+            }
             const params = {
                 standId: formData.standId,
                 standType: formData.standType,
@@ -267,6 +303,7 @@ export default {
                 standStatus: formData.standStatus,
                 lastUseTime: formData.lastUseTime,
                 pickVehicleCount: formData.pickVehicleCount,
+                allowNoPlan: formData.allowNoPlan,
                 userName: store.getters.getUserName
             }
             updateStandInfo(params).then(res => {