From da2160d6eac72049337e3c1cc902ae928e328af7 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Tue, 9 Jan 2024 17:08:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=961.6=20=E6=8B=86=E5=88=86?=
=?UTF-8?q?=E8=B4=B9=E7=94=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/pages/common/addItemOut/addItemOut.js | 25 +++++++++----------
.../property/listOwnerCar/listOwnerCar.html | 6 +++++
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/public/pages/common/addItemOut/addItemOut.js b/public/pages/common/addItemOut/addItemOut.js
index 6f3869cc1..9feb88c73 100644
--- a/public/pages/common/addItemOut/addItemOut.js
+++ b/public/pages/common/addItemOut/addItemOut.js
@@ -39,16 +39,15 @@
let oldList = $that.addItemOutInfo.resourceStores;
// 过滤重复选择的商品
resourceStores.forEach((newItem, newIndex) => {
- newItem.rsId = '';
- newItem.timesId = '';
- if(newItem.times && newItem.times.length >0){
- newItem.timesId = newItem.times[0].timesId;
+ newItem.rsId = '';
+ newItem.timesId = '';
+ if (newItem.times && newItem.times.length > 0) {
+ newItem.timesId = newItem.times[0].timesId;
+ }
+ oldList.forEach((oldItem) => {
+ if (oldItem.resId == newItem.resId && newItem.times && newItem.times.length < 2) {
+ delete resourceStores[newIndex];
}
- oldList.forEach((oldItem) => {
- if (oldItem.resId == newItem.resId && newItem.times && newItem.times.length < 2) {
- delete resourceStores[newIndex];
- }
- })
})
})
// 合并已有商品和新添加商品
@@ -87,8 +86,8 @@
vc.http.apiPost(
'/collection/goodsCollection',
JSON.stringify($that.addItemOutInfo), {
- emulateJSON: true
- },
+ emulateJSON: true
+ },
function (json, res) {
let _json = JSON.parse(json);
if (_json.code == 0) {
@@ -107,7 +106,7 @@
},
_loadResourceSuppliers() {
let param = {
- params: {page: 1, row: 50}
+ params: { page: 1, row: 50 }
};
//发送get请求
vc.http.apiGet('/resourceSupplier.listResourceSuppliers',
@@ -196,7 +195,7 @@
}
let _data = _staffInfo.data;
vc.copyObject(_data[0], $that.addItemOutInfo.audit);
- if(!_data[0].assignee.startsWith('-')){
+ if (!_data[0].assignee.startsWith('-')) {
$that.addItemOutInfo.audit.staffId = $that.addItemOutInfo.audit.assignee;
}
},
diff --git a/public/pages/property/listOwnerCar/listOwnerCar.html b/public/pages/property/listOwnerCar/listOwnerCar.html
index 9af429158..ee36993ac 100644
--- a/public/pages/property/listOwnerCar/listOwnerCar.html
+++ b/public/pages/property/listOwnerCar/listOwnerCar.html
@@ -128,6 +128,9 @@
|
|
+
+
+ |
|
@@ -210,6 +213,9 @@
@click="_viewIotStateRemark(car)">{{car.iotStateName}})
+
+ {{car.remark || '-'}}
+ |
|