From 92f550dfcee260da85a9bdbc81d0185e08c80e14 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 24 三月 2026 10:22:16 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/caigouruku/POStockInBill.vue | 108 +++++++++++++++++++++++++++++------------------------
1 files changed, 59 insertions(+), 49 deletions(-)
diff --git a/pages/caigouruku/POStockInBill.vue b/pages/caigouruku/POStockInBill.vue
index 17a731c..ee9a556 100644
--- a/pages/caigouruku/POStockInBill.vue
+++ b/pages/caigouruku/POStockInBill.vue
@@ -5,7 +5,7 @@
<!-- <view class="title">鏉＄爜:</view> -->
<view class="title">{{ $t(`Gy.HBarCode`) == "Gy.HBarCode"?"鏉＄爜": $t(`Gy.HBarCode`) }}:</view>
<view class="right" style="width: 380rpx;">
- <input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜"
+ <input :focus="barCodeFocus" v-model="hform.HBarCode" :placeholder="$t(`Gy.HBarCode_Placeholder`)"
@confirm="getCode(hform.HBarCode)" />
</view>
<uni-icons type="scan"
@@ -15,13 +15,13 @@
<view class="form-item">
<view class="title">{{ $t(`Gy.HQty`) == "Gy.HQty"?"鏁伴噺": $t(`Gy.HQty`) }}:</view>
<view class="right">
- <input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
+ <input v-model="hform.HQty" :placeholder="$t(`Gy.HQty_Placeholder`)" />
</view>
</view>
<view class="form-item">
<view class="title">{{ $t(`Gy.HWHName`) == "Gy.HWHName"?"浠撳簱": $t(`Gy.HWHName`) }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨浠撳簱" v-model="hform.HWHName"
+ <uni-combox :candidates="arrayHWHName" :placeholder="$t(`Gy.HWHName_Placeholder`)" v-model="hform.HWHName"
@input="HWHNameChange"></uni-combox>
</view>
</view>
@@ -30,11 +30,11 @@
{{ $t(`Gy.HStockPlaceName`) == "Gy.HStockPlaceName"?"浠撲綅": $t(`Gy.HStockPlaceName`) }}:
</view>
<view class="right" v-show="true">
- <uni-combox :candidates="arrayHStockPlaceNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+ <uni-combox :candidates="arrayHStockPlaceNameComputed" :placeholder="$t(`Gy.HStockPlaceName_Placeholder`)"
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="$t(`Gy.OperationDisabled`)"
:disabled="!showHStockPlaceName" /></view>
</view>
@@ -62,13 +62,13 @@
<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
@change="HMainSourceBillTypeChange">
<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
- placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ :placeholder="$t(`Gy.HMainSourceBillType_Placeholder`)" />
<view class="picker-overlay"></view>
</picker>
</view>
<view class="righton" v-show="!showHMainSourceBillType">
<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
- placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ :placeholder="$t(`HMainSourceBillType_Placeholder`)" />
</view>
</view>
<view class="form-item">
@@ -79,7 +79,7 @@
<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
<input :focus="HSourceBillNoFocus" type="text" name="HSourceBillNo"
- v-model="hform.HSourceBillNo" @confirm="onSourceBillBlurHandler" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ v-model="hform.HSourceBillNo" @confirm="onSourceBillBlurHandler" :placeholder="$t(`Gy.HMainSourceBillNo_Placeholder`)" />
</view>
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
@@ -91,7 +91,7 @@
<view class="righton" v-show="!showHSourceBillNo">
- <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" :placeholder="$t(`Gy.HMainSourceBillNo_Placeholder`)" />
</view>
<!-- <view class="right" v-show="showHSourceBillNo">
<uni-combox ref="uniComboxSourceBill" :isFocus="HSourceBillNoFocus"
@@ -107,7 +107,7 @@
<view class="title">{{ $t(`Gy.HDate`) == "Gy.HDate"?"鏃ユ湡": $t(`Gy.HDate`) }}:</view>
<view class="right">
<picker mode="date" v-model="hform.HDate" @change="HDateChange">
- <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+ <input disabled v-model="hform.HDate" :placeholder="$t(`Gy.HDate_Placeholder`)" />
<view class="picker-overlay"></view>
</picker>
</view>
@@ -128,7 +128,7 @@
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁ID:</view>
+ <view class="title">{{$t("Gy.HInterID")}}:</view>
<view class="righton">
<input name="HInterID" disabled v-model="hform.HInterID" />
</view>
@@ -137,28 +137,28 @@
<view v-if="tabs == 1">
<view class="form-item">
- <view class="title">淇濈:</view>
+ <view class="title">{{$t("Gy.HKeeperName")}}:</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
+ <uni-combox :candidates="arrayHEmpName" :placeholder="$t('Gy.HKeeperName_Placeholder')" v-model="hform.HKeeperName"
@input="HKeeperNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">楠屾敹:</view>
+ <view class="title">{{$t("Gy.HSecManagerName")}}:</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
+ <uni-combox :candidates="arrayHEmpName" :placeholder="$t('Gy.HSecManagerName_Placeholder')" v-model="hform.HSecManagerName"
@input="HSecManagerNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">閮ㄩ棬:</view>
+ <view class="title">{{$t("Gy.HDeptName")}}:</view>
<view class="right">
- <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+ <uni-combox :candidates="arrayHDeptName" :placeholder="$t('Gy.HDeptName_Placeholder')" v-model="hform.HDeptName"
@input="HDeptNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">渚涘簲鍟�:</view>
+ <view class="title">{{$t("Gy.HSupName")}}:</view>
<!-- <view class="right" v-show="showHSupName">
<uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" v-model="hform.HSupName"
@input="HSupNameChange"></uni-combox>
@@ -168,7 +168,7 @@
</view>
</view>
<view class="form-item">
- <view class="title">缁勭粐:</view>
+ <view class="title">{{$t("Gy.HStockOrgName")}}:</view>
<view class="righton">
<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
</view>
@@ -180,39 +180,39 @@
<uni-card :title="item.鐗╂枡鍚嶇О" style="margin: 10px;" @tap="delMater(item, $event)">
<!-- 鐗╂枡浠ｇ爜浣滀负鍙偣鍑婚摼鎺� -->
<view class="card-header" @tap.stop="gotoInventoryQuery(item.鐗╂枡浠ｇ爜)">
- <text class="link-text">鐗╂枡浠ｇ爜锛歿{item.鐗╂枡浠ｇ爜}}</text>
+ <text class="link-text">{{$t(`${HModName}.鐗╂枡浠ｇ爜`)}}锛歿{item.鐗╂枡浠ｇ爜}}</text>
</view>
<view class="card-detail">
<view class="detail">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{$t(`${HModName}.婧愬崟鍗曞彿`)}}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail">
- <text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
+ <text>{{$t(`${HModName}.婧愬崟鏁伴噺`)}}锛�</text>{{item.婧愬崟鏁伴噺}}
</view>
<view class="detail">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{$t(`${HModName}.鏁伴噺`)}}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail">
- <text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
+ <text>{{$t(`${HModName}.鏉＄爜涓暟`)}}锛�</text>{{item.鏉＄爜涓暟}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ <text>{{$t(`${HModName}.瑙勬牸鍨嬪彿`)}}锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
<view class="detail" v-if="item.杈呭姪灞炴��">
- <text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+ <text>{{$t(`${HModName}.杈呭姪灞炴�)}}锛�</text>{{item.杈呭姪灞炴�}
</view>
<view class="detail" v-if="item.娆惧彿">
- <text>娆惧彿锛�</text>{{item.娆惧彿}}
+ <text>{{$t(`${HModName}.娆惧彿`)}}锛�</text>{{item.娆惧彿}}
</view>
<view class="detail" v-if="item.鍚堣鏁伴噺">
- <text>鍚堣鏁伴噺锛�</text>{{item.鍚堣鏁伴噺}}
+ <text>{{$t(`${HModName}.鍚堣鏁伴噺`)}}锛�</text>{{item.鍚堣鏁伴噺}}
</view>
<view class="detail" v-if="item.鍗曚环">
- <text>鍗曚环锛�</text>{{item.鍗曚环}}
+ <text>{{$t(`${HModName}.鍗曚环`)}}锛�</text>{{item.鍗曚环}}
</view>
<view class="detail" v-if="materMeta[0].HWHName && /鍏磋揪/.test(hform.HStockOrgName)">
- <text>浠撳簱锛�</text>{{materMeta[0].HWHName}}
+ <text>{{$t(`${HModName}.浠撳簱`)}}锛�</text>{{materMeta[0].HWHName}}
</view>
</view>
</uni-card>
@@ -222,55 +222,55 @@
<view v-if="tabs == 3">
<view class="form-item">
- <view class="title">鏉＄爜:</view>
+ <view class="title">{{$t("Gy.HBarCode_B")}}:</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("Gy.HMaterName_B")}}:</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("Gy.HMaterModel_B")}}:</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("Gy.HBatchNo_B")}}:</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("Gy.HUnitName_B")}}:</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("Gy.HQty_B")}}:</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("Gy.HTMQty_B")}}:</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("Gy.HWHName_B")}}:</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("Gy.HSPName_B")}}:</view>
<view class="righton">
<input disabled v-model="hform.HSPName_B" />
</view>
@@ -278,10 +278,10 @@
</view>
<view class="bottom-btn">
- <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button class="btn-a" size="mini" @tap="submit">{{$t("Gy.submit")}}</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("Gy.addNew")}}</button>
+ <button class="btn-c" size="mini" @tap="goBack">{{$t("Gy.goBack")}}</button>
</view>
</view>
<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
@@ -302,7 +302,9 @@
} from "@/utils/userRelationManager.js"
import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
-import { MpaasScan } from '../../utils/mpaasScan';
+ import {
+ MpaasScan
+ } from '../../utils/mpaasScan';
export default {
data() {
return {
@@ -752,6 +754,10 @@
} = res.data
if (count == 1) {
// console.log('data: ', data);
+ if(data.length == 0){
+ // 鏁版嵁搴撲腑娌℃湁閰嶇疆锛岄粯璁や娇鐢ㄦ湰鍦�
+ return
+ }
this.arrayHMainSourceBillType = []
this.arrayHMainSourceBillValue = []
Array.from(data).forEach(e => {
@@ -759,16 +765,20 @@
this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
})
- this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
- this.arrayHMainSourceBillValue.push('-1')
+ let trans = (this.$t(`${this.HModName}.HSourceBillType2`)).split("@")
+ console.log('trans: ',trans);
+ this.arrayHMainSourceBillType.push(trans[0])
+ this.arrayHMainSourceBillValue.push(trans[1])
this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
} else {
- uni.showToast({
- icon: 'none',
- title: Message
- })
+ // 鏁版嵁搴撲腑娌℃湁閰嶇疆锛屽垯浣跨敤鏈湴鐨勯厤缃�
+ for(let i = 0;i<this.HMainSourceBillType; i++) {
+ let transed = this.$t(`${this.HModName}.HSourceBillType${i}`).split("@")
+ this.arrayHMainSourceBillType.push(transed[0])
+ this.arrayHMainSourceBillValue.push(transed[1])
+ }
}
}
})
--
Gitblit v1.9.1