From 0240145cb5e65e5d179190a01bae8f161c6204e9 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 30 Nov 2023 16:38:20 +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/views/aftersales/VueTemp.vue | 21 +++--
.../checkInventoryTask/createTask.vue | 85 +++++++++----------
2 files changed, 55 insertions(+), 51 deletions(-)
diff --git a/src/views/aftersales/VueTemp.vue b/src/views/aftersales/VueTemp.vue
index 553e9a9e..d024d6df 100644
--- a/src/views/aftersales/VueTemp.vue
+++ b/src/views/aftersales/VueTemp.vue
@@ -1425,8 +1425,8 @@ const AddInfo = () => {
// 首页新增表单确定
const ConfirmForm = () => {
- console.log(warehouseData.value,'准备好的数据');
- console.log(Indexform.value.duty,'要筛选的数据');
+ console.log(warehouseData.value, '准备好的数据');
+ console.log(Indexform.value.duty, '要筛选的数据');
let filteredB = warehouseData.value.filter(item => Indexform.value.duty.includes(item.id));
console.log(filteredB);
// 匹配司机名字
@@ -1438,14 +1438,23 @@ const ConfirmForm = () => {
FromDisabled.value = false; //启用输入框
let processorEntityList = [];
+ const matchingObjects = warehouseData.value.filter(obj =>
+ Indexform.value.processor.includes(obj.value)
+ );
+ let name = matchingObjects.map(item => item.label);
+ name = name.join(',');
- const matchingObjects = warehouseData.value.filter(obj => Indexform.value.duty.includes(obj.id));
- console.log(matchingObjects, '名字');
+ const matchingObjectsT = warehouseData.value.filter(obj =>
+ Indexform.value.duty.includes(obj.value)
+ );
+ let nameS = matchingObjectsT.map(item => item.label);
+ nameS = nameS.join(',');
+
let ProcessingParty = {
//处理方
- // businessName: result,
+ businessName: name,
businessId: Indexform.value.processor.join(','),
conditions: 1,
typesOf: 2,
@@ -1453,7 +1462,7 @@ const ConfirmForm = () => {
processorEntityList.push(ProcessingParty);
let ResponsibleParty = {
//责任方
- // businessName:resultT,
+ businessName:nameS,
businessId: Indexform.value.duty.join(','),
conditions: 1,
typesOf: 1,
diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue
index 6c2e3c59..d662841f 100644
--- a/src/views/distribution/checkInventoryTask/createTask.vue
+++ b/src/views/distribution/checkInventoryTask/createTask.vue
@@ -235,22 +235,18 @@
/>
-
-
-
-
-
-
+
+
@@ -542,7 +538,6 @@
-
@@ -708,7 +703,7 @@ const Tcrow = ref(); //弹窗当前行
const WrapBarEditing = ref({}); //弹窗数据编辑
const PopupEditing = ref(false); //弹窗编辑
const ElBtnClass = ref(null);
-const DiskStatus=ref(true);//已盘、未盘状态
+const DiskStatus = ref(true); //已盘、未盘状态
const UncountedDetails = ref(); //未盘点明细盘点必须参数
const contrastData = ref([]); //对比数据表格
const dialogcontrast = ref(false); //对比数据弹窗
@@ -1514,9 +1509,9 @@ const InputSo = val => {
};
if (DiskStatus.value) {
dataS.questStatus = 1;
-}else{
- dataS.questStatus = 0;
-}
+ } else {
+ dataS.questStatus = 0;
+ }
console.log(dataS, '要提交的数据');
$_getDetailInfo(dataS).then(res => {
Tctotal.value = res.data.data.total;
@@ -1749,7 +1744,7 @@ const TcViewEvent = (val, Inso) => {
};
// 点击详情按钮
const ViewEvent = val => {
- DiskStatus.value=true;//表示当前在已盘点列表
+ DiskStatus.value = true; //表示当前在已盘点列表
InventoryDetails.value.forEach(item => {
item.values = null;
});
@@ -1794,17 +1789,17 @@ const Discard = val => {
// 未盘点数据请求
const NotCountedFn = (row, Inso, type = 0) => {
TcPdloading.value = true;
- let dataInfo={
+ let dataInfo = {
...Inso,
- }
- dataInfo.questStatus=type
- dataInfo.questNum=row.questNum
- dataInfo.questId=row.id
- dataInfo.current=TccurrentPage.value //页码
- dataInfo.size=TcpageSize.value//条数
- if(!DiskStatus.value){
- dataInfo.questStatus=0
- }//表示当前在未盘点列表)
+ };
+ dataInfo.questStatus = type;
+ dataInfo.questNum = row.questNum;
+ dataInfo.questId = row.id;
+ dataInfo.current = TccurrentPage.value; //页码
+ dataInfo.size = TcpageSize.value; //条数
+ if (!DiskStatus.value) {
+ dataInfo.questStatus = 0;
+ } //表示当前在未盘点列表)
$_getDetailInfo(dataInfo).then(res => {
TcPdloading.value = false;
console.log(res, '未盘点明细返回值');
@@ -1820,11 +1815,11 @@ const NotCountedFn = (row, Inso, type = 0) => {
// 未盘点明细
const DetailsNotCounted = row => {
- DiskStatus.value=false;//表示当前在未盘点列表
+ DiskStatus.value = false; //表示当前在未盘点列表
InventoryDetails.value.forEach(item => {
item.values = null;
});
-
+
UncountedDetails.value = row;
InventoryState.value = true; //修改弹窗标题（未盘点数据），
TcFrom.value = {}; //重置搜索
@@ -2278,7 +2273,7 @@ const InformationEditing = () => {
// 弹窗品类搜索
const TcChenge = (event, val) => {
// 开始时间 startTime
- // 结束时间 EndTime
+ // 结束时间 endTime
console.log(event, val);
TcPdloading.value = true;
console.log(row.value, '必须参数');
@@ -2292,16 +2287,16 @@ const TcChenge = (event, val) => {
questNum: quest,
questId: qstId,
};
-data.startTime=event[0]
-data.EndTime=event[1]
-delete data.inventoryDate
-console.log(DiskStatus.value,'DiskStatus.value');
-if (DiskStatus.value) {
- data.questStatus = 1;
-}else{
- data.questStatus = 0;
-}
-$_getDetailInfo(data).then(res => {
+ data.startTime = event[0];
+ data.endTime = event[1];
+ delete data.inventoryDate;
+ console.log(DiskStatus.value, 'DiskStatus.value');
+ if (DiskStatus.value) {
+ data.questStatus = 1;
+ } else {
+ data.questStatus = 0;
+ }
+ $_getDetailInfo(data).then(res => {
Tctotal.value = res.data.data.total;
res.data.data.records.forEach(item => {
item.Checkbox = true;