无纸化理货-理货确认 操作优化

assets/css/tallyGoods/confirm.scss

@@ -21,6 +21,12 @@
         background: #ffffff;
         border-radius: 4rpx;
         margin-bottom: 16rpx;
+        &.switchClass {
+            padding: 8rpx 24rpx 8rpx 24rpx;
+            .title {
+                margin-bottom: 0 !important;
+            }
+        }
         .warehouse {
             padding-bottom: 24rpx;
             border-bottom: 1px solid #e6edf0;
@@ -119,6 +125,11 @@
                     font-size: 24rpx;
                     color: #404547;
                 }
+                .switch {
+                    switch {
+                        margin-right: -17rpx;
+                    }
+                }
             }
             .upload-list {
                 padding-bottom: 48rpx;
@@ -220,7 +231,7 @@
         border-radius: 4rpx;
         font-size: 28rpx;
         color: #ffffff;
-        &.disabled{
+        &.disabled {
             opacity: 0.7;
         }
     }

pages/tallyGoods/confirm.vue

@@ -42,20 +42,20 @@
                     <text class="text-prompt">KG</text>
                 </view>
             </view>
-            <view class="box row bothSide verCenter">
+            <navigator class="box row bothSide verCenter" :url="'/pages/tallyGoods/originSplit?erp_order_sn=' + form.erp_order_sn" hover-class="none">
                 <text class="label">产地拆分（选填）</text>
-                <navigator class="input-wrap-width row verCenter" :url="'/pages/tallyGoods/originSplit?erp_order_sn=' + form.erp_order_sn" hover-class="none">
+                <view class="input-wrap-width row bothSide verCenter">
                     <text class="text">{{ form.detail_json.length > 0 ? '已拆分' + form.detail_json.length : '请选择' }}</text>
                     <text class="iconfont icon-sanjiaoxing2"></text>
-                </navigator>
-            </view>
-            <view class="box row bothSide verCenter">
+                </view>
+            </navigator>
+            <navigator class="box row bothSide verCenter" :url="'/pages/tallyGoods/manualMerge?erp_order_sn=' + form.erp_order_sn + '&fix_erp_order_sn=' + form.fix_erp_order_sn" hover-class="none">
                 <text class="label">手动合箱（选填）</text>
-                <navigator class="input-wrap-width row verCenter" :url="'/pages/tallyGoods/manualMerge?erp_order_sn=' + form.erp_order_sn + '&fix_erp_order_sn=' + form.fix_erp_order_sn" hover-class="none">
+                <view class="input-wrap-width row verCenter">
                     <text class="text">{{ form.fix_erp_order_sn ? '已合箱' : '请选择' }}</text>
                     <text class="iconfont icon-sanjiaoxing2"></text>
-                </navigator>
-            </view>
+                </view>
+            </navigator>
         </view>
         <view class="section" v-if="isInspOrg">
             <!-- 商检图片上传 -->
@@ -86,14 +86,17 @@
                 </view>
             </view>
         </view>
-        <view class="section" style="margin-bottom: 48rpx;">
+        <view class="section" style="margin-bottom: 48rpx;" :class="{ switchClass: !switchFlag }">
             <!-- 采购单上传 -->
             <view class="upload-box">
                 <view class="title row bothSide verCenter">
-                    <text class="tt-l">采购单上传（选填）</text>
-                    <text class="tt-r">{{ image_list.length }}/4</text>
+                    <view class="row verCenter">
+                        <text class="tt-l">采购单上传（选填）</text>
+                        <text class="tt-r" v-if="switchFlag">{{ image_list.length }}/4</text>
+                    </view>
+                    <view class="switch"><switch @change="switchChange" color="#197adb" style="transform:scale(0.7)" /></view>
                 </view>
-                <view class="upload-list row verCenter">
+                <view class="upload-list row verCenter" v-if="switchFlag">
                     <template v-if="image_list.length > 0">
                         <view class="pic-box" v-for="(v, index) in image_list" :key="index">
                             <image :src="v" mode="aspectFill" lazy-load="true" @click="previewChange(image_list, index)"></image>
@@ -118,12 +121,13 @@ export default {
             isInspOrg: false, //是否商检
             noexebshowFalg: true, //控制是否会触发生命周期
             customs_clearance_price_options: ['无', '有'], //清关费选项
-            currentIndex: 0,
+            currentIndex: -1,
             image_list: [], //图片列表
             goods_check_pic_list: [], //商检图片列表
             list: [], //商检型号列表
             maxNum: 4, //最大上传图片数量
             disabled: false,
+            switchFlag: false,
             form: {
                 erp_order_sn: '', //入仓号
                 customs_clearance_price: 0, //清关费
@@ -190,6 +194,10 @@ export default {
                 }
             });
         },
+        switchChange: function(e) {
+            this.switchFlag = e.detail.value;
+            console.log('switch1 发生 change 事件，携带值为', e.detail.value);
+        },
         onInput() {
             // 清除之前的定时器
             clearTimeout(this.timer);
@@ -454,6 +462,13 @@ export default {
                 });
                 return false;
             }
+            if (this.currentIndex == -1) {
+                uni.showModal({
+                    content: '请选择清关费选项',
+                    showCancel: false
+                });
+                return false;
+            }
             if (!this.form.box_num) {
                 uni.showModal({
                     content: '请填写箱子数',