|
|
@@ -88,15 +88,15 @@
|
|
|
</view>
|
|
|
<view class="select-cmd_bx">
|
|
|
<view class="num_bx">
|
|
|
- <view class="kc">重量</view>
|
|
|
- <input v-model="customData.realityWeight" @focus="customData.realityWeight = null" type="number" placeholder="公斤" />
|
|
|
+ <view class="kc">总价</view>
|
|
|
+ <input v-model="customData.itemPrice" @focus="customData.itemPrice = null" type="number" placeholder="采购金额" />
|
|
|
+ <text style="margin-left: 20rpx">元</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="select-cmd_bx">
|
|
|
<view class="num_bx">
|
|
|
- <view class="kc">总价</view>
|
|
|
- <input v-model="customData.itemPrice" @focus="customData.itemPrice = null" type="number" placeholder="采购金额" />
|
|
|
- <text style="margin-left: 20rpx">元</text>
|
|
|
+ <view class="kc">重量</view>
|
|
|
+ <input readonly v-model="customData.realityWeight" @focus="customData.realityWeight = null" type="number" placeholder="公斤" />
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -221,10 +221,13 @@ export default {
|
|
|
this.$nextTick(()=>{
|
|
|
//取消
|
|
|
if (val.index === 0) {
|
|
|
- if(this.customData.bigCount>0||this.customData.smallCount>0){
|
|
|
- }else{
|
|
|
+
|
|
|
+
|
|
|
+ //if((this.customData.bigCount>0||this.customData.smallCount>0) && /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.customData.itemPrice) == true){
|
|
|
+ //console.log(222222)
|
|
|
+ //}else{
|
|
|
this.delAllEvent(this.customData);
|
|
|
- }
|
|
|
+ //}
|
|
|
this.modalCancel();
|
|
|
return
|
|
|
}
|