css

assets/css/putaway/record.scss

@@ -40,6 +40,17 @@
             }
         }
     }
+    .radio-wrap {
+        padding: 22rpx 0;
+        label {
+            margin-right: 10rpx;
+        }
+        text {
+            font-size: 18rpx;
+            color: #292b33;
+            margin-left: 5rpx;
+        }
+    }
     .list {
         margin-top: 15rpx;
         padding-bottom: 150rpx;
@@ -54,6 +65,7 @@
             border-radius: 10rpx;
             margin-right: 15rpx;
             margin-bottom: 15rpx;
+            border: 1px solid transparent;
             .check-box-icon {
                 position: absolute;
                 right: 18rpx;

pages/putaway/index.vue

@@ -30,7 +30,7 @@
                 </view>
                 <view class="text-item row verCenter">
                     <text class="label">仓库：</text>
-                    <text class="tt">{{ item.warehouse_name }}</text>
+                    <text class="t1">{{ item.warehouse_name }}</text>
                 </view>
                 <view class="bor row"></view>
                 <view class="text-item row verCenter">
@@ -101,11 +101,6 @@
                             </picker>
                         </view>
                     </view>
-                    <view class="tip-box row verCenter">
-                        <text class="iconfont icon-a-juxing4"></text>
-                        <text class="t1">按数量推荐库位：</text>
-                        <text class="t2">A001、A002、A003</text>
-                    </view>
                 </view>
                 <view class="btn row verCenter bothSide">
                     <view class="btn1 row rowCenter verCenter" @click="closeDrawer()">取 消</view>
@@ -171,12 +166,23 @@ export default {
                 });
                 return false;
             }
+
+            //筛选出所选的仓库
             let filter_arr = this.findIndex(this.filter_list, true);
-            var warehouse_id = filter_arr.map(i => this.list[i].warehouse_id);
-            var stock_in_type = filter_arr.map(i => this.list[i].stock_in_type);
+            let warehouse_id = filter_arr.map(i => this.list[i].warehouse_id);
+            let stock_in_type = filter_arr.map(i => this.list[i].stock_in_type);
+            let isAllElementsEqual = warehouse_id.every(val => val === warehouse_id[0]);
 
-            this.getWhPositionList(7, stock_in_type[0]);
-            this.$refs.showRight.open();
+            if (isAllElementsEqual) {
+                this.$refs.showRight.open();
+                this.getWhPositionList(warehouse_id[0], stock_in_type[0]);
+            } else {
+                uni.showToast({
+                    title: '请勾选相同仓库',
+                    icon: 'error'
+                });
+                return false;
+            }
         },
         closeDrawer() {
             this.$refs.showRight.close();
@@ -275,10 +281,6 @@ export default {
             });
         },
         /**
-         * 查询可用的上架规则
-         */
-        getWorkingRuleList() {},
-        /**
          * 一键上架
          */
         oneKeyPutawayAction() {

pages/putaway/single.vue

@@ -123,10 +123,10 @@
                 </view>
             </view>
             <view class="bor"></view>
-            <view class="tip-box row verCenter">
+            <view class="tip-box row verCenter" v-if="workingRule">
                 <text class="iconfont icon-a-juxing4"></text>
-                <text class="t1">按数量推荐库位：</text>
-                <text class="t2">--</text>
+                <text class="t1">{{ workingRuleList.prefix }}推荐库位：</text>
+                <text class="t2">{{ workingRule }}</text>
             </view>
             <view class="field-item  row">
                 <view class="item row verCenter">
@@ -156,7 +156,8 @@ export default {
             detail: {},
             indexPosition: -1,
             position: [], //库位
-            workingRuleList: [], //推荐库位
+            workingRuleList: {}, //,//推荐库位
+            workingRule: '', //推荐库位
             searchParams: {
                 stock_in_batch_sn: '' //入库批次
             },
@@ -193,7 +194,7 @@ export default {
          */
         clearInput() {
             this.input_flag = false;
-            this.searchParams.stock_in_batch_sn = this.detail.stock_in_batch_sn;
+            this.searchParams.stock_in_batch_sn = '';
             this.getData();
         },
         /**
@@ -237,7 +238,7 @@ export default {
          * 获取库位
          */
         getWhPositionList() {
-            this.request(API.getWhPositionList, 'POST', { warehouse_id: 7, stock_in_type: this.detail.stock_in_type }, false).then(res => {
+            this.request(API.getWhPositionList, 'POST', { warehouse_id: this.detail.warehouse_id, stock_in_type: this.detail.stock_in_type }, false).then(res => {
                 if (res.code === 0) {
                     this.position = res.data.list.map(function(item) {
                         return {
@@ -259,12 +260,19 @@ export default {
         getWorkingRuleList() {
             var params = {
                 num: this.formParams.qty_on_shelf,
-                warehouse_id: 7,
-                com_name: '',
-                supplier_name: ''
+                warehouse_id: this.detail.warehouse_id,
+                com_name: this.detail.com_name,
+                supplier_name: this.detail.supplier_name
             };
             this.request(API.getWorkingRuleList, 'POST', params, false).then(res => {
                 if (res.code === 0) {
+                    if (res.data.list.length > 0) {
+                        this.workingRuleList = res.data;
+                        this.workingRule = res.data.list.map(item => item.position_name).join(',');
+                    } else {
+                        this.workingRuleList = '';
+                        this.workingRule = '';
+                    }
                 } else {
                     uni.showToast({
                         title: res.msg,

util/api.js

@@ -187,6 +187,22 @@ const API = {
      *  查询可用上架规则
      * */
     getWorkingRuleList: API_BASE + '/api/shelf/getWorkingRuleList',
+    /**
+     *  上架记录
+     * */
+    onShelfRecordList: API_BASE + '/api/h5/stockIn/onShelfRecordList',
+    /**
+     *  上架记录详情
+     * */
+    onShelfRecordInfo: API_BASE + '/api/h5/stockIn/onShelfRecordInfo',
+    /**
+     *  取消上架记录
+     * */
+    cancelShelfRecord: API_BASE + '/api/h5/stockIn/cancelShelfRecord',
+    /**
+     *  提交上架
+     * */
+    submitOnShelf: API_BASE + '/api/h5/stockIn/submitOnShelf'
 }