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

chenhaozhe

2026-03-05 06c0903e15254ad2bfd02fbcf9cda25be7b28470

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

 pages/index/login.vue

@@ -19,7 +19,7 @@
                    </view> -->
                    <view class="item">
                        <view class="left">{{ $t("login.Language") }}：</view>
                        <picker :range="['中文','English']" :value="Language" @change="onLanguageChangeHandler">
                        <picker :range="['中文','English','Thai']" :value="Language" @change="onLanguageChangeHandler">
                            <view class="right" style="display: flex;align-items: center;">
                                <input type="text" disabled v-model="Language" placeholder="请选择语言">
                                <uni-icons type="forward" color="#808080"
@@ -178,6 +178,11 @@
                    this.ApplyLanguagePack("en")
                    // this.$i18n.locale = 'en'
                }
                if (e.detail.value == 2) {
                    this.Language = 'Thai'
                    this.ApplyLanguagePack("Thai")
                    // this.$i18n.locale = 'en'
                }
            },
            async InitOrgination() {
                console.log("初始化组织")

 pages/shengchanrukushengdan/Kf_ProductInBill.vue

Diff too large

 pages/shengchanrukushengdan/Kf_ProductInBillList.vue

@@ -1,33 +1,33 @@
<template>
    <view class="content">
        <view class="tabs">
            <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缓存列表</view>
            <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">已上传列表</view>
            <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">{{ $t("Kf_ProductInBillList_PDA.cacheList") == "Kf_ProductInBillList_PDA.cacheList" ? "缓存列表" : $t("Kf_ProductInBillList_PDA.cacheList") }}</view>
            <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">{{ $t("Kf_ProductInBillList_PDA.updatedList") == "Kf_ProductInBillList_PDA.updatedList" ? "已上传列表" : $t("Kf_ProductInBillList_PDA.updatedList") }}</view>
        </view>
        
        <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
        
        <view class="form" v-if="tabs == 0">
            <view class="buttons" @tap="add">
                <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>新增
                <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>{{ $t("Kf_ProductInBillList_PDA.btnAdd") == "Kf_ProductInBillList_PDA.btnAdd" ? "新增" : $t("Kf_ProductInBillList_PDA.btnAdd") }}
            </view>
        </view>
        <view class="form" v-if="tabs == 1">
            <view class="form-item">
                <view class="title">单据号:</view>
                <view class="title">{{ $t("Kf_ProductInBillList_PDA.billNo") == "Kf_ProductInBillList_PDA.billNo" ? "单据号" : $t("Kf_ProductInBillList_PDA.billNo") }}:</view>
                <view class="right">
                    <input v-model="hform.HBillNo" placeholder="请输入单据号" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">源单单号:</view>
                <view class="title">{{ $t("Kf_ProductInBillList_PDA.sourceBillNo") == "Kf_ProductInBillList_PDA.sourceBillNo" ? "源单单号" : $t("Kf_ProductInBillList_PDA.sourceBillNo") }}:</view>
                <view class="right">
                    <input v-model="hform.HSourceBillNo" placeholder="请输入源单单号" />
                </view>
            </view>
            <view class="buttons">
                <button class="btn-a" size="mini" type="default" @tap="clear">重置</button>
                <button class="btn-c" size="mini" type="default" @tap="search">查询</button>
                <button class="btn-a" size="mini" type="default" @tap="clear">{{ $t("Kf_ProductInBillList_PDA.btn_Reset") == "Kf_ProductInBillList_PDA.btn_Reset" ? "重置" : $t("Kf_ProductInBillList_PDA.btn_Reset") }}</button>
                <button class="btn-c" size="mini" type="default" @tap="search">{{ $t("Kf_ProductInBillList_PDA.btn_Query") == "Kf_ProductInBillList_PDA.btn_Query" ? "查询" : $t("Kf_ProductInBillList_PDA.btn_Query") }}</button>
            </view>
        </view>
        
@@ -37,28 +37,28 @@
            <uni-card :title="item.制单日期.substr(0,10)" :extra="item.单据号" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
                <view class="card-detail">
                    <view class="detail" v-if="item.制单人">
                        <text>制单人：</text>{{item.制单人}}
                        <text>{{ $t("Kf_ProductInBillList_PDA.table_Maker") == "Kf_ProductInBillList_PDA.table_Maker" ? "制单人" : $t("Kf_ProductInBillList_PDA.table_Maker") }}：</text>{{item.制单人}}
                    </view>
                    <view class="detail" v-if="item.单据内码">
                        <text>单据内码：</text>{{item.单据内码}}
                        <text>{{ $t("Kf_ProductInBillList_PDA.table_BillID") == "Kf_ProductInBillList_PDA.table_BillID" ? "单据内码" : $t("Kf_ProductInBillList_PDA.table_BillID") }}：</text>{{item.单据内码}}
                    </view>
                    <view class="detail" v-if="item.数量">
                        <text>数量：</text>{{item.数量}}
                        <text>{{ $t("Kf_ProductInBillList_PDA.table_Qty") == "Kf_ProductInBillList_PDA.table_Qty" ? "数量" : $t("Kf_ProductInBillList_PDA.table_Qty") }}：</text>{{item.数量}}
                    </view>
                    <view class="detail" v-if="item.源单单号">
                        <text>源单单号：</text>{{item.源单单号}}
                        <text>{{ $t("Kf_ProductInBillList_PDA.table_SourceBillNo") == "Kf_ProductInBillList_PDA.table_SourceBillNo" ? "源单单号" : $t("Kf_ProductInBillList_PDA.table_SourceBillNo") }}：</text>{{item.源单单号}}
                    </view>
                    <view class="detail" v-if="item.组织">
                        <text>组织：</text>{{item.组织}}
                        <text>{{ $t("Kf_ProductInBillList_PDA.table_Org") == "Kf_ProductInBillList_PDA.table_Org" ? "组织" : $t("Kf_ProductInBillList_PDA.table_Org") }}：</text>{{item.组织}}
                    </view>
                </view>

                <view class="more">
                    <view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
                        <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>编辑
                        <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>{{ $t("Kf_ProductInBillList_PDA.btn_Edit") == "Kf_ProductInBillList_PDA.btn_Edit" ? "编辑" : $t("Kf_ProductInBillList_PDA.btn_Edit") }}
                    </view>
                    <view class="part" style="color: #da0000;" @tap.stop="del(item)">
                        <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>删除
                        <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>{{ $t("Kf_ProductInBillList_PDA.btn_Del") == "Kf_ProductInBillList_PDA.btn_Del" ? "删除" : $t("Kf_ProductInBillList_PDA.btn_Del") }}
                    </view>
                </view>
            </uni-card>
@@ -67,45 +67,45 @@
            <uni-card :title="item.日期" :extra="item.单据号" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
                <view class="card-detail">
                    <view class="detail" v-if="item.状态">
                        <text>状态：</text>{{item.状态}}
                        <text>{{ $t("Kf_ProductInBillList_PDA.table_Status") == "Kf_ProductInBillList_PDA.table_Status" ? "状态" : $t("Kf_ProductInBillList_PDA.table_Status") }}：</text>{{item.状态}}
                    </view>
                    <view class="detail" v-if="item.制单人">
                        <text>制单人：</text>{{item.制单人}}
                        <text>{{ $t("Kf_ProductInBillList_PDA.table_Maker") == "Kf_ProductInBillList_PDA.table_Maker" ? "制单人" : $t("Kf_ProductInBillList_PDA.table_Maker") }}：</text>{{item.制单人}}
                    </view>
                    <view class="detail" v-if="item.数量">
                        <text>数量：</text>{{item.数量}}
                        <text>{{ $t("Kf_ProductInBillList_PDA.table_Qty") == "Kf_ProductInBillList_PDA.table_Qty" ? "数量" : $t("Kf_ProductInBillList_PDA.table_Qty") }}：</text>{{item.数量}}
                    </view>
                    <view class="detail" v-if="item.源单单号">
                        <text>源单单号：</text>{{item.源单单号}}
                        <text>{{ $t("Kf_ProductInBillList_PDA.sourceBillNo") == "Kf_ProductInBillList_PDA.sourceBillNo" ? "源单单号" : $t("Kf_ProductInBillList_PDA.sourceBillNo") }}：</text>{{item.源单单号}}
                    </view>
                    <view class="detail" v-if="item.物料代码">
                        <text>物料代码：</text>{{item.物料代码}}
                        <text>{{ $t("Kf_ProductInBillList_PDA.table_MaterNumber") == "Kf_ProductInBillList_PDA.table_MaterNumber" ? "物料代码" : $t("Kf_ProductInBillList_PDA.table_MaterNumber") }}：</text>{{item.物料代码}}
                    </view>
                    <view class="detail" v-if="item.物料名称">
                        <text>物料名称：</text>{{item.物料名称}}
                        <text>{{ $t("Kf_ProductInBillList_PDA.table_MaterName") == "Kf_ProductInBillList_PDA.table_MaterName" ? "物料名称" : $t("Kf_ProductInBillList_PDA.table_MaterName") }}：</text>{{item.物料名称}}
                    </view>
                    <view class="detail" v-if="item.规格型号">
                        <text>规格型号：</text>{{item.规格型号}}
                        <text>{{ $t("Kf_ProductInBillList_PDA.table_MaterModel") == "Kf_ProductInBillList_PDA.table_MaterModel" ? "规格型号" : $t("Kf_ProductInBillList_PDA.table_MaterModel") }}：</text>{{item.规格型号}}
                    </view>
                    <view class="detail" v-if="item.组织">
                        <text>组织：</text>{{item.组织}}
                        <text>{{ $t("Kf_ProductInBillList_PDA.table_Org") == "Kf_ProductInBillList_PDA.table_Org" ? "组织" : $t("Kf_ProductInBillList_PDA.table_Org") }}：</text>{{item.组织}}
                    </view>
                </view>
        
                <view class="more">
                    <view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
                        <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>显示二维码
                        <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>{{ $t("Kf_ProductInBillList_PDA.btn_DisplayCode") == "Kf_ProductInBillList_PDA.btn_DisplayCode" ? "显示二维码" : $t("Kf_ProductInBillList_PDA.btn_DisplayCode") }}
                    </view>
                    <view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
                        <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>撤销
                        <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>{{ $t("Kf_ProductInBillList_PDA.btn_Revoke") == "Kf_ProductInBillList_PDA.btn_Revoke" ? "撤销" : $t("Kf_ProductInBillList_PDA.btn_Revoke") }}
                    </view>
                </view>
            </uni-card>
        </view>
        
        <view class="over" v-if="!listData || listData.length == 0">暂无数据</view>
        <view class="over" v-if="listData.length != 0 && listData.length != showList.length">加载中...</view>
        <view class="over" v-if="listData.length != 0 && listData.length == showList.length">已到底</view>
        <view class="over" v-if="!listData || listData.length == 0">{{ $t("Kf_ProductInBillList_PDA.noDate") == "Kf_ProductInBillList_PDA.noDate" ? "暂无数据" : $t("Kf_ProductInBillList_PDA.noDate") }}</view>
        <view class="over" v-if="listData.length != 0 && listData.length != showList.length">{{ $t("Kf_ProductInBillList_PDA.Loading") == "Kf_ProductInBillList_PDA.Loading" ? "加载中..." : $t("Kf_ProductInBillList_PDA.Loading") }}</view>
        <view class="over" v-if="listData.length != 0 && listData.length == showList.length">{{ $t("Kf_ProductInBillList_PDA.bottom") == "Kf_ProductInBillList_PDA.bottom" ? "已到底" : $t("Kf_ProductInBillList_PDA.bottom") }}</view>
        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
    </view>
</template>