~jhz/STUWMS.git

parent: 6927c786 | 补丁 | 提交 | ignore whitespace

Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

chenhaozhe

2025-09-25 dec31ef3751c7966af5bf68d1c993bec526a4524

Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

4个文件已修改

	.hbuilderx/launch.json	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	manifest.json	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/caigourukujiaoyan/form.vue	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/shengchanlingliao/form.vue	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 .hbuilderx/launch.json

@@ -25,7 +25,7 @@
            "localRepoPath" : "D:/WorkBench/ZY_APP_Dev/STUWMS/unpackage/debug",
            "openVueDevtools" : true,
            "packageName" : "com.shebeiguanli.www",
            "playground" : "custom",
            "playground" : "standard",
            "type" : "uni-app:app-android"
        }
    ]

 manifest.json

@@ -2,9 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",

    "versionName" : "1.0.85",
    "versionCode" : 185,
    "versionName" : "1.0.88",
    "versionCode" : 188,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {

 pages/caigourukujiaoyan/form.vue

@@ -4,7 +4,7 @@
            <view class="form-item">
                <view class="title">条码:</view>
                <view class="right">
                    <input v-model="hform.HBarCode" :focus="HBarCodeFocus" placeholder="请扫描(或输入)条码" @confirm="getCode(hform.HBarCode)" />
                    <input v-model="hform.HBarCode" :focus="HBarCodeFocus" placeholder="请扫描(或输入)条码" @confirm="getCode(hform.HBarCode)" @blur="getCode(hform.HBarCode)" @input="handleInput" />
                </view>
                <uni-icons type="scan"
                    style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
@@ -45,7 +45,7 @@
                    <view class="title">单据号:</view>
                    <view class="right" style="width: 380rpx;">
                        <input name="HBillNo" v-model="hform.HBillNo" placeholder="请扫描(或输入)条码"
                            @confirm="GetMeesageByBillNo(hform.HBarCode)" :focus="HBillNoFocus"/>
                            @confirm="GetMeesageByBillNo()" :focus="HBillNoFocus" @blur="GetMeesageByBillNo()"/>
                    </view>
                    <uni-icons type="scan"
                        style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
@@ -256,6 +256,10 @@
            this.refreshHBillNoFocus()
        },
        methods: {
            handleInput(event) {
              // 这里可以添加额外的逻辑处理，比如校验或进一步的操作
              console.log(event.target.value);
            },
            // 刷新单据号聚焦
            async refreshHBillNoFocus() {
                this.HBillNoFocus = false
@@ -309,6 +313,9 @@
            },
            //扫描单据号条码
            GetMeesageByBillNo(e) {
                if(this.hform.HBillNo==""||this.hform.HBillNo==undefined){
                    return
                }
                uni.request({
                    url: this.serverUrl + '/WEBSController/get_BillBarCode_BillCheck_Json',
                    data: {
@@ -443,6 +450,10 @@
                }
            },
            getCode(HBarCode) {
                console.log(HBarCode);
                if(HBarCode==undefined||HBarCode==""){
                    return
                }
                //仓库、仓位文本框为空时，清空对应ID
                if (!this.hform.HWHName) {
                    this.hform.HWHID = 0

 pages/shengchanlingliao/form.vue

@@ -5,7 +5,7 @@
                <view class="title">条码:</view>
                <view class="right" style="width: 380rpx;">
                    <input v-model="hform.HBarCode" :focus="HBarCodeFocus" placeholder="请扫描(或输入)条码"
                        @confirm="getCode(hform.HBarCode)" />
                        @confirm="getCode(hform.HBarCode)" @blur="getCode(hform.HBarCode)" />
                </view>
                <uni-icons type="scan"
                    style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
@@ -46,7 +46,7 @@
                    <view class="title">单据号:</view>
                    <view class="right" style="width: 380rpx;">
                        <input name="HBillNo" :focus="HBillNoFocus" v-model="hform.HBillNo" placeholder="请扫描(或输入)条码"
                            @confirm="GetMeesageByBillNo()" />
                            @confirm="GetMeesageByBillNo()" @blur="GetMeesageByBillNo()" />
                    </view>
                    <uni-icons type="scan"
                        style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
@@ -394,6 +394,9 @@
            },
            //扫描单据号条码
            GetMeesageByBillNo(e) {
                if(this.hform.HBillNo==""||this.hform.HBillNo==undefined){
                    return
                }
                uni.request({
                    url: this.serverUrl + '/WEBSController/get_BillBarCode_BillCheck_Json',
                    data: {
@@ -526,6 +529,9 @@
            },
            //扫条码处理
            getCode(HBarCode) {
                if(HBarCode==undefined||HBarCode==""){
                    return
                }
                //仓库、仓位文本框为空时，清空对应ID
                if (!this.hform.HWHName) {
                    this.hform.HWHID = 0

			@@ -25,7 +25,7 @@
			"localRepoPath" : "D:/WorkBench/ZY_APP_Dev/STUWMS/unpackage/debug",
			"openVueDevtools" : true,
			"packageName" : "com.shebeiguanli.www",
			"playground" : "custom",
			"playground" : "standard",
			"type" : "uni-app:app-android"
			}
			]

			@@ -2,9 +2,8 @@
			"name" : "智云LMES",
			"appid" : "__UNI__B002F49",
			"description" : "",

			"versionName" : "1.0.85",
			"versionCode" : 185,
			"versionName" : "1.0.88",
			"versionCode" : 188,
			"transformPx" : false,
			/* 5+App特有相关 */
			"app-plus" : {

			@@ -4,7 +4,7 @@
			<view class="form-item">
			<view class="title">条码:</view>
			<view class="right">
			<input v-model="hform.HBarCode" :focus="HBarCodeFocus" placeholder="请扫描(或输入)条码" @confirm="getCode(hform.HBarCode)" />
			<input v-model="hform.HBarCode" :focus="HBarCodeFocus" placeholder="请扫描(或输入)条码" @confirm="getCode(hform.HBarCode)" @blur="getCode(hform.HBarCode)" @input="handleInput" />
			</view>
			<uni-icons type="scan"
			style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
			@@ -45,7 +45,7 @@
			<view class="title">单据号:</view>
			<view class="right" style="width: 380rpx;">
			<input name="HBillNo" v-model="hform.HBillNo" placeholder="请扫描(或输入)条码"
			@confirm="GetMeesageByBillNo(hform.HBarCode)" :focus="HBillNoFocus"/>
			@confirm="GetMeesageByBillNo()" :focus="HBillNoFocus" @blur="GetMeesageByBillNo()"/>
			</view>
			<uni-icons type="scan"
			style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
			@@ -256,6 +256,10 @@
			this.refreshHBillNoFocus()
			},
			methods: {
			handleInput(event) {
			// 这里可以添加额外的逻辑处理，比如校验或进一步的操作
			console.log(event.target.value);
			},
			// 刷新单据号聚焦
			async refreshHBillNoFocus() {
			this.HBillNoFocus = false
			@@ -309,6 +313,9 @@
			},
			//扫描单据号条码
			GetMeesageByBillNo(e) {
			if(this.hform.HBillNo==""\|\|this.hform.HBillNo==undefined){
			return
			}
			uni.request({
			url: this.serverUrl + '/WEBSController/get_BillBarCode_BillCheck_Json',
			data: {
			@@ -443,6 +450,10 @@
			}
			},
			getCode(HBarCode) {
			console.log(HBarCode);
			if(HBarCode==undefined\|\|HBarCode==""){
			return
			}
			//仓库、仓位文本框为空时，清空对应ID
			if (!this.hform.HWHName) {
			this.hform.HWHID = 0

			@@ -5,7 +5,7 @@
			<view class="title">条码:</view>
			<view class="right" style="width: 380rpx;">
			<input v-model="hform.HBarCode" :focus="HBarCodeFocus" placeholder="请扫描(或输入)条码"
			@confirm="getCode(hform.HBarCode)" />
			@confirm="getCode(hform.HBarCode)" @blur="getCode(hform.HBarCode)" />
			</view>
			<uni-icons type="scan"
			style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
			@@ -46,7 +46,7 @@
			<view class="title">单据号:</view>
			<view class="right" style="width: 380rpx;">
			<input name="HBillNo" :focus="HBillNoFocus" v-model="hform.HBillNo" placeholder="请扫描(或输入)条码"
			@confirm="GetMeesageByBillNo()" />
			@confirm="GetMeesageByBillNo()" @blur="GetMeesageByBillNo()" />
			</view>
			<uni-icons type="scan"
			style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
			@@ -394,6 +394,9 @@
			},
			//扫描单据号条码
			GetMeesageByBillNo(e) {
			if(this.hform.HBillNo==""\|\|this.hform.HBillNo==undefined){
			return
			}
			uni.request({
			url: this.serverUrl + '/WEBSController/get_BillBarCode_BillCheck_Json',
			data: {
			@@ -526,6 +529,9 @@
			},
			//扫条码处理
			getCode(HBarCode) {
			if(HBarCode==undefined\|\|HBarCode==""){
			return
			}
			//仓库、仓位文本框为空时，清空对应ID
			if (!this.hform.HWHName) {
			this.hform.HWHID = 0