From 9fa1787101c70f413e137849d448d68bdda265e5 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 16 三月 2026 09:40:54 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/shengchantuiliao/MateOutBackBill.vue | 72 ++++--
pages/zhijiediaobo/MoveStockBillList.vue | 4
pages/xiaoshouchuku/SellOutBill.vue | 93 ++++----
pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue | 37 +++
pages/shengchanruku/ProductInCheckBillList.vue | 44 ++--
pages/caigoutuiliao/POStockInBackBillList.vue | 2
pages/shengchantuiliao/MateOutBackBillList.vue | 4
pages/shengchanruku/ProductInCheckBill.vue | 159 +++++++++++----
pages/caigoutuiliao/POStockInBackBill.vue | 92 ++++----
pages/xiaoshouchuku/SellOutBillList.vue | 2
pages/zhijiediaobo/MoveStockBill.vue | 15 +
pages/index/login.vue | 8
pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue | 47 ++++
13 files changed, 373 insertions(+), 206 deletions(-)
diff --git a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
index 2dadc29..02f0833 100644
--- a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
+++ b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
@@ -36,6 +36,9 @@
</view>
<!-- 椤电 鐗╂枡娓呭崟 -->
<view v-if="tabs == 1">
+ <view style="padding: 10rpx;">
+ <button class="btn-a" size="mini" @tap="switchModule">鎵归噺鍚堟牸</button>
+ </view>
<view class="card-item-wrapper">
<view v-for="(item, index) in materialManifest" :key="index">
<uni-card :title="item.HSourceBillNo" @tap="toDetail(item, index)">
@@ -393,6 +396,13 @@
};
},
methods: {
+ switchModule() {
+ uni.redirectTo({
+ url: "/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2?" +
+ `HInterID=${this.sourceBillInfo.HInterID}&HBillNo=${this.sourceBillInfo.HBillNo}` +
+ `&HSourceBillNo=${this.sourceBillInfo.HSourceBillNo}&operationType=5`
+ })
+ },
handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
console.log('file: ', res);
let fileInfo = res.data[0]
@@ -740,9 +750,26 @@
}
}
},
- onLoad() {
- // 鑾峰彇鏉ユ枡妫�楠屽崟鏈�鏂板崟鎹彿鍜屽崟鎹唴鐮�
- this.GetMaxNumPDA()
+ onLoad(e) {
+ let operationType = e.operationType
+ if (!operationType) {
+ // 鑾峰彇鏉ユ枡妫�楠屽崟鏈�鏂板崟鎹彿鍜屽崟鎹唴鐮�
+ this.GetMaxNumPDA()
+ } else if (operationType == 5) {
+ // 鐢辨壒閲忛〉闈㈣繘鍏�
+ let {
+ HInterID,
+ HBillNo,
+ HSourceBillNo
+ } = e
+ this.sourceBillInfo.HBillNo = HBillNo
+ this.sourceBillInfo.HInterID = HInterID
+ if (HSourceBillNo) {
+ this.tabs = 1
+ this.sourceBillInfo.HSourceBillNo = HSourceBillNo
+ this.getCode(HSourceBillNo)
+ }
+ }
this.getHEmpInfo()
}
}
@@ -947,6 +974,10 @@
flex-direction: row;
justify-content: flex-start;
gap: 6rpx;
+ }
+ .btn-a {
+ background-color: #3A78FF;
+ color: #fff;
}
</style>
\ No newline at end of file
diff --git a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue
index a6b21fb..c0a6838 100644
--- a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue
+++ b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue
@@ -36,6 +36,9 @@
</view>
<!-- 椤电 鐗╂枡娓呭崟 -->
<view v-if="tabs == 1">
+ <view style="padding: 10rpx;">
+ <button class="btn-a" size="mini" @tap="switchModule">鎵归噺</button>
+ </view>
<view class="form-item-wrapper">
<view class="form-item">
<view class="title">璐ㄦ鍛�:</view>
@@ -310,6 +313,13 @@
};
},
methods: {
+ switchModule() {
+ uni.redirectTo({
+ url: "/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast?" +
+ `HInterID=${this.sourceBillInfo.HInterID}&HBillNo=${this.sourceBillInfo.HBillNo}` +
+ `&HSourceBillNo=${this.sourceBillInfo.HSourceBillNo}&operationType=5`
+ })
+ },
selectMater(item, index) {
if (typeof this.materialManifest[index].selected == 'undefined') {
this.$set(this.materialManifest[index], 'selected', false)
@@ -540,7 +550,7 @@
},
async cmdSubmit() { // 鍚庣鍦ㄥ崟娆′笂浼犳枃浠舵彁浜ゅ悗浼氬垹闄ゆ湰鍦版枃浠讹紝涓�娆″彧鑳芥彁浜や竴涓暟鎹�
// 妫�鏌ユ槸鍚﹂�変腑鐗╂枡
-
+
if (this.sourceBillInfo.HSourceInterID == 0) {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
@@ -556,7 +566,8 @@
return
}
- let HEntryIDStr = `${this.sourceBillInfo.HSourceEntryIDList.filter(item => item !== undefined && item !== null).join(',')}`
+ let HEntryIDStr =
+ `${this.sourceBillInfo.HSourceEntryIDList.filter(item => item !== undefined && item !== null).join(',')}`
try {
let res = await CommonUtils.doRequest2Sync({
@@ -591,7 +602,7 @@
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
setTimeout(() => {
- uni.navigateBack();
+ uni.navigateBack();
}, 50)
}
}
@@ -682,9 +693,28 @@
}
}
},
- onLoad() {
- // 鑾峰彇鏉ユ枡妫�楠屽崟鏈�鏂板崟鎹彿鍜屽崟鎹唴鐮�
- this.GetMaxNumPDA()
+ onLoad(e) {
+ let operationType = e.operationType
+ if (!operationType) {
+ // 鑾峰彇鏉ユ枡妫�楠屽崟鏈�鏂板崟鎹彿鍜屽崟鎹唴鐮�
+ this.GetMaxNumPDA()
+ } else if (operationType == 5) {
+ // 鐢辨壒閲忛〉闈㈣繘鍏�
+ let {
+ HInterID,
+ HBillNo,
+ HSourceBillNo
+ } = e
+ this.sourceBillInfo.HBillNo = HBillNo
+ this.sourceBillInfo.HInterID = HInterID
+
+ if (HSourceBillNo) {
+ this.tabs = 1
+ this.sourceBillInfo.HSourceBillNo = HSourceBillNo
+ this.getCode(HSourceBillNo)
+ }
+ }
+
this.getHEmpInfo()
}
}
@@ -899,4 +929,9 @@
background-color: #a8c7fa;
scale: 1.05;
}
+
+ .btn-a {
+ background-color: #3A78FF;
+ color: #fff;
+ }
</style>
\ No newline at end of file
diff --git a/pages/caigoutuiliao/POStockInBackBill.vue b/pages/caigoutuiliao/POStockInBackBill.vue
index 7605161..40f59b6 100644
--- a/pages/caigoutuiliao/POStockInBackBill.vue
+++ b/pages/caigoutuiliao/POStockInBackBill.vue
@@ -417,7 +417,7 @@
},
async onLoad(e) {
uni.setNavigationBarTitle({
- 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
@@ -727,51 +727,55 @@
},
// 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
- async GetSourceBillType() {
- let res = await CommonUtils.doRequest2Async({
- url: '/Web/GetHSourceBillTypeByBillType',
- data: {
- HBillType: this.hform.HBillType,
- Num: 2
- }
- })
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- console.log('data: ', data);
- this.arrayHMainSourceBillType = []
- this.arrayHMainSourceBillValue = []
- Array.from(data).forEach(e => {
- for(var j = 0; j < this.$t("POStockInBackBill_PDA.select option").length; j++){
- let HSourceBillType_FY = this.$t("POStockInBackBill_PDA.select option[" + j + "]").split("@");
- if(e['HSourceBillType'] == HSourceBillType_FY[0]){
- console.log("褰撳墠鐨勫崟鎹被鍨嬶細", HSourceBillType_FY[1]);
- this.arrayHMainSourceBillType.push(HSourceBillType_FY[1])
- this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
+ async GetSourceBillType() {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Web/GetHSourceBillTypeByBillType',
+ data: {
+ HBillType: this.hform.HBillType,
+ Num: 2
+ }
+ })
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ console.log('data: ', data);
+ this.arrayHMainSourceBillType = []
+ this.arrayHMainSourceBillValue = []
+ Array.from(data).forEach(e => {
+ if (this.$t("POStockInBackBill_PDA.select option").lenth > 0){
+ for(var j = 0; j < this.$t("POStockInBackBill_PDA.select option").length; j++){
+ let HSourceBillType_FY = this.$t("POStockInBackBill_PDA.select option[" + j + "]").split("@");
+ if(e['HSourceBillType'] == HSourceBillType_FY[0]){
+ this.arrayHMainSourceBillType.push(HSourceBillType_FY[1])
+ }
}
}
- })
-
- this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
- this.arrayHMainSourceBillValue.push('-1')
- //濡傛灉鎵嬪伐褰曞叆涓嶇敤閫夋嫨婧愬崟
- if (this.arrayHMainSourceBillType[0] == '鎵嬪伐褰曞叆') {
- this.tabs = 1
- }
-
- this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
- this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
- } else {
- uni.showToast({
- icon: 'none',
- title: Message
- })
-
- }
- },
+ else{
+ this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
+ }
+ this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
+ })
+
+ this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
+ this.arrayHMainSourceBillValue.push('-1')
+ //濡傛灉鎵嬪伐褰曞叆涓嶇敤閫夋嫨婧愬崟
+ if (this.arrayHMainSourceBillType[0] == '鎵嬪伐褰曞叆') {
+ this.tabs = 1
+ }
+
+ this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
+ this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+
+ }
+ },
//婧愬崟璧勬枡
getHYDList() {
uni.request({
diff --git a/pages/caigoutuiliao/POStockInBackBillList.vue b/pages/caigoutuiliao/POStockInBackBillList.vue
index cdaa6e7..8e1cac9 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")
+ title: this.$t("POStockInBackBillList_PDA.title") == 'POStockInBackBillList_PDA.title' ? '鐢熶骇鍏ュ簱鍗�' : this.$t("POStockInBackBillList_PDA.title")
})
//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
this.CheckModRight()
diff --git a/pages/index/login.vue b/pages/index/login.vue
index a41c636..789859c 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -114,8 +114,8 @@
"闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.88.82:81/API/',
"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
"浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
- "鏉ㄦ潈閼湰鍦版祴璇�": 'http://192.168.0.36:8082/API/',
- "鐜嬩华鏈湴娴嬭瘯": 'http://192.168.0.74:8080/API/',
+ "鏉ㄦ潈閼湰鍦版祴璇�": 'http://192.168.0.36:8082/API/',
+ "鐜嬩华鏈湴娴嬭瘯": 'http://192.168.0.74:8080/API/',
// 灏忓崼鍐呭缃�
"鑻忓窞鍗櫤绉戞妧-澶栫綉": 'http://221.224.60.42:8082/API_WW/',
"鑻忓窞鍗櫤绉戞妧-鍐呯綉": 'http://172.16.20.233:8082/API_NW/',
@@ -131,8 +131,8 @@
"瀹佹尝鍗庤垷鍖呰": "http://61.164.64.222:8082/API_WW/",
//浣欏鍗庤繙
"浣欏鍗庤繙": "http://192.168.3.248:82/HuaYuaAPI/",
- //澶╂搸鑸ぉ
- "澶╂搸鑸ぉ": "http://space-engine.com.cn:81/API/",
+ //澶╂搸鑸ぉ
+ "澶╂搸鑸ぉ": "http://space-engine.com.cn:81/API/",
},
serverUrlName: uni.getStorageSync('serverUrlName') || '瀹佹尝鍗庤垷鍖呰',
diff --git a/pages/shengchanruku/ProductInCheckBill.vue b/pages/shengchanruku/ProductInCheckBill.vue
index e648467..b31f38e 100644
--- a/pages/shengchanruku/ProductInCheckBill.vue
+++ b/pages/shengchanruku/ProductInCheckBill.vue
@@ -2,9 +2,9 @@
<view>
<view class="form">
<view class="form-item">
- <view class="title">鏉＄爜:</view>
+ <view class="title">{{ $t("ProductInCheckBill_PDA.BarCode") == "ProductInCheckBill_PDA.BarCode" ? "鏉＄爜" : $t("ProductInCheckBill_PDA.BarCode") }}:</view>
<view class="right">
- <input class="" :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜"
+ <input class="" :focus="barCodeFocus" v-model="hform.HBarCode" :placeholder="placeholder_BarCode"
@confirm="getCode(hform.HBarCode)" />
</view>
<uni-icons type="scan"
@@ -12,41 +12,41 @@
size="20" @click="toScanHBarCode()"></uni-icons>
</view>
<view class="form-item">
- <view class="title">鏁伴噺:</view>
+ <view class="title">{{ $t("ProductInCheckBill_PDA.Qty") == "ProductInCheckBill_PDA.Qty" ? "鏁伴噺" : $t("ProductInCheckBill_PDA.Qty") }}:</view>
<view class="right">
- <input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
+ <input v-model="hform.HQty" :placeholder="placeholder_Qty" />
</view>
</view>
<view class="form-item">
- <view class="title">浠撳簱:</view>
+ <view class="title">{{ $t("ProductInCheckBill_PDA.Warehouse") == "ProductInCheckBill_PDA.Warehouse" ? "浠撳簱" : $t("ProductInCheckBill_PDA.Warehouse") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨浠撳簱" v-model="hform.HWHName"
+ <uni-combox :candidates="arrayHWHName" :placeholder="placeholder_SCWarehouse" v-model="hform.HWHName"
@input="HWHNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">浠撲綅:</view>
+ <view class="title">{{ $t("ProductInCheckBill_PDA.StockPlace") == "ProductInCheckBill_PDA.StockPlace" ? "浠撲綅" : $t("ProductInCheckBill_PDA.StockPlace") }}:</view>
<view class="right" v-show="true">
- <uni-combox :candidates="arrayHStockPlaceNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+ <uni-combox :candidates="arrayHStockPlaceNameComputed" :placeholder="placeholder_SCStockPlace"
v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
@confirm="HStockPlaceNameScan"></uni-combox>
</view>
- <view class="righton" v-show="false"><input v-model="hform.HStockPlaceName" placeholder="涓嶅彲鎿嶄綔"
+ <view class="righton" v-show="false"><input v-model="hform.HStockPlaceName" :placeholder="unOperate"
:disabled="!showHStockPlaceName" /></view>
</view>
<view class="tabs">
- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
- <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鏉＄爜淇℃伅</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">{{ $t("ProductInCheckBill_PDA.tableInfo") == "ProductInCheckBill_PDA.tableInfo" ? "琛ㄥご淇℃伅" : $t("ProductInCheckBill_PDA.tableInfo") }}</view>
+ <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">{{ $t("ProductInCheckBill_PDA.materInfo") == "ProductInCheckBill_PDA.materInfo" ? "鐗╂枡淇℃伅" : $t("ProductInCheckBill_PDA.materInfo") }}</view>
+ <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">{{ $t("ProductInCheckBill_PDA.barInfo") == "ProductInCheckBill_PDA.barInfo" ? "鏉＄爜淇℃伅" : $t("ProductInCheckBill_PDA.barInfo") }}</view>
</view>
<view v-if="tabs == 1">
<view class="form-item" v-show="showHBillNo">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("ProductInCheckBill_PDA.BillNo") == "ProductInCheckBill_PDA.BillNo" ? "鍗曟嵁鍙�" : $t("ProductInCheckBill_PDA.BillNo") }}:</view>
<view class="right" style="width: 380rpx;">
- <input :focus="HBillNoFocus" name="HBillNo" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜"
+ <input :focus="HBillNoFocus" name="HBillNo" v-model="hform.HBillNo" :placeholder="placeholder_BarCode"
@confirm="GetMeesageByBillNo(hform.HBarCode)" />
</view>
<uni-icons type="scan"
@@ -54,31 +54,31 @@
size="20" @click="toScanCode"></uni-icons>
</view>
<view class="form-item" v-show="!showHBillNo">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("ProductInCheckBill_PDA.BillNo") == "ProductInCheckBill_PDA.BillNo" ? "鍗曟嵁鍙�" : $t("ProductInCheckBill_PDA.BillNo") }}:</view>
<view class="righton">
<input name="HBillNo" disabled v-model="hform.HBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁ID:</view>
+ <view class="title">{{ $t("ProductInCheckBill_PDA.BillID") == "ProductInCheckBill_PDA.BillID" ? "鍗曟嵁ID" : $t("ProductInCheckBill_PDA.BillID") }}:</view>
<view class="righton">
<input name="HInterID" disabled v-model="hform.HInterID" />
</view>
</view>
<view class="form-item">
- <view class="title">鍒跺崟浜�:</view>
+ <view class="title">{{ $t("ProductInCheckBill_PDA.Maker") == "ProductInCheckBill_PDA.Maker" ? "鍒跺崟浜�" : $t("ProductInCheckBill_PDA.Maker") }}:</view>
<view class="righton">
<input name="HMaker" disabled v-model="hform.HMaker" />
</view>
</view>
<view class="form-item">
- <view class="title">缁勭粐:</view>
+ <view class="title">{{ $t("ProductInCheckBill_PDA.StockOrg") == "ProductInCheckBill_PDA.StockOrg" ? "缁勭粐" : $t("ProductInCheckBill_PDA.StockOrg") }}:</view>
<view class="righton">
<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
</view>
</view>
<label class="checkbox">
- <checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc" />鏉＄爜鏍稿
+ <checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc" />{{ $t("ProductInCheckBill_PDA.Barcode_Check") == "ProductInCheckBill_PDA.Barcode_Check" ? "鏉＄爜鏍稿" : $t("ProductInCheckBill_PDA.Barcode_Check") }}
</label>
</view>
<view v-if="tabs == 2">
@@ -86,95 +86,95 @@
<uni-card :title="item.鐗╂枡鍚嶇О" :extra="'鏁伴噺:'+item.鏁伴噺" style="margin: 10px;">
<view class="card-detail">
<view class="detail">
- <text>鍗曟嵁鏁伴噺锛�</text>{{item.鍗曟嵁鏁伴噺}}
+ <text>{{ $t("ProductInCheckBill_PDA.BillQty") == "ProductInCheckBill_PDA.BillQty" ? "鍗曟嵁鏁伴噺" : $t("ProductInCheckBill_PDA.BillQty") }}锛�</text>{{item.鍗曟嵁鏁伴噺}}
</view>
<view class="detail">
- <text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
+ <text>{{ $t("ProductInCheckBill_PDA.MaterCode") == "ProductInCheckBill_PDA.MaterCode" ? "鐗╂枡浠ｇ爜" : $t("ProductInCheckBill_PDA.MaterCode") }}锛�</text>{{item.鐗╂枡浠ｇ爜}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ <text>{{ $t("ProductInCheckBill_PDA.table_MaterModel") == "ProductInCheckBill_PDA.table_MaterModel" ? "瑙勬牸鍨嬪彿" : $t("ProductInCheckBill_PDA.table_MaterModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
<view class="detail">
- <text>鎵瑰彿锛�</text>{{item.鎵瑰彿}}
+ <text>{{ $t("ProductInCheckBill_PDA.BatchNo1") == "ProductInCheckBill_PDA.BatchNo1" ? "鎵瑰彿" : $t("ProductInCheckBill_PDA.BatchNo1") }}锛�</text>{{item.鎵瑰彿}}
</view>
<view class="detail" v-if="item.杈呭姪灞炴��">
- <text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+ <text>{{ $t("ProductInCheckBill_PDA.table_Aux") == "ProductInCheckBill_PDA.table_Aux" ? "杈呭姪灞炴��" : $t("ProductInCheckBill_PDA.table_Aux") }}锛�</text>{{item.杈呭姪灞炴�}
</view>
<view class="detail">
- <text>浠撳簱锛�</text>{{item.浠撳簱}}
+ <text>{{ $t("ProductInCheckBill_PDA.Warehouse") == "ProductInCheckBill_PDA.Warehouse" ? "浠撳簱" : $t("ProductInCheckBill_PDA.Warehouse") }}锛�</text>{{item.浠撳簱}}
</view>
<view class="detail">
- <text>浠撲綅锛�</text>{{item.浠撲綅}}
+ <text>{{ $t("ProductInCheckBill_PDA.StockPlace") == "ProductInCheckBill_PDA.StockPlace" ? "浠撲綅" : $t("ProductInCheckBill_PDA.StockPlace") }}锛�</text>{{item.浠撲綅}}
</view>
<view class="detail">
- <text>鐢熶骇鏃ユ湡锛�</text>{{item.鐢熶骇鏃ユ湡}}
+ <text>{{ $t("ProductInCheckBill_PDA.ProduceDate") == "ProductInCheckBill_PDA.ProduceDate" ? "鐢熶骇鏃ユ湡" : $t("ProductInCheckBill_PDA.ProduceDate") }}锛�</text>{{item.鐢熶骇鏃ユ湡}}
</view>
<view class="detail">
- <text>鏈夋晥鏈熻嚦锛�</text>{{item.鏈夋晥鏈熻嚦}}
+ <text>{{ $t("ProductInCheckBill_PDA.ValidDate") == "ProductInCheckBill_PDA.ValidDate" ? "鏈夋晥鏈熻嚦" : $t("ProductInCheckBill_PDA.ValidDate") }}锛�</text>{{item.鏈夋晥鏈熻嚦}}
</view>
<view class="detail">
- <text>鍗曟嵁鍙凤細</text>{{item.鍗曟嵁鍙穧}
+ <text>{{ $t("ProductInCheckBill_PDA.BillNo") == "ProductInCheckBill_PDA.BillNo" ? "鍗曟嵁鍙�" : $t("ProductInCheckBill_PDA.BillNo") }}锛�</text>{{item.鍗曟嵁鍙穧}
</view>
<view class="detail">
- <text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
+ <text>{{ $t("ProductInCheckBill_PDA.table_BarNum") == "ProductInCheckBill_PDA.table_BarNum" ? "鏉＄爜涓暟" : $t("ProductInCheckBill_PDA.table_BarNum") }}锛�</text>{{item.鏉＄爜涓暟}}
</view>
</view>
</uni-card>
</view>
- <view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="Materlist.length == 0">{{ $t("ProductInCheckBill_PDA.noData") == "ProductInCheckBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("ProductInCheckBill_PDA.noData") }}</view>
</view>
<view v-if="tabs == 3">
<view class="form-item">
- <view class="title">鏉＄爜:</view>
+ <view class="title">{{ $t("ProductInCheckBill_PDA.BarCode") == "ProductInCheckBill_PDA.BarCode" ? "鏉＄爜" : $t("ProductInCheckBill_PDA.BarCode") }}:</view>
<view class="righton">
<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鐗╂枡:</view>
+ <view class="title">{{ $t("ProductInCheckBill_PDA.Material") == "ProductInCheckBill_PDA.Material" ? "鐗╂枡" : $t("ProductInCheckBill_PDA.Material") }}:</view>
<view class="righton">
<input disabled v-model="hform.HMaterName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">瑙勬牸:</view>
+ <view class="title">{{ $t("ProductInCheckBill_PDA.MaterModel") == "ProductInCheckBill_PDA.MaterModel" ? "瑙勬牸" : $t("ProductInCheckBill_PDA.MaterModel") }}:</view>
<view class="righton">
<input disabled v-model="hform.HMaterModel_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鎵规:</view>
+ <view class="title">{{ $t("ProductInCheckBill_PDA.BatchNo") == "ProductInCheckBill_PDA.BatchNo" ? "鎵规" : $t("ProductInCheckBill_PDA.BatchNo") }}:</view>
<view class="righton">
<input disabled v-model="hform.HBatchNo_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曚綅:</view>
+ <view class="title">{{ $t("ProductInCheckBill_PDA.Unit") == "ProductInCheckBill_PDA.Unit" ? "鍗曚綅" : $t("ProductInCheckBill_PDA.Unit") }}:</view>
<view class="righton">
<input disabled v-model="hform.HUnitName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鏁伴噺:</view>
+ <view class="title">{{ $t("ProductInCheckBill_PDA.Qty") == "ProductInCheckBill_PDA.Qty" ? "鏁伴噺" : $t("ProductInCheckBill_PDA.Qty") }}:</view>
<view class="righton">
<input disabled v-model="hform.HQty_B" />
</view>
</view>
<view class="form-item">
- <view class="title">瀹归噺:</view>
+ <view class="title">{{ $t("ProductInCheckBill_PDA.Capacity") == "ProductInCheckBill_PDA.Capacity" ? "瀹归噺" : $t("ProductInCheckBill_PDA.Capacity") }}:</view>
<view class="righton">
<input disabled v-model="hform.HTMQty_B" />
</view>
</view>
<view class="form-item">
- <view class="title">浠撳簱:</view>
+ <view class="title">{{ $t("ProductInCheckBill_PDA.Warehouse") == "ProductInCheckBill_PDA.Warehouse" ? "浠撳簱" : $t("ProductInCheckBill_PDA.Warehouse") }}:</view>
<view class="righton">
<input disabled v-model="hform.HWHName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">浠撲綅:</view>
+ <view class="title">{{ $t("ProductInCheckBill_PDA.StockPlace") == "ProductInCheckBill_PDA.StockPlace" ? "浠撲綅" : $t("ProductInCheckBill_PDA.StockPlace") }}:</view>
<view class="righton">
<input disabled v-model="hform.HSPName_B" />
</view>
@@ -182,10 +182,10 @@
</view>
<view class="bottom-btn">
- <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button class="btn-a" size="mini" @tap="submit">{{ $t("ProductInCheckBill_PDA.btnSubmit") == "ProductInCheckBill_PDA.btnSubmit" ? "鎻愪氦" : $t("ProductInCheckBill_PDA.btnSubmit") }}</button>
<view style="flex: 1;"></view>
- <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
- <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ <button class="btn-a" size="mini" @tap="addNew">{{ $t("ProductInCheckBill_PDA.btnAdd") == "ProductInCheckBill_PDA.btnAdd" ? "鏂板" : $t("ProductInCheckBill_PDA.btnAdd") }}</button>
+ <button class="btn-c" size="mini" @tap="goBack">{{ $t("ProductInCheckBill_PDA.btnExit") == "ProductInCheckBill_PDA.btnExit" ? "閫�鍑�" : $t("ProductInCheckBill_PDA.btnExit") }}</button>
</view>
</view>
</view>
@@ -249,7 +249,25 @@
HTMQty_B: '',
HWHName_B: '',
HSPName_B: '',
- }
+ },
+ placeholder_BarCode:this.$t("ProductInCheckBill_PDA.placeholder_BarCode") == "ProductInCheckBill_PDA.placeholder_BarCode" ? "璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" : this.$t("ProductInCheckBill_PDA.placeholder_BarCode"),
+ placeholder_Qty:this.$t("ProductInCheckBill_PDA.placeholder_Qty") == "ProductInCheckBill_PDA.placeholder_Qty" ? "璇疯緭鍏ユ暟閲�" : this.$t("ProductInCheckBill_PDA.placeholder_Qty"),
+ placeholder_DCWarehouse:this.$t("ProductInCheckBill_PDA.placeholder_DCWarehouse") == "ProductInCheckBill_PDA.placeholder_DCWarehouse" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" : this.$t("ProductInCheckBill_PDA.placeholder_DCWarehouse"),
+ placeholder_DCStockPlace:this.$t("ProductInCheckBill_PDA.placeholder_DCStockPlace") == "ProductInCheckBill_PDA.placeholder_DCStockPlace" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" : this.$t("ProductInCheckBill_PDA.placeholder_DCStockPlace"),
+ placeholder_SourceBillNo:this.$t("ProductInCheckBill_PDA.placeholder_SourceBillNo") == "ProductInCheckBill_PDA.placeholder_SourceBillNo" ? "璇疯緭鍏ユ簮鍗曞崟鍙�" : this.$t("ProductInCheckBill_PDA.placeholder_SourceBillNo"),
+ placeholder_FIFOwarehouse:this.$t("ProductInCheckBill_PDA.placeholder_FIFOwarehouse") == "ProductInCheckBill_PDA.placeholder_FIFOwarehouse" ? "璇烽�夋嫨" : this.$t("ProductInCheckBill_PDA.placeholder_FIFOwarehouse"),
+ placeholder_OutboundType:this.$t("ProductInCheckBill_PDA.placeholder_OutboundType") == "ProductInCheckBill_PDA.placeholder_OutboundType" ? "璇烽�夋嫨" : this.$t("ProductInCheckBill_PDA.placeholder_OutboundType"),
+ placeholder_TransferDirection:this.$t("ProductInCheckBill_PDA.placeholder_TransferDirection") == "ProductInCheckBill_PDA.placeholder_TransferDirection" ? "璇烽�夋嫨璋冩嫧鏂瑰悜" : this.$t("ProductInCheckBill_PDA.placeholder_TransferDirection"),
+ placeholder_TransferType:this.$t("ProductInCheckBill_PDA.placeholder_TransferType") == "ProductInCheckBill_PDA.placeholder_TransferType" ? "璇烽�夋嫨璋冩嫧绫诲瀷" : this.$t("ProductInCheckBill_PDA.placeholder_TransferType"),
+ placeholder_SCWarehouse:this.$t("ProductInCheckBill_PDA.placeholder_SCWarehouse") == "ProductInCheckBill_PDA.placeholder_SCWarehouse" ? "璇烽�夋嫨璋冨嚭浠撳簱" : this.$t("ProductInCheckBill_PDA.placeholder_SCWarehouse"),
+ placeholder_SCStockPlace:this.$t("ProductInCheckBill_PDA.placeholder_SCStockPlace") == "ProductInCheckBill_PDA.placeholder_SCStockPlace" ? "璇烽�夋嫨璋冨嚭浠撲綅" : this.$t("ProductInCheckBill_PDA.placeholder_SCStockPlace"),
+ placeholder_SecManager:this.$t("ProductInCheckBill_PDA.placeholder_SecManager") == "ProductInCheckBill_PDA.placeholder_SecManager" ? "璇烽�夋嫨楠屾敹鍛�" : this.$t("ProductInCheckBill_PDA.placeholder_SecManager"),
+ placeholder_Keeper:this.$t("ProductInCheckBill_PDA.placeholder_Keeper") == "ProductInCheckBill_PDA.placeholder_Keeper" ? "璇烽�夋嫨淇濈鍛�" : this.$t("ProductInCheckBill_PDA.placeholder_Keeper"),
+ placeholder_Dept:this.$t("ProductInCheckBill_PDA.placeholder_Dept") == "ProductInCheckBill_PDA.placeholder_Dept" ? "璇烽�夋嫨閮ㄩ棬" : this.$t("ProductInCheckBill_PDA.placeholder_Dept"),
+ placeholder_Supplier:this.$t("ProductInCheckBill_PDA.placeholder_Supplier") == "ProductInCheckBill_PDA.placeholder_Supplier" ? "璇烽�夋嫨渚涘簲鍟�" : this.$t("ProductInCheckBill_PDA.placeholder_Supplier"),
+ placeholder_Customer:this.$t("ProductInCheckBill_PDA.placeholder_Customer") == "ProductInCheckBill_PDA.placeholder_Customer" ? "璇烽�夋嫨瀹㈡埛" : this.$t("ProductInCheckBill_PDA.placeholder_Customer"),
+ unOperate:this.$t("ProductInCheckBill_PDA.unOperate") == "ProductInCheckBill_PDA.unOperate" ? "涓嶅彲鎿嶄綔" : this.$t("ProductInCheckBill_PDA.unOperate")
+
}
},
computed: {
@@ -262,7 +280,10 @@
}
}
},
- onLoad(e) {
+ async onLoad(e) {
+ uni.setNavigationBarTitle({
+ title: this.$t("ProductInCheckBill_PDA.title") == 'ProductInCheckBill_PDA.title' ? '鐢熶骇鍏ュ簱鍗曟牎楠�' : this.$t("ProductInCheckBill_PDA.title")
+ })
console.log(e, this.userInfo)
this.OperationType = e.OperationType
if (e.HBillNo) {
@@ -272,6 +293,8 @@
this.refreshHBillState()
}
this.getHBaseList()
+ await this.GetSourceBillType()
+
},
methods: {
// 鑾峰彇浠撲綅
@@ -429,6 +452,52 @@
}
}
},
+
+ // 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
+ async GetSourceBillType() {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Web/GetHSourceBillTypeByBillType',
+ data: {
+ HBillType: this.hform.HBillType,
+ Num: 2
+ }
+ })
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ console.log('data: ', data);
+ this.arrayHMainSourceBillType = []
+ this.arrayHMainSourceBillValue = []
+ Array.from(data).forEach(e => {
+ for(var j = 0; j < this.$t("ProductInCheckBill_PDA.select option").length; j++){
+ let HSourceBillType_FY = this.$t("ProductInCheckBill_PDA.select option[" + j + "]").split("@");
+ if(e['HSourceBillType'] == HSourceBillType_FY[0]){
+ this.arrayHMainSourceBillType.push(HSourceBillType_FY[1])
+ this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
+ }
+ }
+ })
+
+ this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
+ this.arrayHMainSourceBillValue.push('-1')
+ //濡傛灉鎵嬪伐褰曞叆涓嶇敤閫夋嫨婧愬崟
+ if (this.arrayHMainSourceBillType[0] == '鎵嬪伐褰曞叆') {
+ this.tabs = 1
+ }
+
+ this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
+ this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+
+ }
+ },
//閫夋嫨浠撲綅
HStockPlaceNameChange(e) {
for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
diff --git a/pages/shengchanruku/ProductInCheckBillList.vue b/pages/shengchanruku/ProductInCheckBillList.vue
index ab94825..a473af7 100644
--- a/pages/shengchanruku/ProductInCheckBillList.vue
+++ b/pages/shengchanruku/ProductInCheckBillList.vue
@@ -1,27 +1,27 @@
<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("ProductInCheckBillList_PDA.cacheList") == "ProductInCheckBillList_PDA.cacheList" ? "缂撳瓨鍒楄〃" : $t("ProductInCheckBillList_PDA.cacheList") }}</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">{{ $t("ProductInCheckBillList_PDA.updatedList") == "ProductInCheckBillList_PDA.updatedList" ? "宸蹭笂浼犲垪琛�" : $t("ProductInCheckBillList_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("ProductInCheckBillList_PDA.btnAdd") == "ProductInCheckBillList_PDA.btnAdd" ? "鏂板" : $t("ProductInCheckBillList_PDA.btnAdd") }}
</view>
</view>
<view class="form" v-if="tabs == 1">
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("ProductInCheckBillList_PDA.billNo") == "ProductInCheckBillList_PDA.billNo" ? "鍗曟嵁鍙�" : $t("ProductInCheckBillList_PDA.billNo") }}:</view>
<view class="right">
- <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ <input v-model="hform.HBillNo" :placeholder="billNoPlaceholder" />
</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("ProductInCheckBillList_PDA.btn_Reset") == "ProductInCheckBillList_PDA.btn_Reset" ? "閲嶇疆" : $t("ProductInCheckBillList_PDA.btn_Reset") }}</button>
+ <button class="btn-c" size="mini" type="default" @tap="search">{{ $t("ProductInCheckBillList_PDA.btn_Query") == "ProductInCheckBillList_PDA.btn_Query" ? "鏌ヨ" : $t("ProductInCheckBillList_PDA.btn_Query") }}</button>
</view>
</view>
@@ -31,19 +31,19 @@
<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("ProductInCheckBillList_PDA.table_Maker") == "ProductInCheckBillList_PDA.table_Maker" ? "鍒跺崟浜�" : $t("ProductInCheckBillList_PDA.table_Maker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("ProductInCheckBillList_PDA.table_Org") == "ProductInCheckBillList_PDA.table_Org" ? "缁勭粐" : $t("ProductInCheckBillList_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("ProductInCheckBillList_PDA.btn_Edit") == "ProductInCheckBillList_PDA.btn_Edit" ? "缂栬緫" : $t("ProductInCheckBillList_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("ProductInCheckBillList_PDA.btn_Del") == "ProductInCheckBillList_PDA.btn_Del" ? "鍒犻櫎" : $t("ProductInCheckBillList_PDA.btn_Del") }}
</view>
</view>
</uni-card>
@@ -52,22 +52,22 @@
<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("ProductInCheckBillList_PDA.table_Maker") == "ProductInCheckBillList_PDA.table_Maker" ? "鍒跺崟浜�" : $t("ProductInCheckBillList_PDA.table_Maker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("ProductInCheckBillList_PDA.table_Qty") == "ProductInCheckBillList_PDA.table_Qty" ? "鏁伴噺" : $t("ProductInCheckBillList_PDA.table_Qty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.鐗╂枡浠ｇ爜">
- <text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
+ <text>{{ $t("ProductInCheckBillList_PDA.table_MaterNumber") == "ProductInCheckBillList_PDA.table_MaterNumber" ? "鐗╂枡浠ｇ爜" : $t("ProductInCheckBillList_PDA.table_MaterNumber") }}锛�</text>{{item.鐗╂枡浠ｇ爜}}
</view>
<view class="detail" v-if="item.鐗╂枡鍚嶇О">
- <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+ <text>{{ $t("ProductInCheckBillList_PDA.table_MaterName") == "ProductInCheckBillList_PDA.table_MaterName" ? "鐗╂枡鍚嶇О" : $t("ProductInCheckBillList_PDA.table_MaterName") }}锛�</text>{{item.鐗╂枡鍚嶇О}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ <text>{{ $t("ProductInCheckBillList_PDA.table_MaterModel") == "ProductInCheckBillList_PDA.table_MaterModel" ? "瑙勬牸鍨嬪彿" : $t("ProductInCheckBillList_PDA.table_MaterModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("ProductInCheckBillList_PDA.table_Org") == "ProductInCheckBillList_PDA.table_Org" ? "缁勭粐" : $t("ProductInCheckBillList_PDA.table_Org") }}锛�</text>{{item.缁勭粐}}
</view>
</view>
@@ -79,9 +79,9 @@
</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("ProductInCheckBillList_PDA.noDate") == "ProductInCheckBillList_PDA.noDate" ? "鏆傛棤鏁版嵁" : $t("ProductInCheckBillList_PDA.noDate") }}</view>
+ <view class="over" v-if="listData.length != 0 && listData.length != showList.length">{{ $t("ProductInCheckBillList_PDA.Loading") == "ProductInCheckBillList_PDA.Loading" ? "鍔犺浇涓�..." : $t("ProductInCheckBillList_PDA.Loading") }}</view>
+ <view class="over" v-if="listData.length != 0 && listData.length == showList.length">{{ $t("ProductInCheckBillList_PDA.bottom") == "ProductInCheckBillList_PDA.bottom" ? "宸插埌搴�" : $t("ProductInCheckBillList_PDA.bottom") }}</view>
</view>
</template>
@@ -101,6 +101,7 @@
HMaker: uni.getStorageSync('HUserName'),
HStockOrgID: uni.getStorageSync('OrganizationID'),
},
+ billNoPlaceholder:this.$t("ProductInCheckBillList_PDA.billNoPlaceholder") == "ProductInCheckBillList_PDA.billNoPlaceholder" ? "璇疯緭鍏ュ崟鎹彿" : this.$t("ProductInCheckBillList_PDA.billNoPlaceholder"),
sWhere:'',
listData:[],
showList:[],
@@ -110,6 +111,9 @@
}
},
onLoad() {
+ uni.setNavigationBarTitle({
+ title: this.$t("ProductInCheckBillList_PDA.title") == 'ProductInCheckBillList_PDA.title' ? '鐢熶骇鍏ュ簱鍗曟牎楠屽垪琛�' : this.$t("ProductInCheckBillList_PDA.title")
+ })
//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
this.CheckModRight()
this.changeTab(0)
diff --git a/pages/shengchantuiliao/MateOutBackBill.vue b/pages/shengchantuiliao/MateOutBackBill.vue
index 6631372..03ef15a 100644
--- a/pages/shengchantuiliao/MateOutBackBill.vue
+++ b/pages/shengchantuiliao/MateOutBackBill.vue
@@ -443,7 +443,7 @@
},
async onLoad(e) {
uni.setNavigationBarTitle({
- title: this.$t("MateOutBackBill_PDA.title")
+ title: this.$t("MateOutBackBill_PDA.title") == 'MateOutBackBill_PDA.title' ? '鐢熶骇閫�鏂欏崟' : this.$t("MateOutBackBill_PDA.title")
})
console.log(e, this.userInfo)
this.OperationType = e.OperationType
@@ -460,6 +460,7 @@
this.getHSupList()
this.getHEmpList()
this.getHDeptList()
+ await this.GetSourceBillType()
// this.GetSourceBillType()
this.getRelationStore()
@@ -733,43 +734,56 @@
// this.getHYDList()
},
+
// 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
async GetSourceBillType() {
- CommonUtils.doRequest2({
+ let res = await CommonUtils.doRequest2Async({
url: '/Web/GetHSourceBillTypeByBillType',
data: {
HBillType: this.hform.HBillType,
Num: 2
- },
- resFunction: (res) => {
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- console.log('data: ', data);
- this.arrayHMainSourceBillType = []
- this.arrayHMainSourceBillValue = []
- Array.from(data).forEach(e => {
- this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
- this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
- })
+ }
+ })
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ console.log('data: ', data);
+ this.arrayHMainSourceBillType = []
+ this.arrayHMainSourceBillValue = []
+ Array.from(data).forEach(e => {
+ if (this.$t("MateOutBackBill_PDA.select option").lenth > 0){
+ for(var j = 0; j < this.$t("MateOutBackBill_PDA.select option").length; j++){
+ let HSourceBillType_FY = this.$t("MateOutBackBill_PDA.select option[" + j + "]").split("@");
+ if(e['HSourceBillType'] == HSourceBillType_FY[0]){
+ this.arrayHMainSourceBillType.push(HSourceBillType_FY[1])
+ }
+ }
+ }
+ else{
+ this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
+ }
+ this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
+ })
- this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
- this.arrayHMainSourceBillValue.push('-1')
-
- this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
- this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
- } else {
- uni.showToast({
- icon: 'none',
- title: Message
- })
- }
+ this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
+ this.arrayHMainSourceBillValue.push('-1')
+ //濡傛灉鎵嬪伐褰曞叆涓嶇敤閫夋嫨婧愬崟
+ if (this.arrayHMainSourceBillType[0] == '鎵嬪伐褰曞叆') {
+ this.tabs = 1
}
- })
+ this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
+ this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+
+ }
},
//婧愬崟璧勬枡
getHYDList() {
diff --git a/pages/shengchantuiliao/MateOutBackBillList.vue b/pages/shengchantuiliao/MateOutBackBillList.vue
index 5722994..3ce8538 100644
--- a/pages/shengchantuiliao/MateOutBackBillList.vue
+++ b/pages/shengchantuiliao/MateOutBackBillList.vue
@@ -129,7 +129,7 @@
HStockOrgID: uni.getStorageSync('OrganizationID'),
},
billNoPlaceholder:this.$t("MoveStockBillList_PDA.billNoPlaceholder") == "MoveStockBillList_PDA.billNoPlaceholder" ? "璇疯緭鍏ュ崟鎹彿" : this.$t("MoveStockBillList_PDA.billNoPlaceholder"),
- sourceBillNoPlaceholder:this.$t("MoveStockBillList.sourceBillNoPlaceholder") == "MoveStockBillList_PDA.sourceBillNoPlaceholder" ? "璇疯緭鍏ユ簮鍗曠紪鍙�" : this.$t("MoveStockBillList_PDA.sourceBillNoPlaceholder"),
+ sourceBillNoPlaceholder:this.$t("MoveStockBillList_PDA.sourceBillNoPlaceholder") == "MoveStockBillList_PDA.sourceBillNoPlaceholder" ? "璇疯緭鍏ユ簮鍗曠紪鍙�" : this.$t("MoveStockBillList_PDA.sourceBillNoPlaceholder"),
sWhere:'',
listData:[],
showList:[],
@@ -140,7 +140,7 @@
},
onShow() {
uni.setNavigationBarTitle({
- title: this.$t("MateOutBackBillList_PDA.title")
+ title: this.$t("MoveStockBillList_PDA.title") == 'MoveStockBillList_PDA.title' ? '鐢熶骇鍏ュ簱鍗�' : this.$t("MoveStockBillList_PDA.title")
})
//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
this.CheckModRight()
diff --git a/pages/xiaoshouchuku/SellOutBill.vue b/pages/xiaoshouchuku/SellOutBill.vue
index d9129c8..d6c1336 100644
--- a/pages/xiaoshouchuku/SellOutBill.vue
+++ b/pages/xiaoshouchuku/SellOutBill.vue
@@ -458,7 +458,7 @@
},
async onLoad(e) {
uni.setNavigationBarTitle({
- title: this.$t("SellOutBill_PDA.title")
+ title: this.$t("SellOutBill_PDA.title") == 'SellOutBill_PDA.title' ? '閿�鍞嚭搴撳崟' : this.$t("SellOutBill_PDA.title")
})
console.log(e, this.userInfo)
this.OperationType = e.OperationType
@@ -900,51 +900,56 @@
// }
},
- // 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
- async GetSourceBillType() {
- let res = await CommonUtils.doRequest2Async({
- url: '/Web/GetHSourceBillTypeByBillType',
- data: {
- HBillType: this.hform.HBillType,
- Num: 2
- }
- })
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- console.log('data: ', data);
- this.arrayHMainSourceBillType = []
- this.arrayHMainSourceBillValue = []
- Array.from(data).forEach(e => {
- for(var j = 0; j < this.$t("SellOutBill_PDA.select option").length; j++){
- let HSourceBillType_FY = this.$t("SellOutBill_PDA.select option[" + j + "]").split("@");
- if(e['HSourceBillType'] == HSourceBillType_FY[0]){
- this.arrayHMainSourceBillType.push(HSourceBillType_FY[1])
- this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
+ // 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
+ async GetSourceBillType() {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Web/GetHSourceBillTypeByBillType',
+ data: {
+ HBillType: this.hform.HBillType,
+ Num: 2
+ }
+ })
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ console.log('data: ', data);
+ this.arrayHMainSourceBillType = []
+ this.arrayHMainSourceBillValue = []
+ Array.from(data).forEach(e => {
+ if (this.$t("SellOutBill_PDA.select option").lenth > 0){
+ for(var j = 0; j < this.$t("SellOutBill_PDA.select option").length; j++){
+ let HSourceBillType_FY = this.$t("SellOutBill_PDA.select option[" + j + "]").split("@");
+ if(e['HSourceBillType'] == HSourceBillType_FY[0]){
+ this.arrayHMainSourceBillType.push(HSourceBillType_FY[1])
+ }
}
}
- })
-
- this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
- this.arrayHMainSourceBillValue.push('-1')
- //濡傛灉鎵嬪伐褰曞叆涓嶇敤閫夋嫨婧愬崟
- if (this.arrayHMainSourceBillType[0] == '鎵嬪伐褰曞叆') {
- this.tabs = 1
- }
-
- this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
- this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
- } else {
- uni.showToast({
- icon: 'none',
- title: Message
- })
-
- }
- },
+ else{
+ this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
+ }
+ this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
+ })
+
+ this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
+ this.arrayHMainSourceBillValue.push('-1')
+ //濡傛灉鎵嬪伐褰曞叆涓嶇敤閫夋嫨婧愬崟
+ if (this.arrayHMainSourceBillType[0] == '鎵嬪伐褰曞叆') {
+ this.tabs = 1
+ }
+
+ this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
+ this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+
+ }
+ },
//閫夋嫨婧愬崟
HSourceBillNoChange(e) {
this.hform.HSourceBillNo = e
diff --git a/pages/xiaoshouchuku/SellOutBillList.vue b/pages/xiaoshouchuku/SellOutBillList.vue
index 4de64a2..878d724 100644
--- a/pages/xiaoshouchuku/SellOutBillList.vue
+++ b/pages/xiaoshouchuku/SellOutBillList.vue
@@ -139,7 +139,7 @@
},
onLoad() {
uni.setNavigationBarTitle({
- title: this.$t("SellOutBillList_PDA.title")
+ title: this.$t("SellOutBillList_PDA.title") == 'SellOutBillList_PDA.title' ? '閿�鍞嚭搴撳崟鍒楄〃' : this.$t("SellOutBillList_PDA.title")
})
//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
this.CheckModRight()
diff --git a/pages/zhijiediaobo/MoveStockBill.vue b/pages/zhijiediaobo/MoveStockBill.vue
index cb86cdf..343ba74 100644
--- a/pages/zhijiediaobo/MoveStockBill.vue
+++ b/pages/zhijiediaobo/MoveStockBill.vue
@@ -552,7 +552,7 @@
async onLoad(e) {
uni.setNavigationBarTitle({
- title: this.$t("MoveStockBill_PDA.title")
+ title: this.$t("MoveStockBill_PDA.title") == 'MoveStockBill_PDA.title' ? '鐩存帴璋冩嫧鍗�' : this.$t("MoveStockBill_PDA.title")
})
console.log(e, this.userInfo)
this.OperationType = e.OperationType
@@ -1263,12 +1263,17 @@
this.arrayHMainSourceBillType = []
this.arrayHMainSourceBillValue = []
Array.from(data).forEach(e => {
- for(var j = 0; j < this.$t("MoveStockBill_PDA.select option").length; j++){
- let HSourceBillType_FY = this.$t("MoveStockBill_PDA.select option[" + j + "]").split("@");
- if(e['HSourceBillType'] == HSourceBillType_FY[0]){
- this.arrayHMainSourceBillType.push(HSourceBillType_FY[1])
+ if (this.$t("MoveStockBill_PDA.select option").lenth > 0){
+ for(var j = 0; j < this.$t("MoveStockBill_PDA.select option").length; j++){
+ let HSourceBillType_FY = this.$t("MoveStockBill_PDA.select option[" + j + "]").split("@");
+ if(e['HSourceBillType'] == HSourceBillType_FY[0]){
+ this.arrayHMainSourceBillType.push(HSourceBillType_FY[1])
+ }
}
}
+ else{
+ this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
+ }
this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
})
diff --git a/pages/zhijiediaobo/MoveStockBillList.vue b/pages/zhijiediaobo/MoveStockBillList.vue
index dfb2010..dc67ed6 100644
--- a/pages/zhijiediaobo/MoveStockBillList.vue
+++ b/pages/zhijiediaobo/MoveStockBillList.vue
@@ -133,7 +133,7 @@
HStockOrgID: uni.getStorageSync('OrganizationID'),
},
billNoPlaceholder:this.$t("MoveStockBillList_PDA.billNoPlaceholder") == "MoveStockBillList_PDA.billNoPlaceholder" ? "璇疯緭鍏ュ崟鎹彿" : this.$t("MoveStockBillList_PDA.billNoPlaceholder"),
- sourceBillNoPlaceholder:this.$t("MoveStockBillList.sourceBillNoPlaceholder") == "MoveStockBillList_PDA.sourceBillNoPlaceholder" ? "璇疯緭鍏ユ簮鍗曠紪鍙�" : this.$t("MoveStockBillList_PDA.sourceBillNoPlaceholder"),
+ sourceBillNoPlaceholder:this.$t("MoveStockBillList_PDA.sourceBillNoPlaceholder") == "MoveStockBillList_PDA.sourceBillNoPlaceholder" ? "璇疯緭鍏ユ簮鍗曠紪鍙�" : this.$t("MoveStockBillList_PDA.sourceBillNoPlaceholder"),
sWhere: '',
listData: [],
showList: [],
@@ -147,7 +147,7 @@
},
onShow() {
uni.setNavigationBarTitle({
- title: this.$t("MoveStockBillList_PDA.title")
+ title: this.$t("MoveStockBillList_PDA.title") == 'MoveStockBillList_PDA.title' ? '鐩存帴璋冩嫧鍗曞垪琛�' : this.$t("MoveStockBillList_PDA.title")
})
//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
this.CheckModRight()
--
Gitblit v1.9.1