app

pages/arrivalRegister/index.vue

@@ -104,7 +104,7 @@
                             <view class="row verCenter">
                                 <view class="bar row verCenter" style="flex: 0 0 40%;">
                                     <text class="tt">标准品牌：</text>
-                                    <text class="yy">{{ item.brand_name }}</text>
+                                    <text class="yy">{{ item.cccc }}</text>
                                 </view>
                                 <view class="bar  row verCenter" style="flex: 0 0 30%;">
                                     <text class="tt">数量：</text>

pages/picking/index.vue

@@ -18,31 +18,31 @@
             </view>
         </view>
         <view class="list row bothSide" v-if="list.length > 0">
-            <navigator class="box" v-for="(item, index) in list" :key="index" url="/pages/picking/sort" hover-class="none">
+            <navigator class="box" v-for="(item, index) in list" :key="index" :url="'/pages/picking/sort?stock_out_id=' + item.stock_out_id" hover-class="none">
                 <view class="text-item row verCenter">
                     <text class="label">出库单号：</text>
-                    <text class="t1"></text>
+                    <text class="t1">{{ item.stock_out_sn }}</text>
                 </view>
                 <view class="text-item row verCenter">
                     <text class="label">状 态：</text>
-                    <text class="t1">全部锁库</text>
+                    <text class="t1">{{ item.stock_out_status_val }}</text>
                 </view>
                 <view class="bor row"></view>
                 <view class="text-item row verCenter">
                     <text class="label">任 务 数：</text>
-                    <text class="tt">8</text>
+                    <text class="tt">{{ item.items_num }}</text>
                 </view>
                 <view class="text-item row verCenter">
                     <text class="label">总 数 量：</text>
-                    <text class="tt">5000</text>
+                    <text class="tt">{{ item.total_qty }}</text>
                 </view>
                 <view class="text-item row verCenter">
                     <text class="label">上游备注：</text>
-                    <text class="tt">我是一条备注我是一条备注我是一条备注我是一条备注</text>
+                    <text class="tt">{{ item.upstream_remark }}</text>
                 </view>
                 <view class="text-item row verCenter">
                     <text class="label">销售员：</text>
-                    <text class="tt">朱国军</text>
+                    <text class="tt">{{ item.sale_name }}</text>
                 </view>
                 <view class="btn-box row"><view class="btn row rowCenter verCenter">领取</view></view>
             </navigator>
@@ -57,7 +57,6 @@
 
 <script>
 import { API } from '@/util/api.js';
-import { createArray } from '@/util/util.js';
 import debounce from 'lodash/debounce';
 
 export default {
@@ -69,15 +68,14 @@ export default {
             limit: 1000,
             array: ['出库单号'],
             list: [],
-            filter_list: [], //筛选已选中的列表
-            filter_id: [], //过滤处理的id
             searchParams: {
-                stock_out_sn: '',
-                stock_out_id: 4
+                stock_out_sn: ''
             }
         };
     },
-    onLoad() {},
+    onShow() {
+        this.getData();
+    },
     onNavigationBarButtonTap(e) {
         if (e.index == 0) {
             uni.navigateTo({
@@ -94,10 +92,9 @@ export default {
          * 获取列表数据
          */
         getData() {
-            this.request(API.getPickedList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
+            this.request(API.getNoTakeList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
                 if (res.code === 0) {
                     this.list = res.data.list;
-                    this.filter_list = createArray(this.list.length, false);
                 } else {
                     uni.showToast({
                         title: res.msg,

pages/transfer/index.vue

@@ -65,13 +65,15 @@ export default {
             index: 0,
             array: ['移位单号'],
             list: [],
-            filter_list: [], //筛选已选中的列表
             searchParams: {
                 transfer_sn: '' //移位单号
             }
         };
     },
     onLoad() {},
+    onShow() {
+        this.getData();
+    },
     methods: {
         bindPickerChange: function(e) {
             console.log('picker发送选择改变，携带值为', e.detail.value);
@@ -84,7 +86,6 @@ export default {
             this.request(API.getTransferList, 'GET', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
                 if (res.code === 0) {
                     this.list = res.data.list;
-                    this.filter_list = createArray(this.list.length, false);
                 } else {
                     uni.showToast({
                         title: res.msg,

util/api.js

@@ -64,6 +64,14 @@ const API = {
      * */
     confirmTransfer: API_BASE + '/api/transfer/confirmTransfer',
     /**
+     *  拣货-未领取列表
+     * */
+    getNoTakeList: API_BASE + '/api/stockOut/getNoTakeList',
+    /**
+     *  拣货-锁库明细列表
+     * */
+    getLockedList: API_BASE + '/api/stockOut/getLockedList',
+    /**
      *  上传文件
      * */
     upload: API_BASE_LIEXIN + '/oss/upload',