From 41be39482d98944b5be8e52cacc8e9e5d48a6cfc Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Wed, 30 Jun 2021 19:40:39 +0800
Subject: [PATCH] no message

---
 pages/process/outside-check-item/index.js   | 1 +
 pages/process/outside-check-item/index.json | 1 +
 pages/process/outside-check-item/index.wxml | 4 ++--
 pages/process/outside-item/index.wxml       | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pages/process/outside-check-item/index.js b/pages/process/outside-check-item/index.js
index fa4bfbc..4bfcc24 100644
--- a/pages/process/outside-check-item/index.js
+++ b/pages/process/outside-check-item/index.js
@@ -83,6 +83,7 @@ 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.json b/pages/process/outside-check-item/index.json
index 8725549..b39a924 100644
--- a/pages/process/outside-check-item/index.json
+++ b/pages/process/outside-check-item/index.json
@@ -3,6 +3,7 @@
   "usingComponents": {
     "van-cell": "/components/cell/index",
     "van-field": "/components/field/index",
+    "van-button": "/components/button/index",
     "van-checkbox": "/components/checkbox/index",
     "van-grid": "/components/grid/index",
     "van-grid-item": "/components/grid-item/index",
diff --git a/pages/process/outside-check-item/index.wxml b/pages/process/outside-check-item/index.wxml
index c93dacd..990d1f4 100644
--- a/pages/process/outside-check-item/index.wxml
+++ b/pages/process/outside-check-item/index.wxml
@@ -42,7 +42,7 @@
 			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">
+<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">
 	<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>
@@ -59,7 +59,7 @@
 			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}}">
+<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">
 	<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>
diff --git a/pages/process/outside-item/index.wxml b/pages/process/outside-item/index.wxml
index adb2609..00a5a7e 100644
--- a/pages/process/outside-item/index.wxml
+++ b/pages/process/outside-item/index.wxml
@@ -36,7 +36,7 @@
 		<view class="{{item.estimatedAmount ? 'text-black' : 'text-gray'}}">{{item.estimatedAmount || ''}}</view>
 	</view>
 </van-cell>
-<view class="bg-white" style="padding: 24rpx 32rpx 20rpx 32rpx" wx:if="{{status != 0 && fileList.length}}">
+<view class="bg-white" style="padding: 24rpx 32rpx 20rpx 32rpx" wx:if="{{status == 0 || (status != 0 && fileList.length)}}">
 	<view class="flex flex-justify" style="padding-bottom: 24rpx">
 		<view class="flex flex-center text-black">
 			<text>过磅凭证</text>