diff --git a/pages/consignment-painting/index.vue b/pages/consignment-painting/index.vue
index 5e0b008..e9711b8 100644
--- a/pages/consignment-painting/index.vue
+++ b/pages/consignment-painting/index.vue
@@ -91,7 +91,7 @@
画作平尺数
- {inputConfirm(e,index)}" placeholder-style="color: #939393;font-size: 24rpx;z-index:0" placeholder="请输入画作平尺数"/>
+ {inputConfirm(e,index)}" placeholder-style="color: #939393;font-size: 24rpx;z-index:0" placeholder="请输入画作平尺数"/>
@@ -134,7 +134,27 @@
添加
- {show_2=true}">
+
+
+
+
+
+
+
+
{{index+1}}
+
{{item.artworkNum}}
+
{{item.artworkName}}
+
¥ {{item.expectedPayment}}
+
+
+
+
+
*仅微信付款
+
预计 ¥{{totalMoney||'0'}}
+
+
确认金额并签署合同
+
+ {show_2=true}">
更换您的寄存地址
@@ -145,8 +165,8 @@
-
+
{{ itemaddress.address }}
*剩余{{ itemaddress.leftNum }}位置
@@ -156,26 +176,8 @@
确定
-
-
{confirmDate(e,index)}" @cancel="closeClick" @change="(e)=>{changeHandler(e,index)}">
-
-
-
-
-
-
{{index+1}}
-
{{item.artworkNum}}
-
{{item.artworkName}}
-
¥ {{item.expectedPayment}}
-
-
-
-
-
*仅微信付款
-
预计 ¥{{totalMoney||'0'}}
-
-
确认金额并签署合同
-
+
+ {confirmDate(e)}" @cancel="closeClick" @change="(e)=>{changeHandler(e)}">
@@ -193,7 +195,7 @@ export default {
columns: [
[180],
['*'],
- [1,2,3,4,5],
+ [1,2,3,4,5,6,7,8,9,10,11],
['='],
[180]
],
@@ -279,7 +281,14 @@ export default {
},
methods: {
inputConfirm: _.debounce(function (event,index) {
- this.obtainAmount(index)
+ this.listPaintings[index].artworkSquareSize=event.target.value.replace(/\D/g, '')
+ let number = parseInt(this.listPaintings[index].artworkSquareSize, 10);
+ if (isNaN(number) || number <= 0) {
+ this.listPaintings[index].artworkSquareSize=''
+ }else {
+ this.obtainAmount(index)
+ }
+
}, 1000),
addDaysToCurrentDate(days) {
return dayjs().add(days, 'day').format('YYYY-MM-DD');
@@ -330,7 +339,7 @@ export default {
picker = this.$refs.uPicker
} = e
if (columnIndex === 2) {
- picker[this.currentIndex].setColumnValues(this.columns.length-1, [this.columns[2][e.index]*this.columns[0][0]])
+ picker.setColumnValues(this.columns.length-1, [this.columns[2][e.index]*this.columns[0][0]])
}
},
itemDelete(index){
@@ -499,6 +508,7 @@ export default {
})
return
}
+
if (!item[check.value]) {
uni.showToast({
@@ -507,6 +517,15 @@ export default {
})
return
}
+ if (check.value==='artworkSquareSize'){
+ if (Number(item[check.value])<1){
+ uni.showToast({
+ title: `第${index+1}条数据的${check.message}应大于0`,
+ icon: 'none'
+ })
+ return
+ }
+ }
}
}
this.loading=true
@@ -576,7 +595,7 @@ export default {
confirmAddress() {
this.show_2 = false
},
- selectAddress(item,index) {
+ selectAddress(item) {
this.listPaintings[this.currentIndex].warehouseID = item.ID
if (this.currentIndex===0){
this.listPaintings.forEach((x)=>{