pda-master.git - Gitblit

parent: b1a44d0c | 补丁 | 提交 | ignore whitespace

skyouc

2025-04-30 4c94dc71afd85a903ebed62db99b4ca11a2cd46d

no message

6个文件已修改

	common/request.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	main.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/listing/disc.vue	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/listing/labour.vue	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/listing/upper.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/rece/standard.vue	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 common/request.js

@@ -15,8 +15,8 @@
    return new Promise((resolve, reject) => {

        const token = uni.getStorageSync('token');

        // const URL = 'http://47.76.147.249:8080/rsf-server/pda' + url;

        // const URL = 'http://192.168.4.24:8080/rsf-server/pda' + url;

        const URL = 'http://127.0.0.1:8080/rsf-server/pda' + url;

        const URL = 'http://test.zoneyung.net:8080/rsf-server/pda' + url;

        // const URL = 'http://127.0.0.1:8080/rsf-server/pda' + url;

        uni.request({

            url: URL,

            data: postData,


 main.js

@@ -8,7 +8,7 @@
//全局数据状态管理 vuex
import store from '@/store/index.js';
Vue.prototype.$store = store;
//全局公用静态数据
//全局公用静态数据f
import Mock from '@/common/mock/index.js';
Vue.prototype.$Mock = Mock;


 pages/listing/disc.vue

@@ -88,29 +88,29 @@
                        <view class="content">

                            <text class="text-black">库存单位: <text class="text-grey ">{{item.stockUnit}}</text></text>

                        </view>



                        <!-- <view class="content">

                        <text class="text-black">计划收货数: <text class="text-grey ">{{item.anfme}}</text></text>

                    </view> -->

                        <view class="content">

                            <text class="text-black">收货数量: <text class="text-grey ">{{item.anfme}}</text></text>

                        </view>
                        <view class="content">
                            <text class="text-black">已上架数量: <text class="text-grey ">{{item.workQty + item.qty}}</text></text>
                        </view>

                    </view>



                    <view class="cu-item">

                    <view class="cu-item">
                        <view class="content">
                            <text class="text-black">可组盘数量: <text class="text-grey ">{{item.anfme - item.workQty}}</text></text>
                        </view>

                        <view class="content">

                            <view class="cu-form-group padding-lr-0">

                                <view class="title text-blue"><text

                                        class="text-red text-xl vertical-middle">*</text>组盘数量:

                                </view>

                                <input type="number" placeholder="请输入组盘数量" v-model="item.anfme"></input>

                                <input type="number" placeholder="请输入组盘数量" v-model="megreQty"></input>

                            </view>

                        </view>

                    </view>



                </view>

            </block>



        </view>





        <view class="cu-bar btn-group foot">

            <button class="cu-btn text-blue line-blue shadow" @click="clear">清空</button>

            <button class="cu-btn bg-blue shadow-blur" @click="confirm">组盘</button>

@@ -133,7 +133,8 @@
        data() {

            return {

                barcode: '',

                container: '',

                container: '',
                megreQty: '',

                list: [],

                range: [],

                isconfirm: false

@@ -217,8 +218,8 @@
                const newArr = this.list.map(item => {

                    return {

                        ...item,

                        anfme: item.anfme === null ? 0 : + item.anfme,

                        receiptQty: item.anfme === null ? 0 : + item.anfme

                        anfme: item.anfme === null ? 0 : +item.anfme,

                        receiptQty: this.megreQty,

                    };

                });




 pages/listing/labour.vue

@@ -17,9 +17,6 @@
                <text class='cuIcon-search text-blue' @click="search"></text>

            </view>

        </form>







        <view class="cu-list det menu sm-border  padding">

            <block v-for="(item, index) in list" :key="index">

                <view class="cu-bar bg-white solid-bottom margin-top-sm">

@@ -53,7 +50,6 @@
                        <text class="text-grey ">{{item.barcode}}</text>

                    </view>

                </view>



                <view class="cu-item">

                    <view class="content">

                        <text class="text-black">供应商批次:</text>

@@ -62,7 +58,6 @@
                        <text class="text-grey ">{{item.splrBatch}}</text>

                    </view>

                </view>



                <view class="cu-item">

                    <view class="content">

                        <text class="text-black">库存批次:</text>

@@ -71,8 +66,6 @@
                        <text class="text-grey ">{{item.batch}}</text>

                    </view>

                </view>





                <view class="cu-item">

                    <view class="content">

                        <text class="text-black">收货数量:</text>


 pages/listing/upper.vue

@@ -9,7 +9,7 @@


            <view class="cu-form-group ">

                <view class="title">目标库区</view>

                <input placeholder="请扫描目标库区" v-model="areaName" disabled></input>

                <input placeholder="请扫描目标库区" v-model="areaName" ></input>

            </view>



            <view class="cu-form-group ">


 pages/rece/standard.vue

@@ -52,9 +52,6 @@
                        <text class="text-black">实时库存: <text class="text-grey ">{{item.stockQty}}</text></text>

                    </view>

                </view>







                <view class="cu-item">

                    <view class="content">

                        <text class="text-black">平台行号: <text class="text-grey ">{{item.platformId}}</text></text>

@@ -63,7 +60,6 @@
                        <text class="text-black">质检结果: <text class="text-grey ">{{item.inspect}}</text></text>

                    </view>

                </view>



                <view class="cu-item">

                    <view class="content">

                        <text class="text-black">采购单位:<text class="text-grey ">{{item.purUnit}}</text></text>

@@ -72,13 +68,15 @@
                        <text class="text-black">库存单位: <text class="text-grey ">{{item.stockUnit}}</text></text>

                    </view>

                </view>



                <view class="cu-item">

                    <view class="content">

                        <text class="text-blue">计划收货数量:<text class="text-grey ">{{item.anfme}}</text></text>

                    </view>					
                    </view>

                    <view class="content">

                        <text class="text-black">已收数量:<text class="text-grey ">{{item.qty}}</text></text>

                    </view>

                </view>

                <view class="cu-item">					
                <view class="cu-item">

                    <view class="content" v-if="!isconfirm">

                        <view class="cu-form-group padding-lr-0">

                            <view class="title text-blue">收货数量:</view>

@@ -200,8 +198,8 @@
                    data,

                    msg

                } = await request('/orders/' + this.barcode, {}, "get")

                if (code === 200) {					
                    if (Object.keys(data).length === 0){

                if (code === 200) {

                    if (Object.keys(data).length === 0) {

                        uni.showToast({

                            title: "该标签未查询到数据",

                            icon: "none",

@@ -209,15 +207,15 @@
                        })

                    }

                    this.list.push(...data)

					
                }else if(code == 401){



                } else if (code == 401) {

                    setTimeout(() => {

                        uni.removeStorageSync('token');

                        uni.reLaunch({

                            url: "/pages/login/login"

                        });

                    }, 1000);

                }else {

                } else {

                    uni.showToast({

                        title: msg,

                        icon: "none",

			@@ -15,8 +15,8 @@
			return new Promise((resolve, reject) => {
			const token = uni.getStorageSync('token');
			// const URL = 'http://47.76.147.249:8080/rsf-server/pda' + url;
			// const URL = 'http://192.168.4.24:8080/rsf-server/pda' + url;
			const URL = 'http://127.0.0.1:8080/rsf-server/pda' + url;
			const URL = 'http://test.zoneyung.net:8080/rsf-server/pda' + url;
			// const URL = 'http://127.0.0.1:8080/rsf-server/pda' + url;
			uni.request({
			url: URL,
			data: postData,

			@@ -8,7 +8,7 @@
			//全局数据状态管理 vuex
			import store from '@/store/index.js';
			Vue.prototype.$store = store;
			//全局公用静态数据
			//全局公用静态数据f
			import Mock from '@/common/mock/index.js';
			Vue.prototype.$Mock = Mock;

			@@ -88,29 +88,29 @@
			<view class="content">
			<text class="text-black">库存单位: <text class="text-grey ">{{item.stockUnit}}</text></text>
			</view>

			<!-- <view class="content">
			<text class="text-black">计划收货数: <text class="text-grey ">{{item.anfme}}</text></text>
			</view> -->
			<view class="content">
			<text class="text-black">收货数量: <text class="text-grey ">{{item.anfme}}</text></text>
			</view>
			<view class="content">
			<text class="text-black">已上架数量: <text class="text-grey ">{{item.workQty + item.qty}}</text></text>
			</view>
			</view>

			<view class="cu-item">
			<view class="cu-item">
			<view class="content">
			<text class="text-black">可组盘数量: <text class="text-grey ">{{item.anfme - item.workQty}}</text></text>
			</view>
			<view class="content">
			<view class="cu-form-group padding-lr-0">
			<view class="title text-blue"><text
			class="text-red text-xl vertical-middle">*</text>组盘数量:
			</view>
			<input type="number" placeholder="请输入组盘数量" v-model="item.anfme"></input>
			<input type="number" placeholder="请输入组盘数量" v-model="megreQty"></input>
			</view>
			</view>
			</view>

			</view>
			</block>

			</view>


			<view class="cu-bar btn-group foot">
			<button class="cu-btn text-blue line-blue shadow" @click="clear">清空</button>
			<button class="cu-btn bg-blue shadow-blur" @click="confirm">组盘</button>
			@@ -133,7 +133,8 @@
			data() {
			return {
			barcode: '',
			container: '',
			container: '',
			megreQty: '',
			list: [],
			range: [],
			isconfirm: false
			@@ -217,8 +218,8 @@
			const newArr = this.list.map(item => {
			return {
			...item,
			anfme: item.anfme === null ? 0 : + item.anfme,
			receiptQty: item.anfme === null ? 0 : + item.anfme
			anfme: item.anfme === null ? 0 : +item.anfme,
			receiptQty: this.megreQty,
			};
			});

			@@ -17,9 +17,6 @@
			<text class='cuIcon-search text-blue' @click="search"></text>
			</view>
			</form>



			<view class="cu-list det menu sm-border padding">
			<block v-for="(item, index) in list" :key="index">
			<view class="cu-bar bg-white solid-bottom margin-top-sm">
			@@ -53,7 +50,6 @@
			<text class="text-grey ">{{item.barcode}}</text>
			</view>
			</view>

			<view class="cu-item">
			<view class="content">
			<text class="text-black">供应商批次:</text>
			@@ -62,7 +58,6 @@
			<text class="text-grey ">{{item.splrBatch}}</text>
			</view>
			</view>

			<view class="cu-item">
			<view class="content">
			<text class="text-black">库存批次:</text>
			@@ -71,8 +66,6 @@
			<text class="text-grey ">{{item.batch}}</text>
			</view>
			</view>


			<view class="cu-item">
			<view class="content">
			<text class="text-black">收货数量:</text>

			@@ -9,7 +9,7 @@

			<view class="cu-form-group ">
			<view class="title">目标库区</view>
			<input placeholder="请扫描目标库区" v-model="areaName" disabled></input>
			<input placeholder="请扫描目标库区" v-model="areaName" ></input>
			</view>

			<view class="cu-form-group ">

			@@ -52,9 +52,6 @@
			<text class="text-black">实时库存: <text class="text-grey ">{{item.stockQty}}</text></text>
			</view>
			</view>



			<view class="cu-item">
			<view class="content">
			<text class="text-black">平台行号: <text class="text-grey ">{{item.platformId}}</text></text>
			@@ -63,7 +60,6 @@
			<text class="text-black">质检结果: <text class="text-grey ">{{item.inspect}}</text></text>
			</view>
			</view>

			<view class="cu-item">
			<view class="content">
			<text class="text-black">采购单位:<text class="text-grey ">{{item.purUnit}}</text></text>
			@@ -72,13 +68,15 @@
			<text class="text-black">库存单位: <text class="text-grey ">{{item.stockUnit}}</text></text>
			</view>
			</view>

			<view class="cu-item">
			<view class="content">
			<text class="text-blue">计划收货数量:<text class="text-grey ">{{item.anfme}}</text></text>
			</view>
			</view>
			<view class="content">
			<text class="text-black">已收数量:<text class="text-grey ">{{item.qty}}</text></text>
			</view>
			</view>
			<view class="cu-item">
			<view class="cu-item">
			<view class="content" v-if="!isconfirm">
			<view class="cu-form-group padding-lr-0">
			<view class="title text-blue">收货数量:</view>
			@@ -200,8 +198,8 @@
			data,
			msg
			} = await request('/orders/' + this.barcode, {}, "get")
			if (code === 200) {
			if (Object.keys(data).length === 0){
			if (code === 200) {
			if (Object.keys(data).length === 0) {
			uni.showToast({
			title: "该标签未查询到数据",
			icon: "none",
			@@ -209,15 +207,15 @@
			})
			}
			this.list.push(...data)

			}else if(code == 401){

			} else if (code == 401) {
			setTimeout(() => {
			uni.removeStorageSync('token');
			uni.reLaunch({
			url: "/pages/login/login"
			});
			}, 1000);
			}else {
			} else {
			uni.showToast({
			title: msg,
			icon: "none",