From afd9fa412f84fa408c1ea0a2dd578d3c1a85fa2a Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Wed, 7 Jul 2021 11:18:03 +0800
Subject: [PATCH] bug input

---
 pages/process/order-check/index.wxml        | 24 ++++++---------------
 pages/process/order-list/index.wxml         |  2 ++
 pages/process/order-price/index.wxml        |  4 ++--
 pages/process/outside-check-item/index.js   |  1 -
 pages/process/outside-check-item/index.wxml | 20 ++++++++---------
 pages/process/outside-item/index.js         |  4 +++-
 pages/process/outside-item/index.wxml       | 24 ++++++---------------
 7 files changed, 29 insertions(+), 50 deletions(-)

diff --git a/pages/process/order-check/index.wxml b/pages/process/order-check/index.wxml
index 9a76737..ddcde8d 100644
--- a/pages/process/order-check/index.wxml
+++ b/pages/process/order-check/index.wxml
@@ -61,40 +61,28 @@
       <text>单价(元/公斤)</text>
     </view>
   </van-field>
-  <!-- <van-cell>
+  <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>
         <text style="margin-left:8rpx">扣重(公斤)</text>
       </view>
       <input id="deductWeight" type="digit" disabled="{{form.sign == 2}}" focus="{{focus == 1}}"
-        placeholder-style="color:#aaa" style="text-align: right" maxlength="10" placeholder="请输入扣重重量"
+        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" 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>
-      <text style="margin-left:8rpx">扣重(公斤)</text>
-    </view>
-  </van-field>
-  <!-- <van-cell>
+  </van-cell>
+  <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>
         <text style="margin-left:8rpx">扣点(%)</text>
       </view>
       <input id="deductPercent" type="digit" disabled="{{form.sign == 1}}" focus="{{focus == 2}}"
-        placeholder-style="color:#aaa" style="text-align: right" maxlength="10" placeholder="请输入扣点比例"
+        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 == 2}}" input-align="right" 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>
-      <text style="margin-left:8rpx">扣点(%)</text>
-    </view>
-  </van-field>
+  </van-cell>
   <van-cell>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">结算重量(公斤)</view>
diff --git a/pages/process/order-list/index.wxml b/pages/process/order-list/index.wxml
index 9194c47..a9e41ac 100644
--- a/pages/process/order-list/index.wxml
+++ b/pages/process/order-list/index.wxml
@@ -74,6 +74,8 @@
             bind:click="checkOrder" wx:if="{{item.status == 3}}">审核</van-button>
           <van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:160rpx" data-page="{{pageIndex}}" data-index="{{index}}"
             bind:click="paymentItem" wx:if="{{item.status == 4 && admin}}">去支付</van-button>
+          <van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:160rpx" data-page="{{pageIndex}}" data-index="{{index}}"
+            bind:click="paymentItem" wx:if="{{item.status == 6 && admin}}">去结算</van-button>
         </view>
       </view>
     </view>
diff --git a/pages/process/order-price/index.wxml b/pages/process/order-price/index.wxml
index da06495..03ab7aa 100644
--- a/pages/process/order-price/index.wxml
+++ b/pages/process/order-price/index.wxml
@@ -77,7 +77,7 @@
         <text style="margin-left:8rpx">扣重(公斤)</text>
       </view>
       <input id="deductWeight" type="digit" disabled="{{form.sign == 2}}" focus="{{focus == 1}}"
-        placeholder-style="color:#aaa" style="text-align: right" maxlength="10" placeholder="请输入扣重重量(选填)"
+        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>
@@ -88,7 +88,7 @@
         <text style="margin-left:8rpx">扣点(%)</text>
       </view>
       <input id="deductPercent" type="digit" disabled="{{form.sign == 1}}" focus="{{focus == 2}}"
-        placeholder-style="color:#aaa" style="text-align: right" maxlength="10" placeholder="请输入扣点比例(选填)"
+        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>
diff --git a/pages/process/outside-check-item/index.js b/pages/process/outside-check-item/index.js
index d9de0b4..3a9f8b5 100644
--- a/pages/process/outside-check-item/index.js
+++ b/pages/process/outside-check-item/index.js
@@ -83,7 +83,6 @@ Component({
       this.setData({ item: this.data.item, visible: false, cIndex: this.data.cIndex })
     },
     changeDeductType: function(e){
-      console.log('changeDeductType')
       this.setData({ ['item.sign']: e.currentTarget.dataset.type, focus: e.currentTarget.dataset.type })
     }
   }
diff --git a/pages/process/outside-check-item/index.wxml b/pages/process/outside-check-item/index.wxml
index 0560ec7..2894bac 100644
--- a/pages/process/outside-check-item/index.wxml
+++ b/pages/process/outside-check-item/index.wxml
@@ -31,40 +31,40 @@
 		<view class="{{item.netWeight ? 'text-black' : 'text-gray'}}">{{item.netWeight || ''}}</view>
 	</view>
 </van-cell>
-<!-- <van-cell>
+<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>
 			<text style="margin-left:8rpx">扣重(公斤)</text>
 		</view>
 		<input id="deductWeight" type="digit" disabled="{{item.sign == 2}}" focus="{{focus == 1}}"
-			placeholder-style="color:#aaa" style="text-align: right" maxlength="10" placeholder="请输入扣重重量"
+			placeholder-style="color:#aaa" style="text-align: right;flex:1" 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" bind:change="bindInput" bind:focus="changeDeductType">
+</van-cell>
+<!-- <van-field id="deductWeight" value="{{ item.deductWeight || '' }}" data-type="1" type="digit" placeholder="请输入扣重重量(选填)" clearable disabled="{{item.sign == 1}}" input-align="right" 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>
 		<text style="margin-left:8rpx">扣重(公斤)</text>
 	</view>
-</van-field>
-<!-- <van-cell>
+</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>
 			<text style="margin-left:8rpx">扣点(%)</text>
 		</view>
 		<input id="deductPercent" type="digit" disabled="{{form.sign == 1}}" focus="{{focus == 2}}"
-			placeholder-style="color:#aaa" style="text-align: right" maxlength="10" placeholder="请输入扣点比例"
+			placeholder-style="color:#aaa" style="text-align: right;flex:1" 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" bind:change="bindInput" data-type="2" maxlength="10" bind:focus="changeDeductType">
+</van-cell>
+<!-- <van-field id="deductPercent" value="{{ item.deductPercent || '' }}" type="digit" placeholder="请输入扣点比例(选填)" clearable disabled="{{item.sign == 1}}" input-align="right" 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>
 		<text style="margin-left:8rpx">扣点(%)</text>
 	</view>
-</van-field>
+</van-field> -->
 <van-cell>
 	<view slot="title" class="flex flex-justify">
 		<view class="text-black">结算重量(公斤)</view>
diff --git a/pages/process/outside-item/index.js b/pages/process/outside-item/index.js
index 2c2e2b1..1689668 100644
--- a/pages/process/outside-item/index.js
+++ b/pages/process/outside-item/index.js
@@ -100,7 +100,9 @@ Component({
       this.setData({ item: this.data.item })
     },
     changeDeductType: function(e){
-      this.setData({ ['item.sign']: e.currentTarget.dataset.type, focus: e.currentTarget.dataset.type })
+      var type = Number(e.currentTarget.dataset.type)
+      this.setData({ ['item.sign']: type, focus: type })
+      console.log(this.data.item)
     },
     fileChange: function({detail}){
       this.data.fileList = detail.fileList
diff --git a/pages/process/outside-item/index.wxml b/pages/process/outside-item/index.wxml
index 00a5a7e..57d7310 100644
--- a/pages/process/outside-item/index.wxml
+++ b/pages/process/outside-item/index.wxml
@@ -62,40 +62,28 @@
 		<text>结算单价(元/公斤)</text>
 	</view>
 </van-field>
-<!-- <van-cell wx:if="{{status == 1}}">
+<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>
 			<text style="margin-left:8rpx">扣重(公斤)</text>
 		</view>
 		<input id="deductWeight" type="digit" disabled="{{item.sign == 2}}" focus="{{focus == 1}}"
-			placeholder-style="color:#aaa" style="text-align: right" maxlength="10" placeholder="请输入扣重重量"
+			placeholder-style="color:#aaa" style="text-align: right;flex:1" 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" 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 == 1 }}" icon-size="32rpx"></van-checkbox>
-		<text style="margin-left:8rpx">扣重(公斤)</text>
-	</view>
-</van-field>
-<!-- <van-cell wx:if="{{status == 1}}">
+</van-cell>
+<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>
 			<text style="margin-left:8rpx">扣点(%)</text>
 		</view>
 		<input id="deductPercent" type="digit" disabled="{{form.sign == 1}}" focus="{{focus == 2}}"
-			placeholder-style="color:#aaa" style="text-align: right" maxlength="10" placeholder="请输入扣点比例"
+			placeholder-style="color:#aaa" style="text-align: right;flex:1" 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 == 2}}" input-align="right" 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>
-		<text style="margin-left:8rpx">扣点(%)</text>
-	</view>
-</van-field>
+</van-cell>
 <van-cell wx:if="{{status == 1}}">
 	<view slot="title" class="flex flex-justify">
 		<view class="text-black">结算重量(公斤)</view>