From c831bee07cbe5aad81b01f7fc7bbd5f9c9c6770a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 18 三月 2026 17:04:21 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast.vue | 3
pages/caigoutuiliao/POStockInBackBillList.vue | 2
pages/shengchantuiliao/MateOutBackBill.vue | 14
pages/weiwailingliao/Kf_EntrustOutBillList.vue | 102 +++++++-----
pages/caigoutuiliao/POStockInBackBill.vue | 6
pages/shengchanbuliao/MateReplenishOutBillList.vue | 99 +++++++-----
pages/shengchanlingliaoshengdan/Kf_MateOutBillList.vue | 106 +++++++-----
pages/weiwairuku/EntrustInBillList.vue | 100 +++++++-----
pages/xiaoshouchuku/SellOutBill.vue | 2
9 files changed, 255 insertions(+), 179 deletions(-)
diff --git a/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast.vue b/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast.vue
index 6a7b06f..d30c1df 100644
--- a/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast.vue
+++ b/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast.vue
@@ -291,7 +291,8 @@
data: {
"sInterID": this.hform.HInterID,
"sBillNo": this.hform.HBillNo,
- "HBillType": this.hform.HBillType
+ "HBillType": this.hform.HBillType,
+ "HStockOrgID": uni.getStorageSync("OrganizationID")
},
resFunction: (res) => {
let {
diff --git a/pages/caigoutuiliao/POStockInBackBill.vue b/pages/caigoutuiliao/POStockInBackBill.vue
index 40f59b6..efaa677 100644
--- a/pages/caigoutuiliao/POStockInBackBill.vue
+++ b/pages/caigoutuiliao/POStockInBackBill.vue
@@ -27,7 +27,7 @@
<view class="form-item">
<view class="title">{{ $t("POStockInBackBill_PDA.StockPlace") == "POStockInBackBill_PDA.StockPlace" ? "浠撲綅" : $t("POStockInBackBill_PDA.StockPlace") }}:</view>
<view class="right" v-show="showHStockPlaceName">
- <uni-combox :candidates="HStockPlaceNameListComputed" :placeholder="placeholder_SCStockPlace"
+ <uni-combox :candidates="HStockPlaceNameListComputed" :placeholder="placeholder_StockPlace"
v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
@confirm="HStockPlaceNameScan"></uni-combox>
</view>
@@ -388,6 +388,8 @@
placeholder_Customer:this.$t("POStockInBackBill_PDA.placeholder_Customer") == "POStockInBackBill_PDA.placeholder_Customer" ? "璇烽�夋嫨瀹㈡埛" : this.$t("POStockInBackBill_PDA.placeholder_Customer"),
placeholder_Warehouse:this.$t("POStockInBackBill_PDA.placeholder_Warehouse") == "POStockInBackBill_PDA.placeholder_Warehouse" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" : this.$t("POStockInBackBill_PDA.placeholder_Warehouse"),
placeholder_StockPlace:this.$t("POStockInBackBill_PDA.placeholder_StockPlace") == "POStockInBackBill_PDA.placeholder_StockPlace" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" : this.$t("POStockInBackBill_PDA.placeholder_StockPlace"),
+ placeholder_Warehouse:this.$t("MateOutBackBill_PDA.placeholder_Warehouse") == "MateOutBackBill_PDA.placeholder_Warehouse" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" : this.$t("MateOutBackBill_PDA.placeholder_Warehouse"),
+ placeholder_StockPlace:this.$t("MateOutBackBill_PDA.placeholder_StockPlace") == "MateOutBackBill_PDA.placeholder_StockPlace" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" : this.$t("MateOutBackBill_PDA.placeholder_StockPlace"),
unOperate:this.$t("POStockInBackBill_PDA.unOperate") == "POStockInBackBill_PDA.unOperate" ? "涓嶅彲鎿嶄綔" : this.$t("POStockInBackBill_PDA.unOperate")
}
},
@@ -417,7 +419,7 @@
},
async onLoad(e) {
uni.setNavigationBarTitle({
- title: this.$t("POStockInBackBill_PDA.title") == 'POStockInBackBill_PDA.title' ? '鐢熶骇鍏ュ簱鍗�' : this.$t("POStockInBackBill_PDA.title")
+ title: this.$t("POStockInBackBill_PDA.title") == 'POStockInBackBill_PDA.title' ? '閲囪喘閫�鏂欏崟' : this.$t("POStockInBackBill_PDA.title")
})
console.log(e, this.userInfo)
this.OperationType = e.OperationType
diff --git a/pages/caigoutuiliao/POStockInBackBillList.vue b/pages/caigoutuiliao/POStockInBackBillList.vue
index 8e1cac9..e96c451 100644
--- a/pages/caigoutuiliao/POStockInBackBillList.vue
+++ b/pages/caigoutuiliao/POStockInBackBillList.vue
@@ -155,7 +155,7 @@
components: { BarCodePopupVue },
onLoad() {
uni.setNavigationBarTitle({
- title: this.$t("POStockInBackBillList_PDA.title") == 'POStockInBackBillList_PDA.title' ? '鐢熶骇鍏ュ簱鍗�' : this.$t("POStockInBackBillList_PDA.title")
+ title: this.$t("POStockInBackBillList_PDA.title") == 'POStockInBackBillList_PDA.title' ? '閲囪喘閫�鏂欏崟缂撳瓨鍒楄〃' : this.$t("POStockInBackBillList_PDA.title")
})
//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
this.CheckModRight()
diff --git a/pages/shengchanbuliao/MateReplenishOutBillList.vue b/pages/shengchanbuliao/MateReplenishOutBillList.vue
index fa6f106..ac91ec2 100644
--- a/pages/shengchanbuliao/MateReplenishOutBillList.vue
+++ b/pages/shengchanbuliao/MateReplenishOutBillList.vue
@@ -1,33 +1,42 @@
<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("MateReplenishOutBillList.cacheList") == "MateReplenishOutBillList.cacheList" ? "缂撳瓨鍒楄〃" : $t("MateReplenishOutBillList.cacheList") }}
+ </view>
+ <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">
+ {{ $t("MateReplenishOutBillList.uploadedList") == "MateReplenishOutBillList.uploadedList" ? "宸蹭笂浼犲垪琛�" : $t("MateReplenishOutBillList.uploadedList") }}
+ </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("MateReplenishOutBillList.btnAdd") == "MateReplenishOutBillList.btnAdd" ? "鏂板" : $t("MateReplenishOutBillList.btnAdd") }}
</view>
</view>
<view class="form" v-if="tabs == 1">
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("MateReplenishOutBillList.billNo") == "MateReplenishOutBillList.billNo" ? "鍗曟嵁鍙�:" : $t("MateReplenishOutBillList.billNo") }}:</view>
<view class="right">
- <input type="text" v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ <input type="text" v-model="hform.HBillNo" :placeholder="$t('MateReplenishOutBillList.billNoPlaceholder') == 'MateReplenishOutBillList.billNoPlaceholder' ? '璇疯緭鍏ュ崟鎹彿' : $t('MateReplenishOutBillList.billNoPlaceholder')" />
</view>
</view>
<view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="title">{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿:" : $t("Gy.HMainSourceBillNo") }}:</view>
<view class="right">
- <input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ <input v-model="hform.HSourceBillNo" :placeholder="$t('MateReplenishOutBillList.sourceBillNoPlaceholder') == 'MateReplenishOutBillList.sourceBillNoPlaceholder' ? '璇疯緭鍏ユ簮鍗曞崟鍙�' : $t('MateReplenishOutBillList.sourceBillNoPlaceholder')" />
</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("MateReplenishOutBillList.btn_Reset") == "MateReplenishOutBillList.btn_Reset" ? "閲嶇疆" : $t("MateReplenishOutBillList.btn_Reset") }}
+ </button>
+ <button class="btn-c" size="mini" type="default" @tap="search">
+ {{ $t("MateReplenishOutBillList.btn_Query") == "MateReplenishOutBillList.btn_Query" ? "鏌ヨ" : $t("MateReplenishOutBillList.btn_Query") }}
+ </button>
</view>
</view>
@@ -38,28 +47,30 @@
@tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
<view class="detail" v-if="item.鍒跺崟浜�">
- <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ <text>{{ $t("Gy.HMaker") == "Gy.HMaker" ? "鍒跺崟浜猴細" : $t("Gy.HMaker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鍗曟嵁鍐呯爜">
- <text>鍗曟嵁鍐呯爜锛�</text>{{item.鍗曟嵁鍐呯爜}}
+ <text>{{ $t("MateReplenishOutBillList.table_BillID") == "MateReplenishOutBillList.table_BillID" ? "鍗曟嵁鍐呯爜锛�" : $t("MateReplenishOutBillList.table_BillID") }}锛�</text>{{item.鍗曟嵁鍐呯爜}}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("Gy.HQty") == "Gy.HQty" ? "鏁伴噺锛�" : $t("Gy.HQty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("Gy.HMainSourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("MateReplenishOutBillList.table_Org") == "MateReplenishOutBillList.table_Org" ? "缁勭粐锛�" : $t("MateReplenishOutBillList.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("MateReplenishOutBillList.btn_Edit") == "MateReplenishOutBillList.btn_Edit" ? "缂栬緫" : $t("MateReplenishOutBillList.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("MateReplenishOutBillList.btn_Del") == "MateReplenishOutBillList.btn_Del" ? "鍒犻櫎" : $t("MateReplenishOutBillList.btn_Del") }}
</view>
</view>
</uni-card>
@@ -69,45 +80,53 @@
@tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
<view class="detail" v-if="item.鐘舵��">
- <text>鐘舵�侊細</text>{{item.鐘舵�亇}
+ <text>{{ $t("MateReplenishOutBillList.table_Status") == "MateReplenishOutBillList.table_Status" ? "鐘舵�侊細" : $t("MateReplenishOutBillList.table_Status") }}锛�</text>{{item.鐘舵�亇}
</view>
<view class="detail" v-if="item.鍒跺崟浜�">
- <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ <text>{{ $t("Gy.HMaker") == "Gy.HMaker" ? "鍒跺崟浜猴細" : $t("Gy.HMaker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("Gy.HQty") == "Gy.HQty" ? "鏁伴噺锛�" : $t("Gy.HQty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("Gy.HMainSourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.鐗╂枡浠ｇ爜">
- <text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
+ <text>{{ $t("Gy.HNumber") == "Gy.HNumber" ? "鐗╂枡浠ｇ爜锛�" : $t("Gy.HNumber") }}锛�</text>{{item.鐗╂枡浠ｇ爜}}
</view>
<view class="detail" v-if="item.鐗╂枡鍚嶇О">
- <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+ <text>{{ $t("Gy.HName") == "Gy.HName" ? "鐗╂枡鍚嶇О锛�" : $t("Gy.HName") }}锛�</text>{{item.鐗╂枡鍚嶇О}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ <text>{{ $t("Gy.HModel") == "Gy.HModel" ? "瑙勬牸鍨嬪彿锛�" : $t("Gy.HModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("MateReplenishOutBillList.table_Org") == "MateReplenishOutBillList.table_Org" ? "缁勭粐锛�" : $t("MateReplenishOutBillList.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("MateReplenishOutBillList.btn_DisplayCode") == "MateReplenishOutBillList.btn_DisplayCode" ? "鏄剧ず浜岀淮鐮�" : $t("MateReplenishOutBillList.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("MateReplenishOutBillList.btn_Revoke") == "MateReplenishOutBillList.btn_Revoke" ? "鎾ら攢" : $t("MateReplenishOutBillList.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("MateReplenishOutBillList.noData") == "MateReplenishOutBillList.noData" ? "鏆傛棤鏁版嵁" : $t("MateReplenishOutBillList.noData") }}
+ </view>
+ <view class="over" v-if="listData.length != 0 && listData.length != showList.length">
+ {{ $t("MateReplenishOutBillList.Loading") == "MateReplenishOutBillList.Loading" ? "鍔犺浇涓�..." : $t("MateReplenishOutBillList.Loading") }}
+ </view>
+ <view class="over" v-if="listData.length != 0 && listData.length == showList.length">
+ {{ $t("MateReplenishOutBillList.bottom") == "MateReplenishOutBillList.bottom" ? "宸插埌搴�" : $t("MateReplenishOutBillList.bottom") }}
+ </view>
<BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
</view>
</template>
@@ -124,7 +143,7 @@
serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
tabs: 0,
urls: '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
- MvarReportTitle: '鐢熶骇棰嗘枡鍗曠紦瀛樺垪琛�',
+ MvarReportTitle: this.$t('MateReplenishOutBillList.reportTitle') == 'MateReplenishOutBillList.reportTitle' ? '鐢熶骇棰嗘枡鍗曠紦瀛樺垪琛�' : this.$t('MateReplenishOutBillList.reportTitle'),
hform: {
HBillNo: '',
HSourceBillNo: '',
@@ -185,7 +204,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('MateReplenishOutBillList.requestFailed') == 'MateReplenishOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('MateReplenishOutBillList.requestFailed'),
icon: 'none'
})
},
@@ -212,7 +231,7 @@
},
getList() {
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title: this.$t('MateReplenishOutBillList.loadingTitle') == 'MateReplenishOutBillList.loadingTitle' ? '鍔犺浇涓�...' : this.$t('MateReplenishOutBillList.loadingTitle')
})
uni.request({
url: this.serverUrl + this.urls,
@@ -238,7 +257,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('MateReplenishOutBillList.requestFailed') == 'MateReplenishOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('MateReplenishOutBillList.requestFailed'),
icon: 'none'
})
},
@@ -307,7 +326,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('MateReplenishOutBillList.requestFailed') == 'MateReplenishOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('MateReplenishOutBillList.requestFailed'),
icon: 'none'
})
},
@@ -317,8 +336,8 @@
del(item) {
// console.log(item.hmainid,uni.getStorageSync('HUserName'))
uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+ title: this.$t('MateReplenishOutBillList.confirmTitle') == 'MateReplenishOutBillList.confirmTitle' ? '鎻愮ず' : this.$t('MateReplenishOutBillList.confirmTitle'),
+ content: this.$t('MateReplenishOutBillList.delConfirm') == 'MateReplenishOutBillList.delConfirm' ? '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�' : this.$t('MateReplenishOutBillList.delConfirm'),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -346,7 +365,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('MateReplenishOutBillList.requestFailed') == 'MateReplenishOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('MateReplenishOutBillList.requestFailed'),
icon: 'none'
})
},
@@ -361,8 +380,8 @@
revoke(item) {
// console.log(item.hmainid,uni.getStorageSync('HUserName'))
uni.showModal({
- title: '鎻愮ず',
- content: '鏄惁纭鎾ら攢',
+ title: this.$t('MateReplenishOutBillList.confirmTitle') == 'MateReplenishOutBillList.confirmTitle' ? '鎻愮ず' : this.$t('MateReplenishOutBillList.confirmTitle'),
+ content: this.$t('MateReplenishOutBillList.revokeConfirm') == 'MateReplenishOutBillList.revokeConfirm' ? '鏄惁纭鎾ら攢' : this.$t('MateReplenishOutBillList.revokeConfirm'),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -390,7 +409,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('MateReplenishOutBillList.requestFailed') == 'MateReplenishOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('MateReplenishOutBillList.requestFailed'),
icon: 'none'
})
},
diff --git a/pages/shengchanlingliaoshengdan/Kf_MateOutBillList.vue b/pages/shengchanlingliaoshengdan/Kf_MateOutBillList.vue
index 6064a12..d4488f2 100644
--- a/pages/shengchanlingliaoshengdan/Kf_MateOutBillList.vue
+++ b/pages/shengchanlingliaoshengdan/Kf_MateOutBillList.vue
@@ -1,33 +1,42 @@
<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_MateOutBillList.cacheList") == "Kf_MateOutBillList.cacheList" ? "缂撳瓨鍒楄〃" : $t("Kf_MateOutBillList.cacheList") }}
+ </view>
+ <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">
+ {{ $t("Kf_MateOutBillList.uploadedList") == "Kf_MateOutBillList.uploadedList" ? "宸蹭笂浼犲垪琛�" : $t("Kf_MateOutBillList.uploadedList") }}
+ </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_MateOutBillList.btnAdd") == "Kf_MateOutBillList.btnAdd" ? "鏂板" : $t("Kf_MateOutBillList.btnAdd") }}
</view>
</view>
<view class="form" v-if="tabs == 1">
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("Kf_MateOutBillList.billNo") == "Kf_MateOutBillList.billNo" ? "鍗曟嵁鍙�:" : $t("Kf_MateOutBillList.billNo") }}:</view>
<view class="right">
- <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ <input v-model="hform.HBillNo" :placeholder="$t('Kf_MateOutBillList.billNoPlaceholder') == 'Kf_MateOutBillList.billNoPlaceholder' ? '璇疯緭鍏ュ崟鎹彿' : $t('Kf_MateOutBillList.billNoPlaceholder')" />
</view>
</view>
<view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="title">{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿:" : $t("Gy.HMainSourceBillNo") }}:</view>
<view class="right">
- <input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ <input v-model="hform.HSourceBillNo" :placeholder="$t('Kf_MateOutBillList.sourceBillNoPlaceholder') == 'Kf_MateOutBillList.sourceBillNoPlaceholder' ? '璇疯緭鍏ユ簮鍗曞崟鍙�' : $t('Kf_MateOutBillList.sourceBillNoPlaceholder')" />
</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_MateOutBillList.btn_Reset") == "Kf_MateOutBillList.btn_Reset" ? "閲嶇疆" : $t("Kf_MateOutBillList.btn_Reset") }}
+ </button>
+ <button class="btn-c" size="mini" type="default" @tap="search">
+ {{ $t("Kf_MateOutBillList.btn_Query") == "Kf_MateOutBillList.btn_Query" ? "鏌ヨ" : $t("Kf_MateOutBillList.btn_Query") }}
+ </button>
</view>
</view>
@@ -37,28 +46,30 @@
<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("Gy.HMaker") == "Gy.HMaker" ? "鍒跺崟浜猴細" : $t("Gy.HMaker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鍗曟嵁鍐呯爜">
- <text>鍗曟嵁鍐呯爜锛�</text>{{item.鍗曟嵁鍐呯爜}}
+ <text>{{ $t("Kf_MateOutBillList.table_BillID") == "Kf_MateOutBillList.table_BillID" ? "鍗曟嵁鍐呯爜锛�" : $t("Kf_MateOutBillList.table_BillID") }}锛�</text>{{item.鍗曟嵁鍐呯爜}}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("Gy.HQty") == "Gy.HQty" ? "鏁伴噺锛�" : $t("Gy.HQty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("Gy.HMainSourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("Kf_MateOutBillList.table_Org") == "Kf_MateOutBillList.table_Org" ? "缁勭粐锛�" : $t("Kf_MateOutBillList.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_MateOutBillList.btn_Edit") == "Kf_MateOutBillList.btn_Edit" ? "缂栬緫" : $t("Kf_MateOutBillList.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_MateOutBillList.btn_Del") == "Kf_MateOutBillList.btn_Del" ? "鍒犻櫎" : $t("Kf_MateOutBillList.btn_Del") }}
</view>
</view>
</uni-card>
@@ -67,51 +78,59 @@
<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_MateOutBillList.table_Status") == "Kf_MateOutBillList.table_Status" ? "鐘舵�侊細" : $t("Kf_MateOutBillList.table_Status") }}锛�</text>{{item.鐘舵�亇}
</view>
<view class="detail" v-if="item.鍒跺崟浜�">
- <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ <text>{{ $t("Gy.HMaker") == "Gy.HMaker" ? "鍒跺崟浜猴細" : $t("Gy.HMaker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("Gy.HQty") == "Gy.HQty" ? "鏁伴噺锛�" : $t("Gy.HQty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("Gy.HMainSourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.鐗╂枡浠ｇ爜">
- <text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
+ <text>{{ $t("Gy.HNumber") == "Gy.HNumber" ? "鐗╂枡浠ｇ爜锛�" : $t("Gy.HNumber") }}锛�</text>{{item.鐗╂枡浠ｇ爜}}
</view>
<view class="detail" v-if="item.鐗╂枡鍚嶇О">
- <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+ <text>{{ $t("Gy.HName") == "Gy.HName" ? "鐗╂枡鍚嶇О锛�" : $t("Gy.HName") }}锛�</text>{{item.鐗╂枡鍚嶇О}}
</view>
<view class="detail" v-if="item.鐢熶骇璁㈠崟鍙�">
- <text>鐢熶骇璁㈠崟鍙凤細</text>{{item.鐢熶骇璁㈠崟鍙穧}
+ <text>{{ $t("Kf_MateOutBillList.table_ProductionOrderNo") == "Kf_MateOutBillList.table_ProductionOrderNo" ? "鐢熶骇璁㈠崟鍙凤細" : $t("Kf_MateOutBillList.table_ProductionOrderNo") }}锛�</text>{{item.鐢熶骇璁㈠崟鍙穧}
</view>
<view class="detail" v-if="item.娆惧彿">
- <text>娆惧彿锛�</text>{{item.娆惧彿}}
+ <text>{{ $t("Kf_MateOutBillList.table_StyleNo") == "Kf_MateOutBillList.table_StyleNo" ? "娆惧彿锛�" : $t("Kf_MateOutBillList.table_StyleNo") }}锛�</text>{{item.娆惧彿}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ <text>{{ $t("Gy.HModel") == "Gy.HModel" ? "瑙勬牸鍨嬪彿锛�" : $t("Gy.HModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("Kf_MateOutBillList.table_Org") == "Kf_MateOutBillList.table_Org" ? "缁勭粐锛�" : $t("Kf_MateOutBillList.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_MateOutBillList.btn_DisplayCode") == "Kf_MateOutBillList.btn_DisplayCode" ? "鏄剧ず浜岀淮鐮�" : $t("Kf_MateOutBillList.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_MateOutBillList.btn_Revoke") == "Kf_MateOutBillList.btn_Revoke" ? "鎾ら攢" : $t("Kf_MateOutBillList.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_MateOutBillList.noData") == "Kf_MateOutBillList.noData" ? "鏆傛棤鏁版嵁" : $t("Kf_MateOutBillList.noData") }}
+ </view>
+ <view class="over" v-if="listData.length != 0 && listData.length != showList.length">
+ {{ $t("Kf_MateOutBillList.Loading") == "Kf_MateOutBillList.Loading" ? "鍔犺浇涓�..." : $t("Kf_MateOutBillList.Loading") }}
+ </view>
+ <view class="over" v-if="listData.length != 0 && listData.length == showList.length">
+ {{ $t("Kf_MateOutBillList.bottom") == "Kf_MateOutBillList.bottom" ? "宸插埌搴�" : $t("Kf_MateOutBillList.bottom") }}
+ </view>
<BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
</view>
</template>
@@ -126,7 +145,7 @@
serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
tabs:0,
urls:'/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
- MvarReportTitle:'鐢熶骇棰嗘枡鍗曠紦瀛樺垪琛�',
+ MvarReportTitle: this.$t('Kf_MateOutBillList.reportTitle') == 'Kf_MateOutBillList.reportTitle' ? '鐢熶骇棰嗘枡鍗曠紦瀛樺垪琛�' : this.$t('Kf_MateOutBillList.reportTitle'),
hform:{
HBillNo:'',
HSourceBillNo:'',
@@ -185,7 +204,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('Kf_MateOutBillList.requestFailed') == 'Kf_MateOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('Kf_MateOutBillList.requestFailed'),
icon:'none'
})
},
@@ -212,7 +231,7 @@
},
getList(){
uni.showLoading({
- title:'鍔犺浇涓�...'
+ title: this.$t('Kf_MateOutBillList.loadingTitle') == 'Kf_MateOutBillList.loadingTitle' ? '鍔犺浇涓�...' : this.$t('Kf_MateOutBillList.loadingTitle')
})
uni.request({
url: this.serverUrl + this.urls,
@@ -238,7 +257,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('Kf_MateOutBillList.requestFailed') == 'Kf_MateOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('Kf_MateOutBillList.requestFailed'),
icon:'none'
})
},
@@ -303,7 +322,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('Kf_MateOutBillList.requestFailed') == 'Kf_MateOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('Kf_MateOutBillList.requestFailed'),
icon:'none'
})
},
@@ -313,8 +332,8 @@
del(item){
// console.log(item.hmainid,uni.getStorageSync('HUserName'))
uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+ title: this.$t('Kf_MateOutBillList.confirmTitle') == 'Kf_MateOutBillList.confirmTitle' ? '鎻愮ず' : this.$t('Kf_MateOutBillList.confirmTitle'),
+ content: this.$t('Kf_MateOutBillList.delConfirm') == 'Kf_MateOutBillList.delConfirm' ? '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�' : this.$t('Kf_MateOutBillList.delConfirm'),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -341,7 +360,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('Kf_MateOutBillList.requestFailed') == 'Kf_MateOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('Kf_MateOutBillList.requestFailed'),
icon:'none'
})
},
@@ -356,8 +375,8 @@
revoke(item){
// console.log(item.hmainid,uni.getStorageSync('HUserName'))
uni.showModal({
- title: '鎻愮ず',
- content: '鏄惁纭鎾ら攢',
+ title: this.$t('Kf_MateOutBillList.confirmTitle') == 'Kf_MateOutBillList.confirmTitle' ? '鎻愮ず' : this.$t('Kf_MateOutBillList.confirmTitle'),
+ content: this.$t('Kf_MateOutBillList.revokeConfirm') == 'Kf_MateOutBillList.revokeConfirm' ? '鏄惁纭鎾ら攢' : this.$t('Kf_MateOutBillList.revokeConfirm'),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -384,7 +403,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('Kf_MateOutBillList.requestFailed') == 'Kf_MateOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('Kf_MateOutBillList.requestFailed'),
icon:'none'
})
},
@@ -511,5 +530,4 @@
}
}
}
-
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/shengchantuiliao/MateOutBackBill.vue b/pages/shengchantuiliao/MateOutBackBill.vue
index 03ef15a..f0bcb13 100644
--- a/pages/shengchantuiliao/MateOutBackBill.vue
+++ b/pages/shengchantuiliao/MateOutBackBill.vue
@@ -20,19 +20,19 @@
<view class="form-item">
<view class="title">{{ $t("MateOutBackBill_PDA.Warehouse") == "MateOutBackBill_PDA.Warehouse" ? "浠撳簱" : $t("MateOutBackBill_PDA.Warehouse") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHWHName" :placeholder="placeholder_SCWarehouse" v-model="hform.HWHName"
+ <uni-combox :candidates="arrayHWHName" :placeholder="placeholder_Warehouse" v-model="hform.HWHName"
@input="HWHNameChange" @confirm="HWHNameScan"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("MateOutBackBill_PDA.StockPlace") == "MateOutBackBill_PDA.StockPlace" ? "璋冧粨浣�" : $t("MateOutBackBill_PDA.StockPlace") }}:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.StockPlace") == "MateOutBackBill_PDA.StockPlace" ? "浠撲綅" : $t("MateOutBackBill_PDA.StockPlace") }}:</view>
<view class="right" v-show="showHStockPlaceName">
- <uni-combox :candidates="HStockPlaceNameListComputed" :placeholder="placeholder_SCStockPlace"
+ <uni-combox :candidates="HStockPlaceNameListComputed" :placeholder="placeholder_StockPlace"
v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
@confirm="HStockPlaceNameScan"></uni-combox>
</view>
<view class="righton" v-show="!showHStockPlaceName">
- <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" :placeholder="unOperate" />
+ <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" :placeholder="unOperate" />
</view>
</view>
@@ -401,14 +401,14 @@
placeholder_OutboundType:this.$t("MateOutBackBill_PDA.placeholder_OutboundType") == "MateOutBackBill_PDA.placeholder_OutboundType" ? "璇烽�夋嫨" : this.$t("MateOutBackBill_PDA.placeholder_OutboundType"),
placeholder_TransferDirection:this.$t("MateOutBackBill_PDA.placeholder_TransferDirection") == "MateOutBackBill_PDA.placeholder_TransferDirection" ? "璇烽�夋嫨璋冩嫧鏂瑰悜" : this.$t("MateOutBackBill_PDA.placeholder_TransferDirection"),
placeholder_TransferType:this.$t("MateOutBackBill_PDA.placeholder_TransferType") == "MateOutBackBill_PDA.placeholder_TransferType" ? "璇烽�夋嫨璋冩嫧绫诲瀷" : this.$t("MateOutBackBill_PDA.placeholder_TransferType"),
- placeholder_SCWarehouse:this.$t("MateOutBackBill_PDA.placeholder_SCWarehouse") == "MateOutBackBill_PDA.placeholder_SCWarehouse" ? "璇烽�夋嫨璋冨嚭浠撳簱" : this.$t("MateOutBackBill_PDA.placeholder_SCWarehouse"),
- placeholder_SCStockPlace:this.$t("MateOutBackBill_PDA.placeholder_SCStockPlace") == "MateOutBackBill_PDA.placeholder_SCStockPlace" ? "璇烽�夋嫨璋冨嚭浠撲綅" : this.$t("MateOutBackBill_PDA.placeholder_SCStockPlace"),
+ placeholder_Warehouse:this.$t("MateOutBackBill_PDA.placeholder_Warehouse") == "MateOutBackBill_PDA.placeholder_Warehouse" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" : this.$t("MateOutBackBill_PDA.placeholder_Warehouse"),
+ placeholder_StockPlace:this.$t("MateOutBackBill_PDA.placeholder_StockPlace") == "MateOutBackBill_PDA.placeholder_StockPlace" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" : this.$t("MateOutBackBill_PDA.placeholder_StockPlace"),
placeholder_SecManager:this.$t("MateOutBackBill_PDA.placeholder_SecManager") == "MateOutBackBill_PDA.placeholder_SecManager" ? "璇烽�夋嫨楠屾敹鍛�" : this.$t("MateOutBackBill_PDA.placeholder_SecManager"),
placeholder_Keeper:this.$t("MateOutBackBill_PDA.placeholder_Keeper") == "MateOutBackBill_PDA.placeholder_Keeper" ? "璇烽�夋嫨淇濈鍛�" : this.$t("MateOutBackBill_PDA.placeholder_Keeper"),
placeholder_Dept:this.$t("MateOutBackBill_PDA.placeholder_Dept") == "MateOutBackBill_PDA.placeholder_Dept" ? "璇烽�夋嫨閮ㄩ棬" : this.$t("MateOutBackBill_PDA.placeholder_Dept"),
placeholder_Supplier:this.$t("MateOutBackBill_PDA.placeholder_Supplier") == "MateOutBackBill_PDA.placeholder_Supplier" ? "璇烽�夋嫨渚涘簲鍟�" : this.$t("MateOutBackBill_PDA.placeholder_Supplier"),
placeholder_Customer:this.$t("MateOutBackBill_PDA.placeholder_Customer") == "MateOutBackBill_PDA.placeholder_Customer" ? "璇烽�夋嫨瀹㈡埛" : this.$t("MateOutBackBill_PDA.placeholder_Customer"),
- unOperate:this.$t("MateOutBackBill_PDA.unOperate") == "MateOutBackBill_PDA.unOperate" ? "鏆傛棤鏁版嵁" : this.$t("MateOutBackBill_PDA.unOperate")
+ unOperate:this.$t("MateOutBackBill_PDA.unOperate") == "MateOutBackBill_PDA.unOperate" ? "涓嶅彲鎿嶄綔" : this.$t("MateOutBackBill_PDA.unOperate")
}
},
diff --git a/pages/weiwailingliao/Kf_EntrustOutBillList.vue b/pages/weiwailingliao/Kf_EntrustOutBillList.vue
index 1808c61..5cb5aa7 100644
--- a/pages/weiwailingliao/Kf_EntrustOutBillList.vue
+++ b/pages/weiwailingliao/Kf_EntrustOutBillList.vue
@@ -1,33 +1,42 @@
<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_EntrustOutBillList.cacheList") == "Kf_EntrustOutBillList.cacheList" ? "缂撳瓨鍒楄〃" : $t("Kf_EntrustOutBillList.cacheList") }}
+ </view>
+ <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">
+ {{ $t("Kf_EntrustOutBillList.uploadedList") == "Kf_EntrustOutBillList.uploadedList" ? "宸蹭笂浼犲垪琛�" : $t("Kf_EntrustOutBillList.uploadedList") }}
+ </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_EntrustOutBillList.btnAdd") == "Kf_EntrustOutBillList.btnAdd" ? "鏂板" : $t("Kf_EntrustOutBillList.btnAdd") }}
</view>
</view>
<view class="form" v-if="tabs == 1">
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("Kf_EntrustOutBillList.billNo") == "Kf_EntrustOutBillList.billNo" ? "鍗曟嵁鍙�:" : $t("Kf_EntrustOutBillList.billNo") }}:</view>
<view class="right">
- <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ <input v-model="hform.HBillNo" :placeholder="$t('Kf_EntrustOutBillList.billNoPlaceholder') == 'Kf_EntrustOutBillList.billNoPlaceholder' ? '璇疯緭鍏ュ崟鎹彿' : $t('Kf_EntrustOutBillList.billNoPlaceholder')" />
</view>
</view>
<view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="title">{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿:" : $t("Gy.HMainSourceBillNo") }}:</view>
<view class="right">
- <input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ <input v-model="hform.HSourceBillNo" :placeholder="$t('Kf_EntrustOutBillList.sourceBillNoPlaceholder') == 'Kf_EntrustOutBillList.sourceBillNoPlaceholder' ? '璇疯緭鍏ユ簮鍗曞崟鍙�' : $t('Kf_EntrustOutBillList.sourceBillNoPlaceholder')" />
</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_EntrustOutBillList.btn_Reset") == "Kf_EntrustOutBillList.btn_Reset" ? "閲嶇疆" : $t("Kf_EntrustOutBillList.btn_Reset") }}
+ </button>
+ <button class="btn-c" size="mini" type="default" @tap="search">
+ {{ $t("Kf_EntrustOutBillList.btn_Query") == "Kf_EntrustOutBillList.btn_Query" ? "鏌ヨ" : $t("Kf_EntrustOutBillList.btn_Query") }}
+ </button>
</view>
</view>
@@ -37,28 +46,30 @@
<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("Gy.HMaker") == "Gy.HMaker" ? "鍒跺崟浜猴細" : $t("Gy.HMaker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鍗曟嵁鍐呯爜">
- <text>鍗曟嵁鍐呯爜锛�</text>{{item.鍗曟嵁鍐呯爜}}
+ <text>{{ $t("Kf_EntrustOutBillList.table_BillID") == "Kf_EntrustOutBillList.table_BillID" ? "鍗曟嵁鍐呯爜锛�" : $t("Kf_EntrustOutBillList.table_BillID") }}锛�</text>{{item.鍗曟嵁鍐呯爜}}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("Gy.HQty") == "Gy.HQty" ? "鏁伴噺锛�" : $t("Gy.HQty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("Gy.HMainSourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("Kf_EntrustOutBillList.table_Org") == "Kf_EntrustOutBillList.table_Org" ? "缁勭粐锛�" : $t("Kf_EntrustOutBillList.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_EntrustOutBillList.btn_Edit") == "Kf_EntrustOutBillList.btn_Edit" ? "缂栬緫" : $t("Kf_EntrustOutBillList.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_EntrustOutBillList.btn_Del") == "Kf_EntrustOutBillList.btn_Del" ? "鍒犻櫎" : $t("Kf_EntrustOutBillList.btn_Del") }}
</view>
</view>
</uni-card>
@@ -67,45 +78,53 @@
<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_EntrustOutBillList.table_Status") == "Kf_EntrustOutBillList.table_Status" ? "鐘舵�侊細" : $t("Kf_EntrustOutBillList.table_Status") }}锛�</text>{{item.鐘舵�亇}
</view>
<view class="detail" v-if="item.鍒跺崟浜�">
- <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ <text>{{ $t("Gy.HMaker") == "Gy.HMaker" ? "鍒跺崟浜猴細" : $t("Gy.HMaker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("Gy.HQty") == "Gy.HQty" ? "鏁伴噺锛�" : $t("Gy.HQty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("Gy.HMainSourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.鐗╂枡浠ｇ爜">
- <text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
+ <text>{{ $t("Gy.HNumber") == "Gy.HNumber" ? "鐗╂枡浠ｇ爜锛�" : $t("Gy.HNumber") }}锛�</text>{{item.鐗╂枡浠ｇ爜}}
</view>
<view class="detail" v-if="item.鐗╂枡鍚嶇О">
- <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+ <text>{{ $t("Gy.HName") == "Gy.HName" ? "鐗╂枡鍚嶇О锛�" : $t("Gy.HName") }}锛�</text>{{item.鐗╂枡鍚嶇О}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ <text>{{ $t("Gy.HModel") == "Gy.HModel" ? "瑙勬牸鍨嬪彿锛�" : $t("Gy.HModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("Kf_EntrustOutBillList.table_Org") == "Kf_EntrustOutBillList.table_Org" ? "缁勭粐锛�" : $t("Kf_EntrustOutBillList.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_EntrustOutBillList.btn_DisplayCode") == "Kf_EntrustOutBillList.btn_DisplayCode" ? "鏄剧ず浜岀淮鐮�" : $t("Kf_EntrustOutBillList.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_EntrustOutBillList.btn_Revoke") == "Kf_EntrustOutBillList.btn_Revoke" ? "鎾ら攢" : $t("Kf_EntrustOutBillList.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_EntrustOutBillList.noData") == "Kf_EntrustOutBillList.noData" ? "鏆傛棤鏁版嵁" : $t("Kf_EntrustOutBillList.noData") }}
+ </view>
+ <view class="over" v-if="listData.length != 0 && listData.length != showList.length">
+ {{ $t("Kf_EntrustOutBillList.Loading") == "Kf_EntrustOutBillList.Loading" ? "鍔犺浇涓�..." : $t("Kf_EntrustOutBillList.Loading") }}
+ </view>
+ <view class="over" v-if="listData.length != 0 && listData.length == showList.length">
+ {{ $t("Kf_EntrustOutBillList.bottom") == "Kf_EntrustOutBillList.bottom" ? "宸插埌搴�" : $t("Kf_EntrustOutBillList.bottom") }}
+ </view>
<BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
</view>
</template>
@@ -120,7 +139,7 @@
serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
tabs:0,
urls:'/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
- MvarReportTitle:'鐢熶骇棰嗘枡鍗曠紦瀛樺垪琛�',
+ MvarReportTitle: this.$t('Kf_EntrustOutBillList.reportTitle') == 'Kf_EntrustOutBillList.reportTitle' ? '鐢熶骇棰嗘枡鍗曠紦瀛樺垪琛�' : this.$t('Kf_EntrustOutBillList.reportTitle'),
hform:{
HBillNo:'',
HSourceBillNo:'',
@@ -181,7 +200,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('Kf_EntrustOutBillList.requestFailed') == 'Kf_EntrustOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('Kf_EntrustOutBillList.requestFailed'),
icon:'none'
})
},
@@ -208,7 +227,7 @@
},
getList(){
uni.showLoading({
- title:'鍔犺浇涓�...'
+ title: this.$t('Kf_EntrustOutBillList.loadingTitle') == 'Kf_EntrustOutBillList.loadingTitle' ? '鍔犺浇涓�...' : this.$t('Kf_EntrustOutBillList.loadingTitle')
})
uni.request({
url: this.serverUrl + this.urls,
@@ -234,7 +253,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('Kf_EntrustOutBillList.requestFailed') == 'Kf_EntrustOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('Kf_EntrustOutBillList.requestFailed'),
icon:'none'
})
},
@@ -299,7 +318,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('Kf_EntrustOutBillList.requestFailed') == 'Kf_EntrustOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('Kf_EntrustOutBillList.requestFailed'),
icon:'none'
})
},
@@ -309,8 +328,8 @@
del(item){
// console.log(item.hmainid,uni.getStorageSync('HUserName'))
uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+ title: this.$t('Kf_EntrustOutBillList.confirmTitle') == 'Kf_EntrustOutBillList.confirmTitle' ? '鎻愮ず' : this.$t('Kf_EntrustOutBillList.confirmTitle'),
+ content: this.$t('Kf_EntrustOutBillList.delConfirm') == 'Kf_EntrustOutBillList.delConfirm' ? '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�' : this.$t('Kf_EntrustOutBillList.delConfirm'),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -337,7 +356,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('Kf_EntrustOutBillList.requestFailed') == 'Kf_EntrustOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('Kf_EntrustOutBillList.requestFailed'),
icon:'none'
})
},
@@ -352,8 +371,8 @@
revoke(item){
// console.log(item.hmainid,uni.getStorageSync('HUserName'))
uni.showModal({
- title: '鎻愮ず',
- content: '鏄惁纭鎾ら攢',
+ title: this.$t('Kf_EntrustOutBillList.confirmTitle') == 'Kf_EntrustOutBillList.confirmTitle' ? '鎻愮ず' : this.$t('Kf_EntrustOutBillList.confirmTitle'),
+ content: this.$t('Kf_EntrustOutBillList.revokeConfirm') == 'Kf_EntrustOutBillList.revokeConfirm' ? '鏄惁纭鎾ら攢' : this.$t('Kf_EntrustOutBillList.revokeConfirm'),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -380,7 +399,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('Kf_EntrustOutBillList.requestFailed') == 'Kf_EntrustOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('Kf_EntrustOutBillList.requestFailed'),
icon:'none'
})
},
@@ -507,5 +526,4 @@
}
}
}
-
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/weiwairuku/EntrustInBillList.vue b/pages/weiwairuku/EntrustInBillList.vue
index b9f634a..214e97f 100644
--- a/pages/weiwairuku/EntrustInBillList.vue
+++ b/pages/weiwairuku/EntrustInBillList.vue
@@ -1,33 +1,42 @@
<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("EntrustInBillList.cacheList") == "EntrustInBillList.cacheList" ? "缂撳瓨鍒楄〃" : $t("EntrustInBillList.cacheList") }}
+ </view>
+ <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">
+ {{ $t("EntrustInBillList.uploadedList") == "EntrustInBillList.uploadedList" ? "宸蹭笂浼犲垪琛�" : $t("EntrustInBillList.uploadedList") }}
+ </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("EntrustInBillList.btnAdd") == "EntrustInBillList.btnAdd" ? "鏂板" : $t("EntrustInBillList.btnAdd") }}
</view>
</view>
<view class="form" v-if="tabs == 1">
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("EntrustInBillList.billNo") == "EntrustInBillList.billNo" ? "鍗曟嵁鍙�:" : $t("EntrustInBillList.billNo") }}</view>
<view class="right">
- <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ <input v-model="hform.HBillNo" :placeholder="$t('EntrustInBillList.billNoPlaceholder') == 'EntrustInBillList.billNoPlaceholder' ? '璇疯緭鍏ュ崟鎹彿' : $t('EntrustInBillList.billNoPlaceholder')" />
</view>
</view>
<view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="title">{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿:" : $t("Gy.HMainSourceBillNo") }}</view>
<view class="right">
- <input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ <input v-model="hform.HSourceBillNo" :placeholder="$t('EntrustInBillList.sourceBillNoPlaceholder') == 'EntrustInBillList.sourceBillNoPlaceholder' ? '璇疯緭鍏ユ簮鍗曞崟鍙�' : $t('EntrustInBillList.sourceBillNoPlaceholder')" />
</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("EntrustInBillList.btn_Reset") == "EntrustInBillList.btn_Reset" ? "閲嶇疆" : $t("EntrustInBillList.btn_Reset") }}
+ </button>
+ <button class="btn-c" size="mini" type="default" @tap="search">
+ {{ $t("EntrustInBillList.btn_Query") == "EntrustInBillList.btn_Query" ? "鏌ヨ" : $t("EntrustInBillList.btn_Query") }}
+ </button>
</view>
</view>
@@ -37,28 +46,30 @@
<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("Gy.HMaker") == "Gy.HMaker" ? "鍒跺崟浜猴細" : $t("Gy.HMaker") }}</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鍗曟嵁鍐呯爜">
- <text>鍗曟嵁鍐呯爜锛�</text>{{item.鍗曟嵁鍐呯爜}}
+ <text>{{ $t("EntrustInBillList.table_BillID") == "EntrustInBillList.table_BillID" ? "鍗曟嵁鍐呯爜锛�" : $t("EntrustInBillList.table_BillID") }}</text>{{item.鍗曟嵁鍐呯爜}}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("Gy.HQty") == "Gy.HQty" ? "鏁伴噺锛�" : $t("Gy.HQty") }}</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("Gy.HMainSourceBillNo") }}</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("EntrustInBillList.table_Org") == "EntrustInBillList.table_Org" ? "缁勭粐锛�" : $t("EntrustInBillList.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("EntrustInBillList.btn_Edit") == "EntrustInBillList.btn_Edit" ? "缂栬緫" : $t("EntrustInBillList.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("EntrustInBillList.btn_Del") == "EntrustInBillList.btn_Del" ? "鍒犻櫎" : $t("EntrustInBillList.btn_Del") }}
</view>
</view>
</uni-card>
@@ -67,42 +78,50 @@
<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("Gy.HMaker") == "Gy.HMaker" ? "鍒跺崟浜猴細" : $t("Gy.HMaker") }}</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("Gy.HQty") == "Gy.HQty" ? "鏁伴噺锛�" : $t("Gy.HQty") }}</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("Gy.HMainSourceBillNo") }}</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.鐗╂枡浠ｇ爜">
- <text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
+ <text>{{ $t("Gy.HNumber") == "Gy.HNumber" ? "鐗╂枡浠ｇ爜锛�" : $t("Gy.HNumber") }}</text>{{item.鐗╂枡浠ｇ爜}}
</view>
<view class="detail" v-if="item.鐗╂枡鍚嶇О">
- <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+ <text>{{ $t("Gy.HName") == "Gy.HName" ? "鐗╂枡鍚嶇О锛�" : $t("Gy.HName") }}</text>{{item.鐗╂枡鍚嶇О}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ <text>{{ $t("Gy.HModel") == "Gy.HModel" ? "瑙勬牸鍨嬪彿锛�" : $t("Gy.HModel") }}</text>{{item.瑙勬牸鍨嬪彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("EntrustInBillList.table_Org") == "EntrustInBillList.table_Org" ? "缁勭粐锛�" : $t("EntrustInBillList.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("EntrustInBillList.btn_DisplayCode") == "EntrustInBillList.btn_DisplayCode" ? "鏄剧ず浜岀淮鐮�" : $t("EntrustInBillList.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("EntrustInBillList.btn_Revoke") == "EntrustInBillList.btn_Revoke" ? "鎾ら攢" : $t("EntrustInBillList.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("EntrustInBillList.noData") == "EntrustInBillList.noData" ? "鏆傛棤鏁版嵁" : $t("EntrustInBillList.noData") }}
+ </view>
+ <view class="over" v-if="listData.length != 0 && listData.length != showList.length">
+ {{ $t("EntrustInBillList.Loading") == "EntrustInBillList.Loading" ? "鍔犺浇涓�..." : $t("EntrustInBillList.Loading") }}
+ </view>
+ <view class="over" v-if="listData.length != 0 && listData.length == showList.length">
+ {{ $t("EntrustInBillList.bottom") == "EntrustInBillList.bottom" ? "宸插埌搴�" : $t("EntrustInBillList.bottom") }}
+ </view>
<BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
</view>
</template>
@@ -117,7 +136,7 @@
serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
tabs:0,
urls:'/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
- MvarReportTitle:'鐢熶骇棰嗘枡鍗曠紦瀛樺垪琛�',
+ MvarReportTitle: this.$t('EntrustInBillList.reportTitle') == 'EntrustInBillList.reportTitle' ? '鐢熶骇棰嗘枡鍗曠紦瀛樺垪琛�' : this.$t('EntrustInBillList.reportTitle'),
hform:{
HBillNo:'',
HSourceBillNo:'',
@@ -178,7 +197,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('EntrustInBillList.requestFailed') == 'EntrustInBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('EntrustInBillList.requestFailed'),
icon:'none'
})
},
@@ -205,7 +224,7 @@
},
getList(){
uni.showLoading({
- title:'鍔犺浇涓�...'
+ title: this.$t('EntrustInBillList.loadingTitle') == 'EntrustInBillList.loadingTitle' ? '鍔犺浇涓�...' : this.$t('EntrustInBillList.loadingTitle')
})
uni.request({
url: this.serverUrl + this.urls,
@@ -231,7 +250,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('EntrustInBillList.requestFailed') == 'EntrustInBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('EntrustInBillList.requestFailed'),
icon:'none'
})
},
@@ -296,7 +315,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('EntrustInBillList.requestFailed') == 'EntrustInBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('EntrustInBillList.requestFailed'),
icon:'none'
})
},
@@ -306,8 +325,8 @@
del(item){
// console.log(item.hmainid,uni.getStorageSync('HUserName'))
uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+ title: this.$t('EntrustInBillList.confirmTitle') == 'EntrustInBillList.confirmTitle' ? '鎻愮ず' : this.$t('EntrustInBillList.confirmTitle'),
+ content: this.$t('EntrustInBillList.delConfirm') == 'EntrustInBillList.delConfirm' ? '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�' : this.$t('EntrustInBillList.delConfirm'),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -334,7 +353,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('EntrustInBillList.requestFailed') == 'EntrustInBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('EntrustInBillList.requestFailed'),
icon:'none'
})
},
@@ -349,8 +368,8 @@
revoke(item){
// console.log(item.hmainid,uni.getStorageSync('HUserName'))
uni.showModal({
- title: '鎻愮ず',
- content: '鏄惁纭鎾ら攢',
+ title: this.$t('EntrustInBillList.confirmTitle') == 'EntrustInBillList.confirmTitle' ? '鎻愮ず' : this.$t('EntrustInBillList.confirmTitle'),
+ content: this.$t('EntrustInBillList.revokeConfirm') == 'EntrustInBillList.revokeConfirm' ? '鏄惁纭鎾ら攢' : this.$t('EntrustInBillList.revokeConfirm'),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -377,7 +396,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('EntrustInBillList.requestFailed') == 'EntrustInBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('EntrustInBillList.requestFailed'),
icon:'none'
})
},
@@ -504,5 +523,4 @@
}
}
}
-
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/xiaoshouchuku/SellOutBill.vue b/pages/xiaoshouchuku/SellOutBill.vue
index d6c1336..dba310b 100644
--- a/pages/xiaoshouchuku/SellOutBill.vue
+++ b/pages/xiaoshouchuku/SellOutBill.vue
@@ -28,7 +28,7 @@
<view class="title">{{ $t("SellOutBill_PDA.StockPlace") == "SellOutBill_PDA.StockPlace" ? "浠撲綅" : $t("SellOutBill_PDA.StockPlace") }}:</view>
<!-- 鍥涚淮灏斿惎鐢ㄤ粨浣嶆壂鐮� 鍏朵粬瀹㈡埛鎸夐渶鍚敤鎺у埗 -->
<view class="right" >
- <uni-combox :candidates="HStockPlaceNameListComputed" :placeholder="placeholder_SCStockPlace"
+ <uni-combox :candidates="HStockPlaceNameListComputed" :placeholder="placeholder_StockPlace"
v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
@confirm="HStockPlaceNameScan"></uni-combox>
</view>
--
Gitblit v1.9.1