From aacab9f6a050099a0f9e6a049e9783d5bdf8281d Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 30 Nov 2023 16:13:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BF=AE=E5=A4=8D=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/aftersales/VueTemp.vue              | 129 ++++++++++--------
 .../checkInventoryTask/createTask.vue         |   4 +-
 2 files changed, 72 insertions(+), 61 deletions(-)

diff --git a/src/views/aftersales/VueTemp.vue b/src/views/aftersales/VueTemp.vue
index 3fe6ffdc..553e9a9e 100644
--- a/src/views/aftersales/VueTemp.vue
+++ b/src/views/aftersales/VueTemp.vue
@@ -104,47 +104,47 @@
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query" class="el-fr-d">
           <div class="el_tims_box">
-          <el-form-item label="上报日期" class="el-times">
-            <el-date-picker
-              v-model="value1"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :size="size"
-            />
-          </el-form-item>
-          <el-form-item label="处理时间" class="el-times">
-            <el-date-picker
-              v-model="value1"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :size="size"
-            />
-          </el-form-item>
-          <el-form-item label="送货时间" class="el-times">
-            <el-date-picker
-              v-model="value1"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :size="size"
-            />
-          </el-form-item>
-          <el-form-item label="运损发现" class="el-times">
-            <el-date-picker
-              v-model="value1"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :size="size"
-            />
-          </el-form-item>
-        </div>
+            <el-form-item label="上报日期" class="el-times">
+              <el-date-picker
+                v-model="value1"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :size="size"
+              />
+            </el-form-item>
+            <el-form-item label="处理时间" class="el-times">
+              <el-date-picker
+                v-model="value1"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :size="size"
+              />
+            </el-form-item>
+            <el-form-item label="送货时间" class="el-times">
+              <el-date-picker
+                v-model="value1"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :size="size"
+              />
+            </el-form-item>
+            <el-form-item label="运损发现" class="el-times">
+              <el-date-picker
+                v-model="value1"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :size="size"
+              />
+            </el-form-item>
+          </div>
           <!-- 查询按钮 -->
           <el-form-item class="el-btn">
             <el-button type="primary" icon="el-icon-search">搜 索</el-button>
@@ -808,6 +808,7 @@ import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
 import { columnList, recordList } from '@/option/aftersales/vueTvemp.js';
 import { processRowProperty } from '@/utils/util';
 import dayjs from 'dayjs';
+import { join } from 'lodash';
 const currentPage = ref(1); // 默认页码
 const pageSize = ref(30); // 默认每一页几条
 const total = ref(0); //页码总页数
@@ -1424,36 +1425,48 @@ const AddInfo = () => {
 
 // 首页新增表单确定
 const ConfirmForm = () => {
-  console.log(Indexform.value.deliveryDriver, 'Indexform.value.deliveryDriver');
-  console.log(Indexform.value.processor, 'Indexform.value.processor');
+  console.log(warehouseData.value,'准备好的数据');
+  console.log(Indexform.value.duty,'要筛选的数据');
+  let filteredB = warehouseData.value.filter(item => Indexform.value.duty.includes(item.id));
+  console.log(filteredB);
   // 匹配司机名字
+
   Indexform.value.deliveryDriver = DeliveryDriver.value.find(
     item => item.value == Indexform.value.deliveryDriver
   ).label;
   console.log(Indexform.value.deliveryDriver); // 输出李华
   FromDisabled.value = false; //启用输入框
   let processorEntityList = [];
+
+
+  const matchingObjects = warehouseData.value.filter(obj => Indexform.value.duty.includes(obj.id));
+
+  console.log(matchingObjects, '名字');
+
   let ProcessingParty = {
     //处理方
-    businessName: warehouseData.value.find(row => row.value == Indexform.value.processor)?.label,
-    businessId: Indexform.value.processor,
+    // businessName: result,
+    businessId: Indexform.value.processor.join(','),
     conditions: 1,
     typesOf: 2,
   };
   processorEntityList.push(ProcessingParty);
   let ResponsibleParty = {
     //责任方
-    businessName: warehouseData.value.find(row => row.value == Indexform.value.duty).label,
-    businessId: Indexform.value.duty,
+    // businessName:resultT,
+    businessId: Indexform.value.duty.join(','),
     conditions: 1,
     typesOf: 1,
   };
   processorEntityList.push(ResponsibleParty);
+  console.log(processorEntityList, 'processorEntityList');
+  let DataSubmit = { ...Indexform.value }; //定义初始化
   DataSubmit.processorEntityList = processorEntityList;
-  let DataSubmit = { ...Indexform.value };
   delete DataSubmit.duty, //移除多余字段
     delete DataSubmit.processor; //移除多余字段
   console.log(DataSubmit, '处理好的表单信息');
+  console.log(warehouseData.value, 'warehouseData.value');
+
   Indexdialog.value = false; //关闭表单弹窗
   // $_submit(DataSubmit).then(res => {
   //   if (res.data.code == 200) {
@@ -1659,16 +1672,16 @@ const selectionChange = list => {
 };
 
 /** 页码改变执行的回调 */
-const currentChange = (val) => {
-  page.value.currentPage=val
+const currentChange = val => {
+  page.value.currentPage = val;
   IndexTable();
 };
 // 每页多少条
-const sizeChange=(val)=>{
+const sizeChange = val => {
   console.log(val);
-  page.value.pageSize=val
+  page.value.pageSize = val;
   IndexTable();
-}
+};
 const changeProcessingResults = val => {
   // 首先删除取消的项目
   ProcessingList.value = ProcessingList.value.filter(item => val.includes(item.state - 1));
@@ -1952,17 +1965,15 @@ const changeProcessingResults = val => {
   align-items: flex-end;
   margin-bottom: 10px;
 }
-.el-times{
-  :deep(.el-input__wrapper){
+.el-times {
+  :deep(.el-input__wrapper) {
     height: 30px !important;
   }
- 
 }
-.el_tims_box{
+.el_tims_box {
   display: flex;
 }
-.el-btn{
+.el-btn {
   width: 100%;
-
 }
 </style>
diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue
index ec4fa186..af5508d2 100644
--- a/src/views/distribution/checkInventoryTask/createTask.vue
+++ b/src/views/distribution/checkInventoryTask/createTask.vue
@@ -253,7 +253,7 @@
 
             </template>
             <template #default="props">
-              <span v-if="item.type == 6 && item.prop == 'questStatus'">
+              <span v-if="item.type == 1 && item.prop == 'questStatus'">
                 {{
                   props.row[item.prop] == 0
                     ? '待盘点'
@@ -936,7 +936,7 @@ const InventoryDetails = ref([
   {
     prop: 'questStatus',
     label: '盘点状态',
-    type: 6,
+    type: 1,
     values: '',
     width: '100',
     checkarr: [