From fffec2d96e13e75a20613336ee15e364bace06c0 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Sat, 12 Oct 2024 13:23:37 +0800
Subject: [PATCH] =?UTF-8?q?bug=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../picking/apply/component/AddPicking1.vue | 21 +++++++++++++++++++
.../claimAndreturn/picking/outbound/index.vue | 2 +-
.../csotSettlement/component/other-cost.vue | 14 +++++++------
src/views/store/poleConfig/poleConfig.vue | 6 +++---
src/views/stquery/deviceStatusRecord.vue | 4 ++--
.../components/outbound-form.vue | 12 +++++++++--
.../partsAcceptance/component/addParts.vue | 4 ++--
vue.config.js | 2 +-
8 files changed, 48 insertions(+), 17 deletions(-)
diff --git a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
index 7483784..fb1cfc5 100644
--- a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
+++ b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
@@ -232,6 +232,16 @@
align="center"
label="抱杆设备名称"
/>
+
+
+
+
+
{
wholeTypeNameData.childrenList = res.data
+ wholeTypeNameData.childrenList.forEach(
+ (e) => (e.initNum = e.deviceNum),
+ )
const isREpeat = this.wholeTypeNameList.find(
(e) => e.id === val,
)
@@ -1161,6 +1175,13 @@ export default {
onHandelDelete(index) {
this.wholeTypeNameList.splice(index, 1)
},
+
+ /* 更改数量 */
+ onChangeInput(val, v) {
+ this.wholeTypeNameList[v].childrenList.forEach(
+ (e) => (e.deviceNum = e.initNum * val),
+ )
+ },
},
}
diff --git a/src/views/claimAndreturn/picking/outbound/index.vue b/src/views/claimAndreturn/picking/outbound/index.vue
index 0e0e69b..d6591d5 100644
--- a/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/src/views/claimAndreturn/picking/outbound/index.vue
@@ -691,7 +691,7 @@ export default {
outQuery: {
//编码出库-搜索条件
pageNum: 1,
- pageSize: 20,
+ pageSize: 10,
maCode: undefined,
},
outTotal: 0, //编码弹窗分页-总数
diff --git a/src/views/cost/csotSettlement/component/other-cost.vue b/src/views/cost/csotSettlement/component/other-cost.vue
index 71b569b..0f2915a 100644
--- a/src/views/cost/csotSettlement/component/other-cost.vue
+++ b/src/views/cost/csotSettlement/component/other-cost.vue
@@ -117,10 +117,12 @@ export default {
/* 求和 */
getSumTotalPrice() {
if (this.addOtherCostList.length > 0) {
- this.totalPrice = this.addOtherCostList.reduce(
- (sum, e) => sum + e.addCost * 1,
- 0,
- )
+ this.totalPrice =
+ this.addOtherCostList.reduce((sum, e) => {
+ const cost = parseFloat(e.addCost)
+ // 检查 cost 是否为数字且不是 NaN
+ return !isNaN(cost) ? sum + Math.round(cost * 100) : sum
+ }, 0) / 100
} else {
this.totalPrice = 0
}
@@ -147,11 +149,11 @@ export default {
this.activeIndexCostRemark = ''
}
const regex_2 =
- /^(?!\s*$)(?:[1-9][0-9]{0,7}|100000000)$/
+ /^(?!\s*$)(?:(?:[1-9][0-9]{0,7}|100000000)(\.[0-9]{1,2})?|0(\.[0-9]{1,2})?)$/
if (!regex_2.test(e.addCost)) {
this.$modal.msgError(
- '金额不能为空，不能为小数，不能以0开头，不能大于1亿',
+ '金额不能为空，只能为数字，如果是小数，则小数点后最多两位，不能以0开头，不能大于1亿',
)
this.activeIndex = index
this.$refs[`addCost_${index}`].focus()
diff --git a/src/views/store/poleConfig/poleConfig.vue b/src/views/store/poleConfig/poleConfig.vue
index 98a2523..c39eb23 100644
--- a/src/views/store/poleConfig/poleConfig.vue
+++ b/src/views/store/poleConfig/poleConfig.vue
@@ -379,7 +379,7 @@ export default {
// 查询
handleQuery() {
this.queryParams.pageNum = 1
- const keyWord = this.formData.keyWord?.trim() || ''
+ const keyWord = this.formData.wholeTypeName?.trim() || ''
this.getList({ keyWord })
},
handleSearch() {
@@ -388,11 +388,11 @@ export default {
},
// 重置
resetQuery() {
- this.formData.keyWord = ''
+ this.formData.wholeTypeName = ''
this.getList()
},
resetSearch() {
- this.dialogForm.keyWord = ''
+ this.dialogForm.wholeTypeName = ''
this.getDetail({ id: this.rowId })
},
// 新增
diff --git a/src/views/stquery/deviceStatusRecord.vue b/src/views/stquery/deviceStatusRecord.vue
index ae8f71a..eefdea6 100644
--- a/src/views/stquery/deviceStatusRecord.vue
+++ b/src/views/stquery/deviceStatusRecord.vue
@@ -190,13 +190,13 @@
:show-overflow-tooltip="true"
/>
- 查询
- 重置
{
this.equipmentTypeList = response.data
this.equipmentTypeList.forEach((item, index) => {
- if (item.children.length > 0) {
+ if (item.children && item.children.length > 0) {
item.children.forEach((item2, index2) => {
- if (item2.children.length > 0) {
+ if (item2.children && item2.children.length > 0) {
item2.children.forEach((item3) => {
item3.machineTypeName = item2.label
item3.specificationType = item3.label
diff --git a/vue.config.js b/vue.config.js
index 531d3bf..73906f9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -42,7 +42,7 @@ module.exports = {
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网
// target: `https://z.csgmall.com.cn`,
- target: `http://192.168.2.158:49080`, //超
+ target: `http://192.168.2.127:39080`, //超
// target: `http://10.40.92.81:8080`, //韩/
// target: `http://192.168.2.74:49080`, //旭/
// target: `http://192.168.2.17:39080`, //帅