From b68d573cd70fb63ef96ccc1248809ee82b7e6f6a Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 24 Sep 2024 18:03:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/basicdataWarehouse.vue          | 36 ++++++++++++++++---
 .../turndelivery/deliveryDiscuss.vue          |  8 +++--
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
index 34821e45..3d38d62e 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
@@ -390,10 +390,16 @@
           </div>
           <div>
             <el-icon @click="Isfullscreen"><FullScreen /></el-icon>
-            <el-icon @click="dialogExpandconfiguration=false"><Close /></el-icon>
+            <el-icon @click="dialogExpandconfiguration = false"><Close /></el-icon>
           </div>
         </div>
       </template>
+      <div>
+        <span
+          >当前仓库:<b>{{ dataRwo.name }}</b></span
+        >
+      </div>
+      <hr />
       <el-form
         v-loading="Expandconfigurationloading"
         element-loading-text="Loading..."
@@ -414,6 +420,19 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="是否自动释放">
+          <el-select
+            v-model="Expandconfigurationform.isAutoRelease"
+            placeholder="请选择是否自动释放"
+          >
+            <el-option
+              v-for="item in Compulsoryoptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -1025,24 +1044,30 @@ const Expandconfiguration = async row => {
     });
     return;
   }
+  dataRwo.value = row;
+  console.log(dataRwo.value, ' dataRwo.value');
+
   console.log('扩展配置');
   try {
     let data = {
       warehouseId: row.id,
     };
-
+    details.loadingObj.list = true; //加载中
     let _res = await $_warehouseConfig(data);
 
     if (_res.data.code == 200) {
-      const { id, isStrictLoading } = _res.data.data;
+      const { id, isStrictLoading, isAutoRelease } = _res.data.data;
       dialogExpandconfiguration.value = true;
-      Expandconfigurationform.value.id = id; //id
-      Expandconfigurationform.value.isStrictLoading = isStrictLoading; //是否强制装车
+      let form = Expandconfigurationform.value;
+      form.id = id; //id
+      form.isStrictLoading = isStrictLoading; //是否强制装车
+      form.isAutoRelease = isAutoRelease; //是否自动释放
     }
     console.log(_res, '_res');
   } catch (err) {
     console.log(err);
   } finally {
+    details.loadingObj.list = false;
   }
 };
 // 扩展配置提交
@@ -1255,6 +1280,7 @@ const newlyaddSubmit = () => {
   }
 }
 .el_Expandconfiguration {
+  display: flex;
   .el-form-item {
     flex-direction: column;
     width: 20%;
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index b0d98713..bff34b1a 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -555,6 +555,7 @@
                   v-if="!QuantityEntryStatus"
                   size="small"
                   v-model="scope.row.number"
+                  :value-on-clear="0"
                   @change="isZeroNumber(scope.row)"
                 />
                 <el-input-number
@@ -564,6 +565,7 @@
                   :min="0"
                   v-model="scope.row.reservationNum"
                   @change="isZeroNumber(scope.row)"
+                  :value-on-clear="0"
                 />
               </template>
             </el-table-column>
@@ -1375,6 +1377,9 @@ const submit = () => {
 
   // 展示的信息
   dataInfo.value = removeDuplicates(dataInfo.value);
+  dataInfo.value.forEach(item=>{
+    item.Plannedquantity = item.reservationNum
+  })
   console.log(dataInfo.value, ' dataInfo.value');
 
   // 计算总数
@@ -1532,7 +1537,7 @@ const MaxSUM = computed(() => {
   // let max = dataInfo.value[dataId.value].handQuantity - sum;
   console.log(dataId.value, 'dataId.value');
   console.log(dataInfo.value, ' dataInfo.value[');
-  let max = dataInfo.value[dataId.value].reservationNum;
+  let max = dataInfo.value[dataId.value].Plannedquantity;
   return max;
 });
 const toggleSelection = options => {
@@ -1713,7 +1718,6 @@ const Entering = val => {
 // 数量录入
 const QuantityEntry = async val => {
   console.log(dataInfo.value, 'dataInfo.value');
-
   dataId.value = findIndexById(val.id); //记录当前点击的订单
   editLoading.value = true;
   //   编辑状态