Merge branch 'dev' into pre-production

src/api/distribution/createTask.js

@@ -54,6 +54,14 @@ export const postBatchDelete = params => {
     params,
   });
 };
+
+export const $_postBatchDelete = params => {
+  return request({
+    url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/remove',
+    method: 'post',
+    params,
+  });
+};
 // 新增盘点任务
 export const $_submit = (data) => {
   return request({

src/views/distribution/checkInventoryTask/createTask.vue

@@ -672,7 +672,7 @@ import {
   $_questDetailIds,
   $_exportGetContrastInfo,
   $_getList,
-  postBatchDelete,
+  $_postBatchDelete,
 } from '@/api/distribution/createTask';
 import { ElMessageBox } from 'element-plus'
 import { ElMessage } from 'element-plus';
@@ -708,6 +708,7 @@ const Tcrow = ref(); //弹窗当前行
 const WrapBarEditing = ref({}); //弹窗数据编辑
 const PopupEditing = ref(false); //弹窗编辑
 const ElBtnClass = ref(null);
+const UncountedDetails=ref();//未盘点明细盘点必须参数
 const contrastData = ref([]); //对比数据表格
 const dialogcontrast = ref(false); //对比数据弹窗
 const contrastloading = ref(false); //对比数据表格加载
@@ -1424,8 +1425,10 @@ const InInputSo=(values,val)=>{
 
 // 搜索框
 const InputSo = val => {
+  TcPdloading.value=true
   console.log(val, '搜索框接收的值');
   let data = {};
+  console.log(row.value,'row.value');
   data.current = TccurrentPage.value;
   data.size = TcpageSize.value;
   // if (val.prop == 'categoryName') {
@@ -1480,8 +1483,8 @@ const InputSo = val => {
 
   // if (val.prop != 'categoryName' || val.prop != 'materialCode') {
     let dataS = {
-      questNum: row.value.questNum,
+      questNum: UncountedDetails.value.questNum,
-      questId: row.value.id,
+      questId: UncountedDetails.value.id,
       current: TccurrentPage.value, //页码
       size: TcpageSize.value, //条数
       [val.prop]: val.values,
@@ -1736,10 +1739,9 @@ const Discard=(val)=>{
   data.push(val.id)
  let ids = data.join(',')
      console.log(data);
-
      ElMessageBox.confirm('是否废弃该盘点任务?')
     .then(() => {
-      postBatchDelete({ids}).then(res=>{
+      $_postBatchDelete({ids}).then(res=>{
       console.log(res,'删除成功');
       if(res.data.code==200){
         ElMessage({
@@ -1785,6 +1787,7 @@ const DetailsNotCounted = row => {
   InventoryDetails.value.forEach(item=>{
     item.values=null
   })
+  UncountedDetails.value=row;
   InventoryState.value=true;//修改弹窗标题（未盘点数据），
   TcFrom.value={};//重置搜索
   TccurrentPage.value = 1; //重置页码
@@ -1795,6 +1798,7 @@ const DetailsNotCounted = row => {
   PopupDetails.value = true;
   NotCountedFn(row);
   row.value = row;
+  console.log(row.value,'未盘点明细存储值');
 };