Browse Source

no message

master
xpz2018 4 years ago
parent
commit
58edbef209
8 changed files with 40 additions and 40 deletions
  1. 6
      pages/process/order-check/index.js
  2. 16
      pages/process/order-check/index.wxml
  3. 6
      pages/process/order-price/index.js
  4. 16
      pages/process/order-price/index.wxml
  5. 2
      pages/process/outside-check-item/index.js
  6. 16
      pages/process/outside-check-item/index.wxml
  7. 2
      pages/process/outside-item/index.js
  8. 16
      pages/process/outside-item/index.wxml

6
pages/process/order-check/index.js

@ -33,7 +33,7 @@ Scene({
})
getFactoryOrderInfo(options.id).then(result => {
wx.hideLoading()
result.data.sign = 1
result.data.deductType = 1
if(Number(result.data.deductPercent) <= 0){
result.data.deductPercent = null
}
@ -70,7 +70,7 @@ Scene({
},
changeDeductType: function(e){
var type = Number(e.currentTarget.dataset.type)
this.setData({ ['form.sign']: type, focus: type })
this.setData({ ['form.deductType']: type, focus: type })
},
bindInput: function (e) {
this.data.form[e.target.id] = e.detail
@ -140,7 +140,7 @@ Scene({
}
data.plateNumber = this.data.form.plateNumber
data.productId = this.data.form.productId
data.sign = this.data.form.sign
data.deductType = this.data.form.deductType
data.unitPrice = Number(this.data.form.unitPrice)
checkingOrder({ id: this.data.form.id, editOrderPriceDto: data }).then(result => {
wx.hideLoading()

16
pages/process/order-check/index.wxml

@ -70,34 +70,34 @@
<!-- <van-cell>
<view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black" data-type="1" bindtap="changeDeductType">
<van-checkbox value="{{ form.sign == 1 }}" icon-size="32rpx"></van-checkbox>
<van-checkbox value="{{ form.deductType == 1 }}" icon-size="32rpx"></van-checkbox>
<text style="margin-left:8rpx">扣重(公斤)</text>
</view>
<input id="deductWeight" type="digit" disabled="{{form.sign == 2}}" focus="{{focus == 1}}"
<input id="deductWeight" type="digit" disabled="{{form.deductType == 2}}" focus="{{focus == 1}}"
placeholder-style="color:#aaa" style="text-align: right" maxlength="10" placeholder="请输入扣重重量"
value="{{form.deductWeight || ''}}" bindinput="bindInput" data-type="1" bindtap="changeDeductType" />
</view>
</van-cell> -->
<van-field id="deductWeight" value="{{ form.deductWeight || '' }}" data-type="1" type="digit" placeholder="请输入扣重重量(选填)" clearable disabled="{{form.sign == 2}}" input-align="right" focus="{{focus == 1}}" bind:change="bindInput" bind:click-input="changeDeductType">
<van-field id="deductWeight" value="{{ form.deductWeight || '' }}" data-type="1" type="digit" placeholder="请输入扣重重量(选填)" clearable disabled="{{form.deductType == 2}}" input-align="right" focus="{{focus == 1}}" bind:change="bindInput" bind:click-input="changeDeductType">
<view slot="label" class="flex flex-center text-black" style="justify-content: flex-start" data-type="1" bindtap="changeDeductType">
<van-checkbox value="{{ form.sign == 1 }}" icon-size="32rpx"></van-checkbox>
<van-checkbox value="{{ form.deductType == 1 }}" icon-size="32rpx"></van-checkbox>
<text style="margin-left:8rpx">扣重(公斤)</text>
</view>
</van-field>
<!-- <van-cell>
<view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black" data-type="2" bindtap="changeDeductType">
<van-checkbox value="{{ form.sign == 2 }}" icon-size="32rpx"></van-checkbox>
<van-checkbox value="{{ form.deductType == 2 }}" icon-size="32rpx"></van-checkbox>
<text style="margin-left:8rpx">扣点(%)</text>
</view>
<input id="deductPercent" type="digit" disabled="{{form.sign == 1}}" focus="{{focus == 2}}"
<input id="deductPercent" type="digit" disabled="{{form.deductType == 1}}" focus="{{focus == 2}}"
placeholder-style="color:#aaa" style="text-align: right" maxlength="10" placeholder="请输入扣点比例"
value="{{form.deductPercent}}" bindinput="bindInput" data-type="2" bindtap="changeDeductType" />
</view>
</van-cell> -->
<van-field id="deductPercent" value="{{ form.deductPercent || '' }}" type="digit" placeholder="请输入扣点比例(选填)" clearable disabled="{{form.sign == 1}}" input-align="right" focus="{{focus == 2}}" bind:change="bindInput" data-type="2" maxlength="10" bind:click-input="changeDeductType">
<van-field id="deductPercent" value="{{ form.deductPercent || '' }}" type="digit" placeholder="请输入扣点比例(选填)" clearable disabled="{{form.deductType == 1}}" input-align="right" focus="{{focus == 2}}" bind:change="bindInput" data-type="2" maxlength="10" bind:click-input="changeDeductType">
<view slot="label" class="flex flex-center text-black" style="justify-content: flex-start" data-type="2" bindtap="changeDeductType">
<van-checkbox value="{{ form.sign == 2 }}" icon-size="32rpx"></van-checkbox>
<van-checkbox value="{{ form.deductType == 2 }}" icon-size="32rpx"></van-checkbox>
<text style="margin-left:8rpx">扣点(%)</text>
</view>
</van-field>

6
pages/process/order-price/index.js

@ -34,7 +34,7 @@ Scene({
util.showToast(err)
})
getFactoryOrderInfo(options.id).then(result => {
result.data.sign = 1
result.data.deductType = 1
this.data.step = 1
for (let index = 0; index < 2; index++) {
if(util.isEmpty(result.data.totalWeighingPicture[index])){
@ -103,7 +103,7 @@ Scene({
},
changeDeductType: function(e){
var type = Number(e.currentTarget.dataset.type)
this.setData({ ['form.sign']: type, focus: type })
this.setData({ ['form.deductType']: type, focus: type })
},
bindInput: function (e) {
this.data.form[e.target.id] = e.detail
@ -183,7 +183,7 @@ Scene({
}
data.plateNumber = this.data.form.plateNumber
data.productId = this.data.form.productId
data.sign = this.data.form.sign
data.deductType = this.data.form.deductType
data.unitPrice = Number(this.data.form.unitPrice)
data.isWithoutTare = Number(this.data.form.isWithoutTare)
pricingOrder(data).then(result => {

16
pages/process/order-price/index.wxml

@ -79,34 +79,34 @@
<!-- <van-cell>
<view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black" data-type="1" bindtap="changeDeductType">
<van-checkbox value="{{ form.sign == 1 }}" icon-size="32rpx"></van-checkbox>
<van-checkbox value="{{ form.deductType == 1 }}" icon-size="32rpx"></van-checkbox>
<text style="margin-left:8rpx">扣重(公斤)</text>
</view>
<input id="deductWeight" type="digit" disabled="{{form.sign == 2}}" focus="{{focus == 1}}"
<input id="deductWeight" type="digit" disabled="{{form.deductType == 2}}" focus="{{focus == 1}}"
placeholder-style="color:#aaa" style="text-align: right;flex:1" maxlength="10" placeholder="请输入扣重重量(选填)"
value="{{form.deductWeight}}" bindinput="bindInput" data-type="1" bindtap="changeDeductType" />
</view>
</van-cell> -->
<van-field id="deductWeight" value="{{ form.deductWeight || '' }}" data-type="1" type="digit" placeholder="请输入扣重重量(选填)" clearable disabled="{{form.sign == 2}}" input-align="right" focus="{{focus == 1}}" bind:change="bindInput" bind:click-input="changeDeductType">
<van-field id="deductWeight" value="{{ form.deductWeight || '' }}" data-type="1" type="digit" placeholder="请输入扣重重量(选填)" clearable disabled="{{form.deductType == 2}}" input-align="right" focus="{{focus == 1}}" bind:change="bindInput" bind:click-input="changeDeductType">
<view slot="label" class="flex flex-center text-black" style="justify-content: flex-start" data-type="1" bindtap="changeDeductType">
<van-checkbox value="{{ form.sign == 1 }}" icon-size="32rpx"></van-checkbox>
<van-checkbox value="{{ form.deductType == 1 }}" icon-size="32rpx"></van-checkbox>
<text style="margin-left:8rpx">扣重(公斤)</text>
</view>
</van-field>
<!-- <van-cell>
<view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black" data-type="2" bindtap="changeDeductType">
<van-checkbox value="{{ form.sign == 2 }}" icon-size="32rpx"></van-checkbox>
<van-checkbox value="{{ form.deductType == 2 }}" icon-size="32rpx"></van-checkbox>
<text style="margin-left:8rpx">扣点(%)</text>
</view>
<input id="deductPercent" type="digit" disabled="{{form.sign == 1}}" focus="{{focus == 2}}"
<input id="deductPercent" type="digit" disabled="{{form.deductType == 1}}" focus="{{focus == 2}}"
placeholder-style="color:#aaa" style="text-align: right;flex:1" maxlength="10" placeholder="请输入扣点比例(选填)"
value="{{form.deductPercent}}" bindinput="bindInput" data-type="2" bindtap="changeDeductType" />
</view>
</van-cell> -->
<van-field id="deductPercent" value="{{ form.deductPercent || '' }}" type="digit" placeholder="请输入扣点比例(选填)" clearable disabled="{{form.sign == 1}}" input-align="right" focus="{{focus == 2}}" bind:change="bindInput" data-type="2" maxlength="10" bind:click-input="changeDeductType">
<van-field id="deductPercent" value="{{ form.deductPercent || '' }}" type="digit" placeholder="请输入扣点比例(选填)" clearable disabled="{{form.deductType == 1}}" input-align="right" focus="{{focus == 2}}" bind:change="bindInput" data-type="2" maxlength="10" bind:click-input="changeDeductType">
<view slot="label" class="flex flex-center text-black" style="justify-content: flex-start" data-type="2" bindtap="changeDeductType">
<van-checkbox value="{{ form.sign == 2 }}" icon-size="32rpx"></van-checkbox>
<van-checkbox value="{{ form.deductType == 2 }}" icon-size="32rpx"></van-checkbox>
<text style="margin-left:8rpx">扣点(%)</text>
</view>
</van-field>

2
pages/process/outside-check-item/index.js

@ -84,7 +84,7 @@ Component({
},
changeDeductType: function(e){
var type = Number(e.currentTarget.dataset.type)
this.setData({ ['item.sign']: type, focus: type })
this.setData({ ['item.deductType']: type, focus: type })
}
}

16
pages/process/outside-check-item/index.wxml

@ -34,34 +34,34 @@
<!-- <van-cell>
<view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black" data-type="1" bindtap="changeDeductType">
<van-checkbox value="{{ !item.sign || item.sign == 1 }}" icon-size="32rpx"></van-checkbox>
<van-checkbox value="{{ !item.deductType || item.deductType == 1 }}" icon-size="32rpx"></van-checkbox>
<text style="margin-left:8rpx">扣重(公斤)</text>
</view>
<input id="deductWeight" type="digit" disabled="{{item.sign == 2}}" focus="{{focus == 1}}"
<input id="deductWeight" type="digit" disabled="{{item.deductType == 2}}" focus="{{focus == 1}}"
placeholder-style="color:#aaa" style="text-align: right" maxlength="10" placeholder="请输入扣重重量"
value="{{item.deductWeight || ''}}" bindinput="bindInput" data-type="1" bindtap="changeDeductType" />
</view>
</van-cell> -->
<van-field id="deductWeight" value="{{ item.deductWeight || '' }}" data-type="1" type="digit" placeholder="请输入扣重重量(选填)" clearable disabled="{{form.sign == 1}}" input-align="right" focus="{{focus == 1}}" bind:change="bindInput" bind:click-input="changeDeductType">
<van-field id="deductWeight" value="{{ item.deductWeight || '' }}" data-type="1" type="digit" placeholder="请输入扣重重量(选填)" clearable disabled="{{form.deductType == 1}}" input-align="right" focus="{{focus == 1}}" bind:change="bindInput" bind:click-input="changeDeductType">
<view slot="label" class="flex flex-center text-black" style="justify-content: flex-start" data-type="1" bindtap="changeDeductType">
<van-checkbox value="{{ !item.sign || item.sign == 1 }}" icon-size="32rpx"></van-checkbox>
<van-checkbox value="{{ !item.deductType || item.deductType == 1 }}" icon-size="32rpx"></van-checkbox>
<text style="margin-left:8rpx">扣重(公斤)</text>
</view>
</van-field>
<!-- <van-cell>
<view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black" data-type="2" bindtap="changeDeductType">
<van-checkbox value="{{ item.sign == 2 }}" icon-size="32rpx"></van-checkbox>
<van-checkbox value="{{ item.deductType == 2 }}" icon-size="32rpx"></van-checkbox>
<text style="margin-left:8rpx">扣点(%)</text>
</view>
<input id="deductPercent" type="digit" disabled="{{form.sign == 1}}" focus="{{focus == 2}}"
<input id="deductPercent" type="digit" disabled="{{form.deductType == 1}}" focus="{{focus == 2}}"
placeholder-style="color:#aaa" style="text-align: right" maxlength="10" placeholder="请输入扣点比例"
value="{{item.deductPercent}}" bindinput="bindInput" data-type="2" bindtap="changeDeductType" />
</view>
</van-cell> -->
<van-field id="deductPercent" value="{{ item.deductPercent || '' }}" type="digit" placeholder="请输入扣点比例(选填)" clearable disabled="{{form.sign == 1}}" input-align="right" focus="{{focus == 2}}" bind:change="bindInput" data-type="2" maxlength="10" bind:click-input="changeDeductType">
<van-field id="deductPercent" value="{{ item.deductPercent || '' }}" type="digit" placeholder="请输入扣点比例(选填)" clearable disabled="{{form.deductType == 1}}" input-align="right" focus="{{focus == 2}}" bind:change="bindInput" data-type="2" maxlength="10" bind:click-input="changeDeductType">
<view slot="label" class="flex flex-center text-black" style="justify-content: flex-start" data-type="2" bindtap="changeDeductType">
<van-checkbox value="{{ item.sign == 2 }}" icon-size="32rpx"></van-checkbox>
<van-checkbox value="{{ item.deductType == 2 }}" icon-size="32rpx"></van-checkbox>
<text style="margin-left:8rpx">扣点(%)</text>
</view>
</van-field>

2
pages/process/outside-item/index.js

@ -101,7 +101,7 @@ Component({
},
changeDeductType: function(e){
var type = Number(e.currentTarget.dataset.type)
this.setData({ ['item.sign']: type, focus: type })
this.setData({ ['item.deductType']: type, focus: type })
},
fileChange: function({detail}){
this.data.fileList = detail.fileList

16
pages/process/outside-item/index.wxml

@ -65,34 +65,34 @@
<!-- <van-cell wx:if="{{status == 1}}">
<view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black" data-type="1" bindtap="changeDeductType">
<van-checkbox value="{{ !item.sign || item.sign == 1 }}" icon-size="32rpx"></van-checkbox>
<van-checkbox value="{{ !item.deductType || item.deductType == 1 }}" icon-size="32rpx"></van-checkbox>
<text style="margin-left:8rpx">扣重(公斤)</text>
</view>
<input id="deductWeight" type="digit" disabled="{{item.sign == 2}}" focus="{{focus == 1}}"
<input id="deductWeight" type="digit" disabled="{{item.deductType == 2}}" focus="{{focus == 1}}"
placeholder-style="color:#aaa" style="text-align: right" maxlength="10" placeholder="请输入扣重重量"
value="{{item.deductWeight || ''}}" bindinput="bindInput" data-type="1" bindtap="changeDeductType" />
</view>
</van-cell> -->
<van-field id="deductWeight" value="{{ item.deductWeight || '' }}" data-type="1" type="digit" placeholder="请输入扣重重量(选填)" clearable disabled="{{item.sign == 2}}" input-align="right" focus="{{focus == 1}}" bind:change="bindInput" bind:click-input="changeDeductType" wx:if="{{status == 1}}">
<van-field id="deductWeight" value="{{ item.deductWeight || '' }}" data-type="1" type="digit" placeholder="请输入扣重重量(选填)" clearable disabled="{{item.deductType == 2}}" input-align="right" focus="{{focus == 1}}" bind:change="bindInput" bind:click-input="changeDeductType" wx:if="{{status == 1}}">
<view slot="label" class="flex flex-center text-black" style="justify-content: flex-start" data-type="1" bindtap="changeDeductType">
<van-checkbox value="{{ !item.sign || item.sign == 1 }}" icon-size="32rpx"></van-checkbox>
<van-checkbox value="{{ !item.deductType || item.deductType == 1 }}" icon-size="32rpx"></van-checkbox>
<text style="margin-left:8rpx">扣重(公斤)</text>
</view>
</van-field>
<!-- <van-cell wx:if="{{status == 1}}">
<view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black" data-type="2" bindtap="changeDeductType">
<van-checkbox value="{{ item.sign == 2 }}" icon-size="32rpx"></van-checkbox>
<van-checkbox value="{{ item.deductType == 2 }}" icon-size="32rpx"></van-checkbox>
<text style="margin-left:8rpx">扣点(%)</text>
</view>
<input id="deductPercent" type="digit" disabled="{{item.sign == 1}}" focus="{{focus == 2}}"
<input id="deductPercent" type="digit" disabled="{{item.deductType == 1}}" focus="{{focus == 2}}"
placeholder-style="color:#aaa" style="text-align: right" maxlength="10" placeholder="请输入扣点比例"
value="{{item.deductPercent}}" bindinput="bindInput" data-type="2" bindtap="changeDeductType" />
</view>
</van-cell> -->
<van-field id="deductPercent" value="{{ item.deductPercent || '' }}" type="digit" placeholder="请输入扣点比例(选填)" clearable disabled="{{item.sign == 1}}" input-align="right" focus="{{focus == 2}}" bind:change="bindInput" data-type="2" maxlength="10" bind:click-input="changeDeductType" wx:if="{{status == 1}}">
<van-field id="deductPercent" value="{{ item.deductPercent || '' }}" type="digit" placeholder="请输入扣点比例(选填)" clearable disabled="{{item.deductType == 1}}" input-align="right" focus="{{focus == 2}}" bind:change="bindInput" data-type="2" maxlength="10" bind:click-input="changeDeductType" wx:if="{{status == 1}}">
<view slot="label" class="flex flex-center text-black" style="justify-content: flex-start" data-type="2" bindtap="changeDeductType">
<van-checkbox value="{{ item.sign == 2 }}" icon-size="32rpx"></van-checkbox>
<van-checkbox value="{{ item.deductType == 2 }}" icon-size="32rpx"></van-checkbox>
<text style="margin-left:8rpx">扣点(%)</text>
</view>
</van-field>

Loading…
Cancel
Save