From 588acee05c5c392a9b3ca4e7d140cc9f9e9c5ef4 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Wed, 22 Nov 2023 14:54:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/distribution/createTask.js            |   2 +-
 .../checkInventoryTask/createTaskTemp.vue     | 172 ++++++++++++++----
 vite.config.js                                |   2 +-
 3 files changed, 139 insertions(+), 37 deletions(-)

diff --git a/src/api/distribution/createTask.js b/src/api/distribution/createTask.js
index e386ee05..0fc2d321 100644
--- a/src/api/distribution/createTask.js
+++ b/src/api/distribution/createTask.js
@@ -76,7 +76,7 @@ export const $_getDetailInfo = params => {
 export const $_updateQuestChildInfo = data => {
   return request({
     url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/updateQuestChildInfo',
-    method:'post',
+    method:'put',
     data,
   });
 };
diff --git a/src/views/distribution/checkInventoryTask/createTaskTemp.vue b/src/views/distribution/checkInventoryTask/createTaskTemp.vue
index a0a7d5da..267265e6 100644
--- a/src/views/distribution/checkInventoryTask/createTaskTemp.vue
+++ b/src/views/distribution/checkInventoryTask/createTaskTemp.vue
@@ -174,7 +174,8 @@
     
     <el-dialog v-model="PopupDetails" title="盘点数据" width="70%" :before-close="handleClose">
         <div style="margin-bottom:10px;">
-         <div v-if='TcMInventoryStatus'>
+         <div>
+            <!-- v-if='TcMInventoryStatus' -->
         <div v-if="!NotCounted">
         <el-button type="primary"  @click="searchChange">删 除</el-button>
         <el-button type="primary"  @click="InventoryModification">提交修改</el-button>
@@ -316,13 +317,28 @@
 
 <!-- 状态选择 -->
  <el-dialog v-model="InventoryStatus" title="状态选择" width="70%" style="display: flex;flex-direction: column;"> 
-       <el-radio-group v-model="WrapBarEditing.radio" class="tcradiogroup">
+      <!-- 定制品单选框 -->
+       <el-radio-group v-model="WrapBarEditing.radio" class="tcradiogroup" v-if="!TcStateSwitching">
          <template v-for='(item,index) in radioList' :key='item.label'>
             <div class="Tcstate">
           <el-radio @change='TcReac' :label=item.label>{{item.txt}} </el-radio> <el-input-number v-model="counting[item.input]" :disabled="item.disabled"  placeholder="数量" />
            </div>
         </template>
       </el-radio-group>
+
+
+      <!-- 多选框 -->
+  <el-checkbox-group v-model="radioList" v-else>
+    <template v-for='(item,index) in radioList' :key='item.label'>
+       <div class="Tcstate">
+          <el-checkbox @change='Tcmultiple' :label="item.txt"/><el-input-number v-model="counting[item.input]" :disabled="item.disabled"  placeholder="数量" />
+       </div>
+    </template>
+  </el-checkbox-group>
+
+
+
+
         <span class="Tcstdialog-footer">
           <el-button @click="InventoryStatus=false">取消</el-button>
           <el-button type="primary" @click="StatusDetermination">确定</el-button>
@@ -552,8 +568,12 @@ const Inventoryrow=ref({});//详情编辑响应式临时数据
 const NotCounted=ref(false);//为盘点信息
 const UncheckedRow=ref({});//未盘点当前行存储数据 
 const InventoryStatus=ref(false);//盘点中的状态修改
+const InventoryInput=ref(null);//用来存储盘点状态定制品选怎的第几个input
 // const InventoryData=ref([]);//盘带状态修改保存的数据
 const TcMInventoryStatus=ref(true);//盘点弹窗按钮权限控制
+const TcStatusModification=ref(false);//表示当前在修改状态
+const TcStateSwitching=ref(false);//默认表示定制品状态
+const TcnumStatu=ref(false);//表示零担,库存品,初始化状态
 const radioList=ref([
             {label:0,txt:'在库',input:'stockNum',disabled:true },
             {label:1,txt:'破损',input:'wornNum',disabled:true },
@@ -1090,12 +1110,26 @@ const TcselectAll=(selectAll,val)=>{
         item.Checkbox=!item.Checkbox
     })
     }
+
+    // 状态修改
 }
 // 弹窗详情单选
 const TcselectChange=(selectAll,val)=>{
     val.Checkbox=!val.Checkbox;//开启修改
-    Tcrow.value=selectAll
-    console.log(Tcrow.value,'弹窗单选');
+    if(TcStatusModification.value){ //表示当前在修改状态
+    if(val.questTarget!=1){
+      Tcrow.value=val
+      Tcrow.value=selectAll
+      console.log(Tcrow.value,'状态多条修改');
+    }else{
+      Tcrow.value=val
+      console.log(Tcrow.value,'零担单条数据修改');
+    }
+    }else{
+      // 这里不是状态修改
+      Tcrow.value=selectAll
+    }
+
 }
 // 延期
 const extension=(val)=>{
@@ -1122,10 +1156,7 @@ const InventoryDate=()=>{
         console.log(res,'延期成功返回值');
     })
 }
-// 对盘点中的参数,修改状态
-const ModifyingStatus=()=>{
-InventoryStatus.value=true;//展开状态选择
-}
+
 // 提交修改
 const InventoryModification=()=>{
 if(!Tcrow.value){
@@ -1218,15 +1249,7 @@ const ViewEvent = val => {
   }
   TcViewEvent(row.value)
 };
-// 状态选择
-const TcReac=(val)=>{
-  console.log(val);
-  radioList.value.forEach(item=>{
-       item.disabled=true;
-       counting.value[item.input]=0
-  })
-      radioList.value[val].disabled=false;
-}
+
 // 未盘点数据请求
 const NotCountedFn=(row)=>{
   TcPdloading.value=true;
@@ -1291,39 +1314,118 @@ $_updateDetailInfo(data).then(res=>{
   }
 })
 }
+// 对盘点中的参数,修改状态
+const ModifyingStatus=()=>{
+  if(!Tcrow.value){
+      ElMessage({
+    showClose: true,
+    message: '暂未选择信息',
+    type: 'warning',
+  })
+  return
+}
+InventoryStatus.value=true;//展开状态选择
+if(Tcrow.value[0].questTarget==1){//表示当前是定制品
+TcStateSwitching.value=false;
+}else{
+  TcStateSwitching.value=true;//表示当前是零担，库存品
+}
+
+}
+
+// 盘点状态选择
+const TcReac=(val)=>{
+    console.log(val);
+    InventoryInput.value=val;//存储当前选择的是第几个input
+  if(!TcStateSwitching.value){//定制品规则 可以批量操作
+      radioList.value.forEach(item=>{
+       item.disabled=true;
+       counting.value[item.input]=0
+    })
+      radioList.value[val].disabled=false;
+      counting.value[radioList.value[val].input]=1;//定制品选中的值默认为1
+  }else{
+    //零担,库存品规则
+      if(!TcnumStatu.value){
+       radioList.value.forEach(item=>{
+       item.disabled=true;
+       counting.value[item.input]=0
+      })
+      TcnumStatu.value=true;//表示当前零担库存品已经初始化了
+      }else{
+        radioList.value[val].disabled=false; 
+      }
+  }
+}
+// 状态多选操作
+const Tcmultiple=(val)=>{  
+  console.log(val);
+}
 // 盘点状态确认修改
 const StatusDetermination=()=>{
+  console.log(row.value,'row.value');
+if(!TcStateSwitching.value){//定制品规则
+let InputMax=counting.value[radioList.value[InventoryInput.value].input];//存储当前输入框最大值
+if(InputMax>Tcrow.value[0].questTarget){
+    ElMessage({
+    showClose: true,
+    message: '数量超过最大值上限',
+    type: 'warning',
+  })
+return
+}
 console.log(counting.value,'状态输入框的值');  
+let start= Tcrow.value.questTarget
 let data=[];
-Tcrow.value.forEach(item=>{
-  console.log(item);
+const filteredData = Tcrow.value.filter(item => item.name == start); //
+filteredData.forEach(item=>{
+console.log(item);
  data.push({
- cargoName:1,
- questNum:item.questNum,//任务编号
- stockNum:item.stockNum,//在库数量
- lossNum:item.lossNum,//丢失数量
- deliveNum:item.deliveNum,//配送数量
- wornNum:item.wornNum,//破损数量
- noRepairNum:item.noRepairNum,//不可修复数量
- noReceivedNum:item.noReceivedNum,//未入库数量
+ stockNum:counting.value.stockNum,//在库数量
+ lossNum:counting.value.lossNum,//丢失数量
+ deliveNum:counting.value.deliveNum,//配送数量
+ wornNum:counting.value.wornNum,//破损数量
+ noRepairNum:counting.value.noRepairNum,//不可修复数量
+ noReceivedNum:counting.value.noReceivedNum,//未入库数量
+ questNum:row.value.questNum,//任务编号
+ questId:item.questId,
  allocationId:item.allocationId,//上架后的库位id
-  })
+ id:item.id,
+ cargoName: Number((InventoryInput.value +1) +'0') ,//状态
+})
 })
 console.log(data,'处理好的数据');
 
-  // $_updateQuestChildInfo().then(res=>{
-  //   console.log(res,'盘点状态修改完成的返回值');
-  // })
+$_updateQuestChildInfo(data).then(res=>{
+    console.log(res,'盘点状态修改完成的返回值');
+    if(res.data.code==200){
+    ElMessage({
+    showClose: true,
+    message:res.data.msg,
+    type: 'success',
+  })
+  InventoryStatus.value=false;//关闭状态选择
+  TcViewEvent(row.value)
+    }
+  })
+}
+// else{
+//   // 零担,库存品规则
+
+// }
+
+
 }
 
 // 弹窗明细，每一页多少条
 const TcPageSizeChange=(val)=>{
+console.log('每一页多少条');
+
    TcpageSize.value=val;
   if(NotCounted.value){//表示当前是未盘点翻页
      NotCountedFn(UncheckedRow.value)
   }else{
     console.log(val);
-    TcpageSize.value=val;
     TcViewEvent(row.value)
   }
  
@@ -1331,13 +1433,13 @@ const TcPageSizeChange=(val)=>{
 
 // 弹窗明细，选择了多少页
 const TcSizeChange=(val)=>{
-
-  TccurrentPage.value=val;
+console.log('翻页');
+    TccurrentPage.value=val;
     if(NotCounted.value){//表示当前是未盘点翻页
+    
      NotCountedFn(UncheckedRow.value)
   }else{
     console.log(val);
-    TcpageSize.value=val;
     TcViewEvent(row.value)
   }
 }
diff --git a/vite.config.js b/vite.config.js
index 2ecced33..cefe39cd 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -18,7 +18,7 @@ export default ({ mode, command }) => {
           // lmy
           // target: 'http://192.168.10.123:8889',
           // target: 'http://192.168.10.101:8888',
-          target: 'http://192.168.10.75:8777',
+          target: 'http://192.168.10.200:13000',
           // tjj
           // target: 'http://192.168.10.25:13000',
           // sst