From 613247c5dc2cfb8dd163f0674e8909a40317ec26 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 23 三月 2026 15:33:09 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue | 150 +++--
pages/weiwailingliao/Kf_EntrustOutBill.vue | 146 +++--
pages/gongxuOut/Cj_StationOutBill_Standard.vue | 18
pages/gongxuOut/Cj_StationOutBillList.vue | 56 +
components/StationOutBillPopup/StationEntrustOutBillListPopup.vue | 454 ++++++++++++++++++
pages/weiwaigxOut/Cj_StationEntrustOutBillList.vue | 133 +----
pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP.vue | 63 +-
pages/weiwailingliao/Kf_EntrustOutBillList.vue | 159 +++---
components/ProcListPopup/ProcListPopup.vue | 11
pages/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue | 62 +
pages/index/login.vue | 2
pages/weiwaigxOut/Cj_StationEntrustOutBill.vue | 44 +
pages/Kf_MoveStockStepOutBill_CusBar/Kf_MoveStockStepOutBill_CusBar_APP.vue | 65 +
pages/weiwaigxIn/Cj_StationEntrustInBill.vue | 42 +
14 files changed, 977 insertions(+), 428 deletions(-)
diff --git a/components/ProcListPopup/ProcListPopup.vue b/components/ProcListPopup/ProcListPopup.vue
index 6084b3e..5d52f06 100644
--- a/components/ProcListPopup/ProcListPopup.vue
+++ b/components/ProcListPopup/ProcListPopup.vue
@@ -15,7 +15,10 @@
<view class="left">宸ュ簭浠ｇ爜: </view>
<view class="right">{{bill['宸ュ簭浠ｇ爜']}}</view>
</view>
-
+ <view class="item">
+ <view class="left">宸ュ簭搴忓垪: </view>
+ <view class="right">{{bill['宸ュ簭搴忓垪']}}</view>
+ </view>
</uni-card>
</view>
<view class="over" v-show="HBillList.length == 0">鏆傛棤鏁版嵁</view>
@@ -60,6 +63,10 @@
type: [String, Number],
required: true
},
+ HType:{
+ type:Number,
+ default:0//0琛ㄧず闈炲澶�1琛ㄧず濮斿
+ }
},
methods: {
popupChangeHandler(e) {
@@ -99,7 +106,7 @@
CommonUtils.doRequest(
"/Web/GetProcNoList", {
HInterID: this.HProcExchHInteID,
- sWhere: 0,
+ sWhere: this.HType,
UserID: this.userInfo["Czybm"],
},
(res) => {
diff --git a/components/StationOutBillPopup/StationEntrustOutBillListPopup.vue b/components/StationOutBillPopup/StationEntrustOutBillListPopup.vue
new file mode 100644
index 0000000..5ce9358
--- /dev/null
+++ b/components/StationOutBillPopup/StationEntrustOutBillListPopup.vue
@@ -0,0 +1,454 @@
+<template>
+ <view>
+ <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
+ <view class="form">
+ <!-- 鍚堟牸鏁伴噺 -->
+ <view class="form-item">
+ <view class="title">鍚堟牸鏁伴噺:</view>
+ <view class="right">
+ <input v-model="hform.HQty" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" />
+ </view>
+ </view>
+ <!-- 涓嶈壇鏁伴噺 -->
+ <view class="form-item">
+ <view class="title">涓嶈壇鏁伴噺:</view>
+ <view class="right">
+ <input v-model="hform.HBadCount" placeholder="璇疯緭鍏ヤ笉鑹暟閲�" />
+ </view>
+ </view>
+ <!-- 鎶ュ簾鏁伴噺 -->
+ <view class="form-item">
+ <view class="title">鎶ュ簾鏁伴噺:</view>
+ <view class="right">
+ <input v-model="hform.HWasterQty" placeholder="璇疯緭鍏ユ姤搴熸暟閲�" />
+ </view>
+ </view>
+ <!-- 鐢熶骇璧勬簮 -->
+ <view class="form-item">
+ <view class="title">鐢熶骇璧勬簮:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
+ @input="HSourceNameChange"></uni-combox>
+ </view>
+ </view>
+ <!-- 宸ヤ綔涓績
+ <view class="form-item">
+ <view class="title">宸ヤ綔涓績:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHCenterName" placeholder="璇烽�夋嫨宸ヤ綔涓績" v-model="hform.HCenterName"
+ @input="HCenterNameChange"></uni-combox>
+ </view>
+ </view> -->
+ <!-- 鐢熶骇鐝粍 -->
+ <view class="form-item">
+ <view class="title">鐢熶骇鐝粍:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHGroupName" placeholder="璇烽�夋嫨鐢熶骇鐝粍" v-model="hform.HGroupName"
+ @input="HGroupNameChange"></uni-combox>
+ </view>
+ </view>
+ <!-- 鎿嶄綔鍛� -->
+ <view class="form-item">
+ <view class="title"><text>*</text>鎿嶄綔鍛�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName"
+ @input="HEmpNameChange"></uni-combox>
+ </view>
+ </view>
+
+ <!-- 搴曢儴鎻愪氦鎸夐挳 -->
+ <view class="bottom-btn">
+ <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
+</template>
+
+<script>
+ import getDateTime from '@/utils/getdateTime.js';
+ import {
+ getUserInfo
+ } from "@/utils/auth.js";
+ import {
+ CommonUtils
+ } from '../../utils/common';
+
+ export default {
+ name: "BillListPopup_gongxuOut",
+ data() {
+ return {
+
+ userInfo: getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ // 涓嬫媺妗嗗�欓�夋暟缁�
+ arrayHSourceName: [],
+ HSourceNameList: [],
+ arrayHGroupName: [],
+ HGroupNameList: [],
+ arrayHEmpName: [],
+ HEmpNameList: [],
+ arrayHCenterName: [],
+ HCenterNameList: [],
+
+ hform: {
+ HInterID: '', // 鍐呴儴浣跨敤锛屼笉灞曠ず
+ HBillNo: '', // 鍐呴儴浣跨敤锛屼笉灞曠ず
+ HQty: '',
+ HBadCount: 0,
+ HWasterQty: 0,
+ HSourceName: '',
+ HSourceID: 0,
+ HCenterName: '',
+ HCenterID: 0,
+ HGroupName: '',
+ HGroupID: 0,
+ HEmpName: '',
+ HEmpID: 0,
+ }
+ }
+ },
+
+ mounted() {
+ this.getNewData(); // 鑾峰彇鏂板崟鍙�
+ this.getHSourceList(); // 鐢熶骇璧勬簮
+ this.getHGroupList(); // 鐢熶骇鐝粍
+ this.getHEmpList(); // 鎿嶄綔鍛�
+ this.getHCenterList(); // 宸ヤ綔涓績
+ this.getDefValByUser(); // 鐢ㄦ埛榛樿鍊�
+ },
+
+ methods: {
+ // 寮圭獥寮�鍏冲鐞�
+ popupChangeHandler(e) {
+ if (e.show === false) {
+ // 鍏抽棴鏃堕噸缃暟閲�
+ this.hform.HQty = '';
+ this.hform.HBadCount = 0;
+ this.hform.HWasterQty = 0;
+ this.getNewData();
+ }
+ },
+
+ // 鎵撳紑寮圭獥
+ showPopup(item) {
+ if(item.hmainid!="0")
+ {
+ this.hform.HInterID=item.hmainid
+ console.log(this.hform.HInterID)
+ }
+ else
+ {
+ this.hform.HInterID=item.HInterID
+ console.log(this.hform.HInterID)
+ }
+ this.hform.HQty=item.鎺ユ敹鍚堟牸鏁伴噺
+ this.hform.HWasterQty=item.鎶ュ簾鏁伴噺
+ this.hform.HBadCount=item.涓嶈壇鏁伴噺
+ this.hform.HSourceID=item.HSourceID
+
+ this.hform.HSourceID=item.HSourceID
+ this.hform.HSourceName=item.鐢熶骇璧勬簮
+ // this.hform.HCenterID=item.HCenterID
+ // this.hform.HCenterName=item.宸ヤ綔涓績
+ this.hform.HGroupID=item.HGroupID
+ this.hform.HGroupName=item.鐝粍
+ this.hform.HEmpID=item.HEmpID
+ this.hform.HEmpName=item.鎿嶄綔鍛�
+ this.$refs.popup.open();
+ },
+
+ // 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
+ getDefValByUser() {
+ uni.request({
+ url: this.serverUrl + '/Cj_StationInBill/GetDefValByUser',
+ method: "GET",
+ async: false,
+ data: {
+ "Czybm": this.userInfo.Czybm,
+ "Czymc": this.userInfo.Czymc
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ var data = res.data.data[0];
+ this.hform.HGroupID = data.HGroupID;
+ this.hform.HGroupName = data.鐢熶骇鐝粍鍚嶇О;
+ this.hform.HEmpID = data.HEmpID;
+ this.hform.HEmpName = data.鎿嶄綔鍛樺悕绉�;
+ this.hform.HSourceID = data.HSourceID;
+ this.hform.HSourceName = data.鐢熶骇璧勬簮鍚嶇О;
+ this.hform.HCenterID = data.HWorkCenterID;
+ this.hform.HCenterName = data.宸ヤ綔涓績鍚嶇О;
+ } else {
+ uni.showToast({
+ title: '鑾峰彇榛樿鍊煎け璐�',
+ icon: 'none'
+ });
+ }
+ },
+ fail: () => {
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ });
+ },
+ });
+ },
+
+ // 鐢熶骇璧勬簮鍒楄〃
+ getHSourceList() {
+ uni.request({
+ url: this.serverUrl + '/api/newBill/getSourceList',
+ data: { sWhere: '' },
+ success: (res) => {
+ if (res.data.code == 1) {
+ this.HSourceNameList = res.data.data.Gy_Source;
+ this.arrayHSourceName = this.HSourceNameList.map(item => item.鐢熶骇璧勬簮);
+ this.$forceUpdate();
+ } else {
+ uni.showToast({ title: res.data.Message, icon: 'none' });
+ }
+ },
+ fail: () => {
+ uni.showToast({ title: '鎺ュ彛璇锋眰澶辫触', icon: 'none' });
+ },
+ });
+ },
+ HSourceNameChange(e) {
+ const found = this.HSourceNameList.find(item => item.鐢熶骇璧勬簮 == e);
+ if (found) this.hform.HSourceID = found.HItemID;
+ },
+
+ // 鐢熶骇鐝粍鍒楄〃
+ getHGroupList() {
+ uni.request({
+ url: this.serverUrl + '/Web/GetProductionTeamList_Json',
+ data: { sWhere: "and HUSEORGID = " + uni.getStorageSync('OrganizationID') },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.HGroupNameList = res.data.data;
+ this.arrayHGroupName = this.HGroupNameList.map(item => item.鐝粍);
+ this.$forceUpdate();
+ } else {
+ uni.showToast({ title: res.data.Message, icon: 'none' });
+ }
+ },
+ fail: () => {
+ uni.showToast({ title: '鎺ュ彛璇锋眰澶辫触', icon: 'none' });
+ },
+ });
+ },
+ HGroupNameChange(e) {
+ const found = this.HGroupNameList.find(item => item.鐝粍 == e);
+ if (found) this.hform.HGroupID = found.HItemID;
+ },
+
+ // 鎿嶄綔鍛樺垪琛�
+ getHEmpList() {
+ uni.request({
+ url: this.serverUrl + '/Web/GetEmployeeList_Json',
+ data: {
+ Employee: '',
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.HEmpNameList = res.data.data;
+ this.arrayHEmpName = this.HEmpNameList.map(item => item.HName);
+ this.$forceUpdate();
+ } else {
+ uni.showToast({ title: res.data.Message, icon: 'none' });
+ }
+ },
+ fail: () => {
+ uni.showToast({ title: '鎺ュ彛璇锋眰澶辫触', icon: 'none' });
+ },
+ });
+ },
+ HEmpNameChange(e) {
+ const found = this.HEmpNameList.find(item => item.HName == e);
+ if (found) this.hform.HEmpID = found.HItemID;
+ },
+
+ // 宸ヤ綔涓績鍒楄〃
+ getHCenterList() {
+ uni.request({
+ url: this.serverUrl + '/api/newBill/getWorkCenterList',
+ data: { sWhere: '' },
+ success: (res) => {
+ if (res.data.code == 1) {
+ this.HCenterNameList = res.data.data.Gy_Source;
+ this.arrayHCenterName = this.HCenterNameList.map(item => item.宸ヤ綔涓績);
+ this.$forceUpdate();
+ } else {
+ uni.showToast({ title: res.data.Message, icon: 'none' });
+ }
+ },
+ fail: () => {
+ uni.showToast({ title: '鎺ュ彛璇锋眰澶辫触', icon: 'none' });
+ },
+ });
+ },
+ HCenterNameChange(e) {
+ const found = this.HCenterNameList.find(item => item.宸ヤ綔涓績 == e);
+ if (found) this.hform.HCenterID = found.HItemID;
+ },
+
+ // 鑾峰彇鏂板崟鎹彿锛堝唴閮ㄤ娇鐢級
+ getNewData() {
+ uni.request({
+ url: this.serverUrl + '/Web/GetMAXNum',
+ data: { HBillType: '3791' },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.hform.HInterID = res.data.data[0].HInterID;
+ this.hform.HBillNo = res.data.data[0].HBillNo;
+ } else {
+ uni.showToast({ title: res.data.Message, icon: 'none' });
+ }
+ },
+ fail: () => {
+ uni.showToast({ title: '鎺ュ彛璇锋眰澶辫触', icon: 'none' });
+ },
+ });
+ },
+
+ // 鎻愪氦鍓嶆牎楠�
+ preSubmitCheck() {
+ if (CommonUtils.isEmpty(this.hform.HQty)) {
+ return { pass: false, message: '鍚堟牸鏁伴噺涓嶈兘涓虹┖' };
+ }
+ if (CommonUtils.isEmpty(this.hform.HBadCount)) {
+ return { pass: false, message: '涓嶈壇鏁伴噺涓嶈兘涓虹┖' };
+ }
+ if (CommonUtils.isEmpty(this.hform.HWasterQty)) {
+ return { pass: false, message: '鎶ュ簾鏁伴噺涓嶈兘涓虹┖' };
+ }
+ if (!this.hform.HEmpName) {
+ return { pass: false, message: '璇烽�夋嫨鎿嶄綔鍛�' };
+ }
+ return { pass: true, message: '' };
+ },
+
+ // 鎻愪氦
+ submit() {
+ const { pass, message } = this.preSubmitCheck();
+ if (!pass) {
+ return uni.showToast({ icon: 'none', title: message });
+ }
+
+ uni.showLoading({ title: '鎻愪氦涓�...' });
+
+
+ const submitData = {
+ HInterID: this.hform.HInterID,
+ HBillNo: this.hform.HBillNo,
+ HQty: this.hform.HQty,
+ HBadCount: this.hform.HBadCount,
+ HWasterQty: this.hform.HWasterQty,
+ HSourceID: this.hform.HSourceID,
+ HSourceName: this.hform.HSourceName,
+ HCenterID: 0,
+ HCenterName: '',
+ HGroupID: this.hform.HGroupID,
+ HGroupName: this.hform.HGroupName,
+ HEmpID: this.hform.HEmpID,
+ HEmpName: this.hform.HEmpName,
+
+ };
+
+ uni.request({
+ url: this.serverUrl + '/Cj_StationEntrustOutBill/setOtherProperty',
+ method: 'POST',
+ data: {
+ oMain: JSON.stringify(submitData)+ ";" + uni.getStorageSync('HUserName'),
+
+ },
+ success: (res) => {
+ uni.hideLoading();
+ if (res.data.count == 1) {
+ uni.showToast({ title: '鎻愪氦鎴愬姛', icon: 'none' });
+ setTimeout(() => {
+ this.$refs.popup.close();
+ }, 1500);
+ } else {
+ uni.showToast({ title: res.data.Message, icon: 'none' });
+ }
+ },
+ fail: () => {
+ uni.hideLoading();
+ uni.showToast({ title: '鎺ュ彛璇锋眰澶辫触', icon: 'none' });
+ },
+ });
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .form {
+ box-sizing: border-box;
+ border-radius: 15rpx 15rpx 0 0;
+ padding: 20rpx 20rpx 160rpx 20rpx;
+ background-color: #fff;
+ display: flex;
+ flex-direction: column;
+ gap: 10rpx;
+ overflow-y: auto;
+ // max-height: 70vh;
+ max-height: calc(80vh - 120px);
+ }
+
+ .form-item {
+ display: flex;
+ align-items: center;
+ font-size: 30rpx;
+ padding: 6rpx 0;
+
+ .title {
+ width: 180rpx;
+ flex-shrink: 0;
+
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
+
+ .right {
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ }
+
+ input, .uni-combox {
+ width: 100%;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+ }
+
+ .bottom-btn {
+ width: 100%;
+ box-sizing: border-box;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ background-color: #fff;
+ box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+ padding: 30rpx 40rpx 40rpx 40rpx;
+ display: flex;
+ justify-content: center;
+
+ button {
+ border-radius: 50rpx;
+ width: 300rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ background-color: #3A78FF;
+ color: #fff;
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP.vue b/pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP.vue
index c5aa745..059f5f1 100644
--- a/pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP.vue
+++ b/pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP.vue
@@ -2,28 +2,28 @@
<view>
<!-- 鍩烘湰淇℃伅 -->
<view class="form">
- <view class="form-item">
- <view class="title">
- 浼犵エ:
- </view>
- <view class="right">
- <input type="text" v-model="hform.HCP">
- </view>
- <view class="icon-wrapper">
- <uni-icons type="scan" size="20" @click="qrCodeDisplay('HCP')"></uni-icons>
- </view>
- </view>
- <view class="form-item">
- <view class="title">
- 鏉＄爜:
- </view>
- <view class="right">
- <input type="text" v-model="hform.HBarCode" @confirm="GetMessageByBarCode">
- </view>
- <view class="icon-wrapper">
- <uni-icons type="scan" size="20" @click="qrCodeDisplay('BarCode')"></uni-icons>
- </view>
- </view>
+ <view class="form-item">
+ <view class="title">
+ 浼犵エ:
+ </view>
+ <view class="right">
+ <input :focus="hcpFocus" type="text" v-model="hform.HCP" @confirm="handleHCPConfirm">
+ </view>
+ <view class="icon-wrapper">
+ <uni-icons type="scan" size="20" @click="qrCodeDisplay('HCP')"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">
+ 鏉＄爜:
+ </view>
+ <view class="right">
+ <input :focus="barCodeFocus" type="text" v-model="hform.HBarCode" @confirm="handleBarCodeConfirm">
+ </view>
+ <view class="icon-wrapper">
+ <uni-icons type="scan" size="20" @click="qrCodeDisplay('BarCode')"></uni-icons>
+ </view>
+ </view>
<view class="form-item">
<view class="title">
鏁伴噺:
@@ -401,7 +401,8 @@
data() {
return {
tabs: 0,
-
+ hcpFocus: false,
+ barCodeFocus: false,
btnTop: 0,
tabsBottom: 0,
HModName: "Kf_MoveStockBill_CusBar_APP",
@@ -549,7 +550,21 @@
}
},
methods: {
- // 鑾峰彇鍗曟嵁瀛愮被鍨�
+ handleBarCodeConfirm() {
+ this.GetMessageByBarCode();
+ this.hform.HBarCode = '';
+ this.hform.HCP = '';
+ setTimeout(() => {
+ this.barCodeFocus = false;
+ this.hcpFocus = true;
+ }, 100);
+ },
+ handleHCPConfirm() {
+ setTimeout(() => {
+ this.hcpFocus = false;
+ this.barCodeFocus = true;
+ }, 100);
+ },
async set_InitBillSubType(){
try{
let res = await CommonUtils.doRequest2Async({
diff --git a/pages/Kf_MoveStockStepOutBill_CusBar/Kf_MoveStockStepOutBill_CusBar_APP.vue b/pages/Kf_MoveStockStepOutBill_CusBar/Kf_MoveStockStepOutBill_CusBar_APP.vue
index 27c2626..67d9e90 100644
--- a/pages/Kf_MoveStockStepOutBill_CusBar/Kf_MoveStockStepOutBill_CusBar_APP.vue
+++ b/pages/Kf_MoveStockStepOutBill_CusBar/Kf_MoveStockStepOutBill_CusBar_APP.vue
@@ -2,28 +2,28 @@
<view>
<!-- 鍩烘湰淇℃伅 -->
<view class="form">
- <view class="form-item">
- <view class="title">
- 浼犵エ:
- </view>
- <view class="right">
- <input type="text" v-model="hform.HCP">
- </view>
- <view class="icon-wrapper">
- <uni-icons type="scan" size="20" @click="qrCodeDisplay('HCP')"></uni-icons>
- </view>
- </view>
- <view class="form-item">
- <view class="title">
- 鏉＄爜:
- </view>
- <view class="right">
- <input type="text" v-model="hform.HBarCode" @confirm="GetMessageByBarCode">
- </view>
- <view class="icon-wrapper">
- <uni-icons type="scan" size="20" @click="qrCodeDisplay('BarCode')"></uni-icons>
- </view>
- </view>
+ <view class="form-item">
+ <view class="title">
+ 浼犵エ:
+ </view>
+ <view class="right">
+ <input :focus="hcpFocus" type="text" v-model="hform.HCP" @confirm="handleHCPConfirm">
+ </view>
+ <view class="icon-wrapper">
+ <uni-icons type="scan" size="20" @click="qrCodeDisplay('HCP')"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">
+ 鏉＄爜:
+ </view>
+ <view class="right">
+ <input :focus="barCodeFocus" type="text" v-model="hform.HBarCode" @confirm="handleBarCodeConfirm">
+ </view>
+ <view class="icon-wrapper">
+ <uni-icons type="scan" size="20" @click="qrCodeDisplay('BarCode')"></uni-icons>
+ </view>
+ </view>
<view class="form-item">
<view class="title">
鏁伴噺:
@@ -401,7 +401,8 @@
data() {
return {
tabs: 0,
-
+ hcpFocus: false,
+ barCodeFocus: false,
btnTop: 0,
tabsBottom: 0,
HModName: "Kf_MoveStockBill_CusBar_APP",
@@ -549,6 +550,21 @@
}
},
methods: {
+ handleBarCodeConfirm() {
+ this.GetMessageByBarCode();
+ this.hform.HBarCode = '';
+ this.hform.HCP = '';
+ setTimeout(() => {
+ this.barCodeFocus = false;
+ this.hcpFocus = true;
+ }, 100);
+ },
+ handleHCPConfirm() {
+ setTimeout(() => {
+ this.hcpFocus = false;
+ this.barCodeFocus = true;
+ }, 100);
+ },
// 鑾峰彇鍗曟嵁瀛愮被鍨�
async set_InitBillSubType(){
try{
@@ -1691,6 +1707,9 @@
// this.DisBillEntryList(sBarCodePrefix)
}
}
+ setTimeout(() => {
+ this.$refs.hcpInput?.focus();
+ }, 800);
},
// 鏍规嵁瀹㈡埛 浼犵エ 鏉＄爜杩涜楠岃瘉
async getChechBarCodeAndCPJSON(sHCusID, sHCP, sBarCode, sBarCodePrefix) {
diff --git a/pages/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue b/pages/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
index 9c360c8..5aba085 100644
--- a/pages/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
+++ b/pages/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
@@ -2,28 +2,28 @@
<view>
<!-- 鍩烘湰淇℃伅 -->
<view class="form">
- <view class="form-item">
- <view class="title">
- 浼犵エ:
- </view>
- <view class="right">
- <input type="text" v-model="hform.HCP">
- </view>
- <view class="icon-wrapper">
- <uni-icons type="scan" size="20" @click="qrCodeDisplay('HCP')"></uni-icons>
- </view>
- </view>
- <view class="form-item">
- <view class="title">
- 鏉＄爜:
- </view>
- <view class="right">
- <input type="text" v-model="hform.HBarCode" @confirm="GetMessageByBarCode">
- </view>
- <view class="icon-wrapper">
- <uni-icons type="scan" size="20" @click="qrCodeDisplay('BarCode')"></uni-icons>
- </view>
- </view>
+ <view class="form-item">
+ <view class="title">
+ 浼犵エ:
+ </view>
+ <view class="right">
+ <input :focus="hcpFocus" type="text" v-model="hform.HCP" @confirm="handleHCPConfirm">
+ </view>
+ <view class="icon-wrapper">
+ <uni-icons type="scan" size="20" @click="qrCodeDisplay('HCP')"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">
+ 鏉＄爜:
+ </view>
+ <view class="right">
+ <input :focus="barCodeFocus" type="text" v-model="hform.HBarCode" @confirm="handleBarCodeConfirm">
+ </view>
+ <view class="icon-wrapper">
+ <uni-icons type="scan" size="20" @click="qrCodeDisplay('BarCode')"></uni-icons>
+ </view>
+ </view>
<view class="form-item">
<view class="title">
鏁伴噺:
@@ -336,7 +336,8 @@
data() {
return {
tabs: 0,
-
+ hcpFocus: false,
+ barCodeFocus: false,
btnTop: 0,
tabsBottom: 0,
HModName: "Sb_EqpMaintenanceBill",
@@ -459,6 +460,21 @@
}
},
methods: {
+ handleBarCodeConfirm() {
+ this.GetMessageByBarCode();
+ this.hform.HBarCode = '';
+ this.hform.HCP = '';
+ setTimeout(() => {
+ this.barCodeFocus = false;
+ this.hcpFocus = true;
+ }, 100);
+ },
+ handleHCPConfirm() {
+ setTimeout(() => {
+ this.hcpFocus = false;
+ this.barCodeFocus = true;
+ }, 100);
+ },
// 鎵撳紑閫夋簮鍗曢〉闈�
openSourceBillSelector() {
this.$refs.billList.showPopup()
diff --git a/pages/gongxuOut/Cj_StationOutBillList.vue b/pages/gongxuOut/Cj_StationOutBillList.vue
index af2df27..0729de6 100644
--- a/pages/gongxuOut/Cj_StationOutBillList.vue
+++ b/pages/gongxuOut/Cj_StationOutBillList.vue
@@ -2,6 +2,17 @@
<view class="content">
<view class="form">
<view class="form-item">
+ <view class="title">娴佽浆鍗″彿:</view>
+ <view class="right">
+ <input v-model="hform.HProcExchBillNo" placeholder="璇疯緭鍏ュ伐搴忔祦杞崱鍙�" />
+ </view>
+ <view>
+ <uni-icons type="scan"
+ style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;font-weight: 500;"
+ size="20" @click="toScanCode"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
<view class="title">鐘舵��:</view>
<view class="right">
<picker :range="arrayStatus" :value="hform.HStatus" @change="HStatusChange">
@@ -38,12 +49,7 @@
<input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
</view>
</view>
- <view class="form-item">
- <view class="title">娴佽浆鍗″彿:</view>
- <view class="right">
- <input v-model="hform.HProcExchBillNo" placeholder="璇疯緭鍏ュ伐搴忔祦杞崱鍙�" />
- </view>
- </view>
+
<view class="form-item">
<view class="title">浜у搧浠ｇ爜:</view>
<view class="right">
@@ -215,16 +221,16 @@
</view>
<view class="op" v-if="operations == index">
- <button class="op1" size="mini" plain @tap.stop="check(item)">瀹℃牳</button>
+ <button class="op1" size="mini" plain @tap.stop="check(item)" v-if="item.瀹℃牳浜�===''">瀹℃牳</button>
<!-- <button class="op2" size="mini" plain @tap.stop="antiCheck(item)">鍙嶅鏍�</button> -->
<!-- <button class="op1" size="mini" plain @tap.stop="qcCheck(item)">宸ュ簭妫�</button> -->
- <button class="op3" size="mini" plain @tap.stop="edit(item)" v-if="true">缂栬緫</button>
+ <button class="op3" size="mini" plain @tap.stop="edit(item)" v-if="item.瀹℃牳浜�===''" >缂栬緫</button>
<button class="op4" size="mini" plain @tap.stop="del(item)" v-if="false">鍒犻櫎</button>
<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
</uni-card>
</view>
-
+ <StationOutBillPopup ref="billList"> </StationOutBillPopup>
<view class="over" v-if="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>
@@ -233,7 +239,9 @@
<script>
import { getUserInfo } from "@/utils/auth.js";
+ import StationOutBillPopup from "../../components/StationOutBillPopup/StationEntrustOutBillListPopup.vue"
export default {
+ components:{StationOutBillPopup},
data() {
return {
userInfo:getUserInfo(),
@@ -288,6 +296,21 @@
let eindex = parseInt(page) * 20
let newList = list.slice(sindex,eindex)
return newList
+ },
+ async toScanCode() {
+ var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+ mpaasScanModule.mpaasScan({
+ 'hideAlbum': true,
+ 'timeoutInterval':'10', //瓒呮椂鏃堕棿
+ 'timeoutText':'鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ },(ret) => {
+ console.log(ret.resp_result)
+ if (this.CommonUtils.isEmpty(ret.resp_result) === false) {
+ console.log('鏉＄爜鍐呭锛�' + ret.resp_result);
+ this.hform.HProcExchBillNo = ret.resp_result
+ this.search()
+ }
+ })
},
getList(){
this.sWhere += ` and 鍒跺崟浜� like N'%${this.userInfo.Czymc}'`
@@ -513,15 +536,12 @@
}
});
},
- // //瀹℃牳
- // check(item){
- // console.log(item)
- // if (item.HBillStatus > 0) {
- // uni.showToast({
- // title:'鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒'
- // })
- // }
- // },
+ //瀹℃牳
+ check(item){
+ console.log(item)
+ this.$refs.billList.showPopup(item)
+
+ },
// //鍙嶅鏍�
// antiCheck(item){
diff --git a/pages/gongxuOut/Cj_StationOutBill_Standard.vue b/pages/gongxuOut/Cj_StationOutBill_Standard.vue
index 276a443..e309252 100644
--- a/pages/gongxuOut/Cj_StationOutBill_Standard.vue
+++ b/pages/gongxuOut/Cj_StationOutBill_Standard.vue
@@ -666,8 +666,8 @@
//this.getHMaterList()
//this.getHProcList()
//this.getHSupList()
- //this.getHSourceList()
- //this.getHGroupList()
+ this.getHSourceList()
+ this.getHGroupList()
this.getHEmpList()
this.getHCenterList()
@@ -991,12 +991,7 @@
this.arrayHSourceName[i] = res.data.data.Gy_Source[i].鐢熶骇璧勬簮
}
this.$forceUpdate();
- } else {
- uni.showToast({
- title: res.data.msg,
- icon: 'none'
- })
- }
+ }
},
fail: (res) => {
console.log(res);
@@ -1057,12 +1052,7 @@
this.arrayHGroupName[i] = res.data.data[i].鐝粍
}
this.$forceUpdate();
- } else {
- uni.showToast({
- title: "鐝粍鑾峰彇澶辫触"+res.data.Message,
- icon: 'none'
- })
- }
+ }
},
fail: (res) => {
console.log(res);
diff --git a/pages/index/login.vue b/pages/index/login.vue
index b0f00b3..dc7e092 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -170,7 +170,7 @@
},
methods: {
async ApplyLanguagePack(lang, forceUpdate = false) {
- // 璇诲彇璇█鍖呭苟鍔犺浇
+ // // 璇诲彇璇█鍖呭苟鍔犺浇
let {
data,
getRemoteFile
diff --git a/pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue b/pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue
index 1615652..d2dddb7 100644
--- a/pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue
+++ b/pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue
@@ -2,9 +2,9 @@
<view>
<view class="form">
<view class="form-item">
- <view class="title">鏉＄爜:</view>
+ <view class="title">{{ $t("Kf_MateOutBill_PDA.BarCode") == "Kf_MateOutBill_PDA.BarCode" ? "鏉＄爜" : $t("Kf_MateOutBill_PDA.BarCode") }}:</view>
<view class="right" style="width: 380rpx;">
- <input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜"
+ <input :focus="barCodeFocus" v-model="hform.HBarCode" :placeholder="placeholder_BarCode"
@confirm="getCode(hform.HBarCode)" />
</view>
<view class="icon-wrapper">
@@ -12,41 +12,41 @@
</view>
</view>
<view class="form-item">
- <view class="title">鏁伴噺:</view>
+ <view class="title">{{ $t("Kf_MateOutBill_PDA.Qty") == "Kf_MateOutBill_PDA.Qty" ? "鏁伴噺" : $t("Kf_MateOutBill_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("Kf_MateOutBill_PDA.Warehouse") == "Kf_MateOutBill_PDA.Warehouse" ? "浠撳簱" : $t("Kf_MateOutBill_PDA.Warehouse") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" 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">浠撲綅:</view>
+ <view class="title">{{ $t("Kf_MateOutBill_PDA.StockPlace") == "Kf_MateOutBill_PDA.StockPlace" ? "浠撲綅" : $t("Kf_MateOutBill_PDA.StockPlace") }}:</view>
<view class="right" v-show="HIsStockMgr">
- <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+ <uni-combox :candidates="HStockPlaceNameListComputed" :placeholder="placeholder_StockPlace"
v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
@confirm='HStockPlaceNameScan'></uni-combox>
</view>
<view class="righton" v-show="!HIsStockMgr">
- <input v-model="hform.HStockPlaceName" :disabled="!HIsStockMgr" placeholder="涓嶅彲鎿嶄綔" />
+ <input v-model="hform.HStockPlaceName" :disabled="!HIsStockMgr" :placeholder="unOperate" />
</view>
</view>
- <view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
- <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 == 4 ? 'on':''" @tap="tabs = 4">涓嬫灦淇℃伅</view>
- </view>
-
+ <view class="tabs">
+ <view :class="tabs == 0 ? 'on' : ''" @tap="tabs = 0">{{ $t("Kf_MateOutBill_PDA.selectSource") == "Kf_MateOutBill_PDA.selectSource" ? "閫夋嫨婧愬崟" : $t("Kf_MateOutBill_PDA.selectSource") }}</view>
+ <view :class="tabs == 1 ? 'on' : ''" @tap="tabs = 1">{{ $t("Kf_MateOutBill_PDA.tableInfo") == "Kf_MateOutBill_PDA.tableInfo" ? "琛ㄥご淇℃伅" : $t("Kf_MateOutBill_PDA.tableInfo") }}</view>
+ <view :class="tabs == 2 ? 'on' : ''" @tap="tabs = 2">{{ $t("Kf_MateOutBill_PDA.materInfo") == "Kf_MateOutBill_PDA.materInfo" ? "鐗╂枡淇℃伅" : $t("Kf_MateOutBill_PDA.materInfo") }}</view>
+ <view :class="tabs == 3 ? 'on' : ''" @tap="tabs = 3">{{ $t("Kf_MateOutBill_PDA.barInfo") == "Kf_MateOutBill_PDA.barInfo" ? "鏉＄爜淇℃伅" : $t("Kf_MateOutBill_PDA.barInfo") }}</view>
+ <view :class="tabs == 4 ? 'on' : ''" @tap="tabs = 4">{{ $t("Kf_MateOutBill_PDA.removeShelvesInfo") == "Kf_MateOutBill_PDA.removeShelvesInfo" ? "涓嬫灦淇℃伅" : $t("Kf_MateOutBill_PDA.removeShelvesInfo") }}</view>
+ </view>
+
<view v-if="tabs == 0">
<view class="form-item">
- <view class="title">婧愬崟绫诲瀷:</view>
+ <view class="title">{{ $t("Kf_MateOutBill_PDA.SourceBillType") == "Kf_MateOutBill_PDA.SourceBillType" ? "婧愬崟绫诲瀷" : $t("Kf_MateOutBill_PDA.SourceBillType") }}:</view>
<view class="right" v-show="showHMainSourceBillType">
<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
@change="HMainSourceBillTypeChange">
@@ -61,12 +61,12 @@
</view>
</view>
<view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="title">{{ $t("Kf_MateOutBill_PDA.SourceBillNo") == "Kf_MateOutBill_PDA.SourceBillNo" ? "婧愬崟鍗曞彿" : $t("Kf_MateOutBill_PDA.SourceBillNo") }}:</view>
<view class="right" v-show="showHSourceBillNo">
<!-- <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="placeholder_SourceBillNo" />
</view>
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
@@ -74,18 +74,18 @@
</view>
<view class="righton" v-show="!showHSourceBillNo">
- <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" :placeholder="placeholder_SourceBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">鍏堣繘鍏堝嚭浠�:</view>
+ <view class="title">{{ $t("Kf_MateOutBill_PDA.FIFOwarehouse") == "Kf_MateOutBill_PDA.FIFOwarehouse" ? "鍏堣繘鍏堝嚭浠�" : $t("Kf_MateOutBill_PDA.FIFOwarehouse") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨" v-model="hform.HFIFOWHName"
+ <uni-combox :candidates="arrayHWHName" :placeholder="placeholder_FIFOwarehouse" v-model="hform.HFIFOWHName"
@input="HFIFOWHNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">鏃ユ湡:</view>
+ <view class="title">{{ $t("Kf_MateOutBill_PDA.Date") == "Kf_MateOutBill_PDA.Date" ? "鏃ユ湡" : $t("Kf_MateOutBill_PDA.Date") }}</view>
<view class="right">
<picker mode="date" v-model="hform.HDate" @change="HDateChange">
<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
@@ -94,13 +94,13 @@
</view>
</view>
<view class="form-item">
- <view class="title">鍒跺崟浜�:</view>
+ <view class="title">{{ $t("Kf_MateOutBill_PDA.Maker") == "Kf_MateOutBill_PDA.Maker" ? "鍒跺崟浜�" : $t("Kf_MateOutBill_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("Kf_MateOutBill_PDA.BillNo") == "Kf_MateOutBill_PDA.BillNo" ? "鍗曟嵁鍙�" : $t("Kf_MateOutBill_PDA.BillNo") }}:</view>
<view class="righton">
<input name="HBillNo" disabled v-model="hform.HBillNo" />
</view>
@@ -109,7 +109,7 @@
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁ID:</view>
+ <view class="title">{{ $t("Kf_MateOutBill_PDA.BillID") == "Kf_MateOutBill_PDA.BillID" ? "鍗曟嵁ID" : $t("Kf_MateOutBill_PDA.BillID") }}:</view>
<view class="righton">
<input name="HInterID" disabled v-model="hform.HInterID" />
</view>
@@ -118,23 +118,23 @@
<view v-if="tabs == 1">
<view class="form-item">
- <view class="title">淇濈:</view>
+ <view class="title">{{ $t("Kf_MateOutBill_PDA.Keeper") == "Kf_MateOutBill_PDA.Keeper" ? "淇濈" : $t("Kf_MateOutBill_PDA.Keeper") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
+ <uni-combox :candidates="arrayHEmpName" :placeholder="placeholder_Keeper" v-model="hform.HKeeperName"
@input="HKeeperNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">楠屾敹:</view>
+ <view class="title">{{ $t("Kf_MateOutBill_PDA.SecManager") == "Kf_MateOutBill_PDA.SecManager" ? "楠屾敹" : $t("Kf_MateOutBill_PDA.SecManager") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
+ <uni-combox :candidates="arrayHEmpName" :placeholder="placeholder_SecManager" v-model="hform.HSecManagerName"
@input="HSecManagerNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">閮ㄩ棬:</view>
+ <view class="title">{{ $t("Kf_MateOutBill_PDA.Dept") == "Kf_MateOutBill_PDA.Dept" ? "閮ㄩ棬" : $t("Kf_MateOutBill_PDA.Dept") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+ <uni-combox :candidates="arrayHDeptName" :placeholder="placeholder_Dept" v-model="hform.HDeptName"
@input="HDeptNameChange"></uni-combox>
</view>
</view>
@@ -149,7 +149,7 @@
</view>
</view> -->
<view class="form-item">
- <view class="title">缁勭粐:</view>
+ <view class="title">{{ $t("Kf_MateOutBill_PDA.StockOrg") == "Kf_MateOutBill_PDA.StockOrg" ? "缁勭粐" : $t("Kf_MateOutBill_PDA.StockOrg") }}:</view>
<view class="righton">
<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
</view>
@@ -161,33 +161,33 @@
<uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠ｇ爜" style="margin: 10px;" @tap="delMater(item)">
<view class="card-detail">
<view class="detail">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("Kf_MateOutBill_PDA.table_SourceBillNo") == "Kf_MateOutBill_PDA.table_SourceBillNo" ? "婧愬崟鍗曞彿" : $t("Kf_MateOutBill_PDA.table_SourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail">
- <text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
+ <text>{{ $t("Kf_MateOutBill_PDA.table_SourceBillQty") == "Kf_MateOutBill_PDA.table_SourceBillQty" ? "婧愬崟鏁伴噺" : $t("Kf_MateOutBill_PDA.table_SourceBillQty") }}锛�</text>{{item.婧愬崟鏁伴噺}}
</view>
<view class="detail">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("Kf_MateOutBill_PDA.table_BarQty") == "Kf_MateOutBill_PDA.table_BarQty" ? "鏁伴噺" : $t("Kf_MateOutBill_PDA.table_BarQty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.鍚堣鏁伴噺">
- <text>鍚堣鏁伴噺锛�</text>{{item.鍚堣鏁伴噺}}
+ <text>{{ $t("Kf_MateOutBill_PDA.TotalQty") == "Kf_MateOutBill_PDA.TotalQty" ? "鍚堣鏁伴噺" : $t("Kf_MateOutBill_PDA.TotalQty") }}锛�</text>{{item.鍚堣鏁伴噺}}
</view>
<view class="detail">
- <text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
+ <text>{{ $t("Kf_MateOutBill_PDA.table_BarNum") == "Kf_MateOutBill_PDA.table_BarNum" ? "鏉＄爜涓暟" : $t("Kf_MateOutBill_PDA.table_BarNum") }}锛�</text>{{item.鏉＄爜涓暟}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ <text>{{ $t("Kf_MateOutBill_PDA.table_MaterModel") == "Kf_MateOutBill_PDA.table_MaterModel" ? "瑙勬牸鍨嬪彿" : $t("Kf_MateOutBill_PDA.table_MaterModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
<view class="detail" v-if="item.杈呭姪灞炴��">
- <text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+ <text>{{ $t("Kf_MateOutBill_PDA.table_Aux") == "Kf_MateOutBill_PDA.table_Aux" ? "杈呭姪灞炴��" : $t("Kf_MateOutBill_PDA.table_Aux") }}锛�</text>{{item.杈呭姪灞炴�}
</view>
<view class="detail" v-if="item.娆惧彿">
- <text>娆惧彿锛�</text>{{item.娆惧彿}}
+ <text>{{ $t("Kf_MateOutBill_PDA.StyleNo") == "Kf_MateOutBill_PDA.StyleNo" ? "娆惧彿" : $t("Kf_MateOutBill_PDA.StyleNo") }}锛�</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("Kf_MateOutBill_PDA.noData") == "Kf_MateOutBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("Kf_MateOutBill_PDA.noData") }}</view>
</view>
<view v-if="tabs == 4">
@@ -196,84 +196,84 @@
@tap="delMater(item)">
<view class="card-detail">
<view class="detail">
- <text>鏁伴噺锛�</text>{{item.HQty}}
+ <text>{{ $t("Kf_MateOutBill_PDA.Qty") == "Kf_MateOutBill_PDA" ? "鏁伴噺" : $t("Kf_MateOutBill_PDA.Qty") }}锛�</text>{{item.HQty}}
</view>
<view class="detail">
- <text>涓嬫灦鏁伴噺锛�</text>{{item.HQtyMust}}
+ <text>{{ $t("Kf_MateOutBill_PDA.PutawayQty") == "Kf_MateOutBill_PDA.PutawayQty" ? "涓嬫灦鏁伴噺" : $t("Kf_MateOutBill_PDA.PutawayQty") }}锛�</text>{{item.HQtyMust}}
</view>
<view class="detail">
- <text>浠撳簱锛�</text>{{item.HWhName}}
+ <text>{{ $t("Kf_MateOutBill_PDA.Warehouse") == "Kf_MateOutBill_PDA.Warehouse" ? "浠撳簱" : $t("Kf_MateOutBill_PDA.Warehouse") }}锛�</text>{{item.HWhName}}
</view>
<view class="detail">
- <text>浠撲綅锛�</text>{{item.HSPName}}
+ <text>{{ $t("Kf_MateOutBill_PDA.StockPlace") == "Kf_MateOutBill_PDA.StockPlace" ? "浠撲綅" : $t("Kf_MateOutBill_PDA.StockPlace") }}锛�</text>{{item.HSPName}}
</view>
<view class="detail">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.HMaterModel}}
+ <text>{{ $t("Kf_MateOutBill_PDA.MaterModel") == "Kf_MateOutBill_PDA.MaterModel" ? "瑙勬牸鍨嬪彿" : $t("Kf_MateOutBill_PDA.MaterModel") }}锛�</text>{{item.HMaterModel}}
</view>
<view class="detail" v-if="item.HBatchNo">
- <text>鎵瑰彿锛�</text>{{item.HBatchNo}}
+ <text>{{ $t("Kf_MateOutBill_PDA.BatchNo") == "Kf_MateOutBill_PDA.BatchNo" ? "鎵瑰彿" : $t("Kf_MateOutBill_PDA.BatchNo") }}锛�</text>{{item.HBatchNo}}
</view>
<view class="detail" v-if="item.HAuxPropName">
- <text>杈呭姪灞炴�э細</text>{{item.HAuxPropName}}
+ <text>{{ $t("Kf_MateOutBill_PDA.table_Aux") == "Kf_MateOutBill_PDA.table_Aux" ? "杈呭姪灞炴��" : $t("Kf_MateOutBill_PDA.table_Aux") }}锛�</text>{{item.HAuxPropName}}
</view>
</view>
</uni-card>
</view>
- <view class="over" v-if="FIFOlist.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="FIFOlist.length == 0">{{ $t("Kf_MateOutBill_PDA.noData") == "Kf_MateOutBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("Kf_MateOutBill_PDA.noData") }}</view>
</view>
<view v-if="tabs == 3">
<view class="form-item">
- <view class="title">鏉＄爜:</view>
+ <view class="title">{{ $t("Kf_MateOutBill_PDA.BarCode") == "Kf_MateOutBill_PDA.BarCode" ? "鏉＄爜" : $t("Kf_MateOutBill_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("Kf_MateOutBill_PDA.Material") == "Kf_MateOutBill_PDA.Material" ? "鐗╂枡" : $t("Kf_MateOutBill_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("Kf_MateOutBill_PDA.MaterModel") == "Kf_MateOutBill_PDA.MaterModel" ? "瑙勬牸" : $t("Kf_MateOutBill_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("Kf_MateOutBill_PDA.BatchNo") == "Kf_MateOutBill_PDA.BatchNo" ? "鎵规" : $t("Kf_MateOutBill_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("Kf_MateOutBill_PDA.Unit") == "Kf_MateOutBill_PDA.Unit" ? "鍗曚綅" : $t("Kf_MateOutBill_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("Kf_MateOutBill_PDA.Qty") == "Kf_MateOutBill_PDA.Qty" ? "鏁伴噺" : $t("Kf_MateOutBill_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("Kf_MateOutBill_PDA.Capacity") == "Kf_MateOutBill_PDA.Capacity" ? "瀹归噺" : $t("Kf_MateOutBill_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("Kf_MateOutBill_PDA.Warehouse") == "Kf_MateOutBill_PDA.Warehouse" ? "浠撳簱" : $t("Kf_MateOutBill_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("Kf_MateOutBill_PDA.StockPlace") == "Kf_MateOutBill_PDA.StockPlace" ? "浠撲綅" : $t("Kf_MateOutBill_PDA.StockPlace") }}::</view>
<view class="righton">
<input disabled v-model="hform.HSPName_B" />
</view>
@@ -281,10 +281,10 @@
</view>
<view class="bottom-btn">
- <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button class="btn-a" size="mini" @tap="submit">{{ $t("Kf_MateOutBill_PDA.btnSubmit") == "Kf_MateOutBill_PDA.btnSubmit" ? "鎻愪氦" : $t("Kf_MateOutBill_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("Kf_MateOutBill_PDA.btnAdd") == "Kf_MateOutBill_PDA.btnAdd" ? "鏂板" : $t("Kf_MateOutBill_PDA.btnAdd") }}</button>
+ <button class="btn-c" size="mini" @tap="goBack">{{ $t("Kf_MateOutBill_PDA.btnExit") == "Kf_MateOutBill_PDA.btnExit" ? "閫�鍑�" : $t("Kf_MateOutBill_PDA.btnExit") }}</button>
</view>
</view>
<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
@@ -396,7 +396,26 @@
HTMQty_B: '',
HWHName_B: '',
HSPName_B: '',
- }
+ },
+ placeholder_BarCode:this.$t("Kf_MateOutBill_PDA.placeholder_BarCode") == "Kf_MateOutBill_PDA.placeholder_BarCode" ? "璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" : this.$t("Kf_MateOutBill_PDA.placeholder_BarCode"),
+ placeholder_Qty:this.$t("Kf_MateOutBill_PDA.placeholder_Qty") == "Kf_MateOutBill_PDA.placeholder_Qty" ? "璇疯緭鍏ユ暟閲�" : this.$t("Kf_MateOutBill_PDA.placeholder_Qty"),
+ placeholder_DCWarehouse:this.$t("Kf_MateOutBill_PDA.placeholder_DCWarehouse") == "Kf_MateOutBill_PDA.placeholder_DCWarehouse" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" : this.$t("Kf_MateOutBill_PDA.placeholder_DCWarehouse"),
+ placeholder_DCStockPlace:this.$t("Kf_MateOutBill_PDA.placeholder_DCStockPlace") == "Kf_MateOutBill_PDA.placeholder_DCStockPlace" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" : this.$t("Kf_MateOutBill_PDA.placeholder_DCStockPlace"),
+ placeholder_SourceBillNo:this.$t("Kf_MateOutBill_PDA.placeholder_SourceBillNo") == "Kf_MateOutBill_PDA.placeholder_SourceBillNo" ? "璇疯緭鍏ユ簮鍗曞崟鍙�" : this.$t("Kf_MateOutBill_PDA.placeholder_SourceBillNo"),
+ placeholder_FIFOwarehouse:this.$t("Kf_MateOutBill_PDA.placeholder_FIFOwarehouse") == "Kf_MateOutBill_PDA.placeholder_FIFOwarehouse" ? "璇烽�夋嫨" : this.$t("Kf_MateOutBill_PDA.placeholder_FIFOwarehouse"),
+ placeholder_OutboundType:this.$t("Kf_MateOutBill_PDA.placeholder_OutboundType") == "Kf_MateOutBill_PDA.placeholder_OutboundType" ? "璇烽�夋嫨" : this.$t("Kf_MateOutBill_PDA.placeholder_OutboundType"),
+ placeholder_TransferDirection:this.$t("Kf_MateOutBill_PDA.placeholder_TransferDirection") == "Kf_MateOutBill_PDA.placeholder_TransferDirection" ? "璇烽�夋嫨璋冩嫧鏂瑰悜" : this.$t("Kf_MateOutBill_PDA.placeholder_TransferDirection"),
+ placeholder_TransferType:this.$t("Kf_MateOutBill_PDA.placeholder_TransferType") == "Kf_MateOutBill_PDA.placeholder_TransferType" ? "璇烽�夋嫨璋冩嫧绫诲瀷" : this.$t("Kf_MateOutBill_PDA.placeholder_TransferType"),
+ placeholder_SCWarehouse:this.$t("Kf_MateOutBill_PDA.placeholder_SCWarehouse") == "Kf_MateOutBill_PDA.placeholder_SCWarehouse" ? "璇烽�夋嫨璋冨嚭浠撳簱" : this.$t("Kf_MateOutBill_PDA.placeholder_SCWarehouse"),
+ placeholder_SCStockPlace:this.$t("Kf_MateOutBill_PDA.placeholder_SCStockPlace") == "Kf_MateOutBill_PDA.placeholder_SCStockPlace" ? "璇烽�夋嫨璋冨嚭浠撲綅" : this.$t("Kf_MateOutBill_PDA.placeholder_SCStockPlace"),
+ placeholder_SecManager:this.$t("Kf_MateOutBill_PDA.placeholder_SecManager") == "Kf_MateOutBill_PDA.placeholder_SecManager" ? "璇烽�夋嫨楠屾敹鍛�" : this.$t("Kf_MateOutBill_PDA.placeholder_SecManager"),
+ placeholder_Keeper:this.$t("Kf_MateOutBill_PDA.placeholder_Keeper") == "Kf_MateOutBill_PDA.placeholder_Keeper" ? "璇烽�夋嫨淇濈鍛�" : this.$t("Kf_MateOutBill_PDA.placeholder_Keeper"),
+ placeholder_Dept:this.$t("Kf_MateOutBill_PDA.placeholder_Dept") == "Kf_MateOutBill_PDA.placeholder_Dept" ? "璇烽�夋嫨閮ㄩ棬" : this.$t("Kf_MateOutBill_PDA.placeholder_Dept"),
+ placeholder_Supplier:this.$t("Kf_MateOutBill_PDA.placeholder_Supplier") == "Kf_MateOutBill_PDA.placeholder_Supplier" ? "璇烽�夋嫨渚涘簲鍟�" : this.$t("Kf_MateOutBill_PDA.placeholder_Supplier"),
+ placeholder_Customer:this.$t("Kf_MateOutBill_PDA.placeholder_Customer") == "Kf_MateOutBill_PDA.placeholder_Customer" ? "璇烽�夋嫨瀹㈡埛" : this.$t("Kf_MateOutBill_PDA.placeholder_Customer"),
+ placeholder_StockPlace:this.$t("Kf_MateOutBill_PDA.placeholder_StockPlace") == "Kf_MateOutBill_PDA.placeholder_StockPlace" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" : this.$t("Kf_MateOutBill_PDA.placeholder_StockPlace"),
+ placeholder_Warehouse:this.$t("Kf_MateOutBill_PDA.placeholder_Warehouse") == "Kf_MateOutBill_PDA.placeholder_Warehouse" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" : this.$t("Kf_MateOutBill_PDA.placeholder_Warehouse"),
+ unOperate:this.$t("Kf_MateOutBill_PDA.unOperate") == "Kf_MateOutBill_PDA.unOperate" ? "涓嶅彲鎿嶄綔" : this.$t("Kf_MateOutBill_PDA.unOperate")
}
},
components: {
@@ -404,6 +423,9 @@
BarCodePopupVue
},
onLoad(e) {
+ uni.setNavigationBarTitle({
+ title: this.$t("Kf_MateOutBill_PDA.title") == 'Kf_MateOutBill_PDA.title' ? '鐢熶骇琛ユ枡鍗�' : this.$t("Kf_MateOutBill_PDA.title")
+ })
console.log(e, this.userInfo)
this.OperationType = e.OperationType
if (e.HInterID) {
diff --git a/pages/weiwaigxIn/Cj_StationEntrustInBill.vue b/pages/weiwaigxIn/Cj_StationEntrustInBill.vue
index d28034c..284152e 100644
--- a/pages/weiwaigxIn/Cj_StationEntrustInBill.vue
+++ b/pages/weiwaigxIn/Cj_StationEntrustInBill.vue
@@ -20,6 +20,9 @@
<view class="right" style="width: 380rpx;">
<input v-model="hform.HProcNo" placeholder="璇疯緭鍏�(鎴栨壂鎻�)娴佹按鍙�" @blur="getHProcNoData2(hform.HBarCode,hform.HProcNo,hform.HSEQNumber)"/>
</view>
+ <view class="icon-wrapper" >
+ <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+ </view>
<uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanProcNo"></uni-icons>
</view>
<view class="form-item">
@@ -315,12 +318,16 @@
<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
</view>
</view>
+ <ProcListPopupVue ref="billList" :HProcExchHBillNo="hform.HProcExchBillNo" :HProcExchHInteID="hform.HProcExchHinteID" :HType="1"
+ ></ProcListPopupVue>
</view>
</template>
<script>
import getDateTime from '@/utils/getdateTime.js';
import { getUserInfo } from "@/utils/auth.js";
+ import ProcListPopupVue from '../../components/ProcListPopup/ProcListPopup.vue';
export default {
+ components: { ProcListPopupVue },
data() {
return {
userInfo:getUserInfo(),
@@ -425,8 +432,29 @@
this.getHEmpList()
this.getDefValByUser()
+ uni.$on('HProcNoSelectComplete', (e) => {
+ console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HProcNo)
+ this.hform.HProcNo=e.HProcNo;
+ this.hform.HSEQNumber = e.HSEQNumber;
+ this.getHProcNoData2(this.hform.HBarCode,this.hform.HProcNo,this.hform.HSEQNumber)
+ this.$refs.billList.exit()
+ })
+ },
+ onUnload() {
+ uni.$off('HProcNoSelectComplete')
},
methods: {
+ showBillList() {
+ if(this.hform.HProcExchBillNo!=""){
+ this.$refs.billList.showPopup()
+ }else{
+ uni.showToast({
+ title: '璇峰厛鎵弿娴佽浆鍗�',
+ icon: 'none'
+ })
+ }
+
+ },
//閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
getDefValByUser(){
uni.request({
@@ -1209,6 +1237,7 @@
</script>
<style lang="scss" scoped>
+
.form{
width: 668rpx;
margin: 20rpx auto;
@@ -1218,6 +1247,19 @@
width: 100%;
height: 50rpx;
}
+ .icon-wrapper {
+ background-color: #3A78FF;
+ border-radius: 100%;
+ width: 52rpx;
+ height: 52rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ .uni-icons {
+ color: #fff !important;
+ }
+ }
.other{
margin-top: 8rpx;
text-align: center;
diff --git a/pages/weiwaigxOut/Cj_StationEntrustOutBill.vue b/pages/weiwaigxOut/Cj_StationEntrustOutBill.vue
index 87253e6..c82f849 100644
--- a/pages/weiwaigxOut/Cj_StationEntrustOutBill.vue
+++ b/pages/weiwaigxOut/Cj_StationEntrustOutBill.vue
@@ -23,6 +23,9 @@
<input v-model="hform.HProcNo" placeholder="璇疯緭鍏�(鎴栨壂鎻�)娴佹按鍙�"
@blur="getHProcNoData2(hform.HBarCode,hform.HProcNo,hform.HSEQNumber)" />
</view>
+ <view class="icon-wrapper" >
+ <uni-icons type="search" size="20" @click="showProcBillList"></uni-icons>
+ </view>
<uni-icons type="scan"
style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
size="20" @click="toScanProcNo"></uni-icons>
@@ -34,7 +37,7 @@
</view>
</view>
<view class="form-item">
- <view class="title">鏈姤宸ユ暟閲�:</view>
+ <view class="title">鍙帴鏀舵暟閲�:</view>
<view class="righton">
<input disabled v-model="hform.HNotReportQty" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" />
</view>
@@ -376,6 +379,8 @@
</view>
</view>
<ProcExchListPopupVue ref="billList"></ProcExchListPopupVue>
+ <ProcListPopupVue ref="billListProc" :HProcExchHBillNo="hform.HProcExchBillNo" :HProcExchHInteID="hform.HProcExchHinteID" :HType="1"
+ ></ProcListPopupVue>
</view>
</template>
<script>
@@ -384,12 +389,14 @@
getUserInfo
} from "@/utils/auth.js";
import ProcExchListPopupVue from '../../components/ProcExchListPopup/ProcExchListPopup.vue';
+ import ProcListPopupVue from '../../components/ProcListPopup/ProcListPopup.vue';
import {
CommonUtils
} from '../../utils/common';
export default {
components: {
- ProcExchListPopupVue
+ ProcExchListPopupVue,
+ ProcListPopupVue
},
data() {
return {
@@ -509,8 +516,8 @@
this.getNewData()
}
this.getHGroupList()
- this.getHMaterList()
- this.getHProcList()
+ //this.getHMaterList()
+ //this.getHProcList()
this.getHSupList()
this.getHEmpList()
//this.getHProcList()
@@ -525,6 +532,17 @@
this.getHBarCodeData(e.HBillNo, e.HProcNo)
this.$refs.billList.exit()
})
+ uni.$on('HProcNoSelectComplete', (e) => {
+ console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HProcNo)
+ this.hform.HProcNo=e.HProcNo;
+ this.hform.HSEQNumber = e.HSEQNumber;
+ this.getHProcNoData2(this.hform.HBarCode,this.hform.HProcNo,this.hform.HSEQNumber)
+ this.$refs.billListProc.exit()
+ })
+ },
+ onUnload() {
+ uni.$off('HProcNoSelectComplete')
+ uni.$off('BillSelectComplete2')
},
methods: {
//閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
@@ -845,12 +863,7 @@
this.arrayHGroupName[i] = res.data.data[i].鐝粍
}
this.$forceUpdate();
- } else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- }
+ }
},
fail: (res) => {
console.log(res);
@@ -1401,6 +1414,17 @@
showBillList() {
this.$refs.billList.showPopup()
},
+ showProcBillList() {
+ if(this.hform.HProcExchBillNo!=""){
+ this.$refs.billListProc.showPopup()
+ }else{
+ uni.showToast({
+ title: '璇峰厛鎵弿娴佽浆鍗�',
+ icon: 'none'
+ })
+ }
+
+ },
goBack() {
uni.showModal({
title: '鎻愮ず',
diff --git a/pages/weiwaigxOut/Cj_StationEntrustOutBillList.vue b/pages/weiwaigxOut/Cj_StationEntrustOutBillList.vue
index 47b9fe7..3706336 100644
--- a/pages/weiwaigxOut/Cj_StationEntrustOutBillList.vue
+++ b/pages/weiwaigxOut/Cj_StationEntrustOutBillList.vue
@@ -2,6 +2,13 @@
<view class="content">
<view class="form">
<view class="form-item">
+ <view class="title">娴佽浆鍗″彿:</view>
+ <view class="right">
+ <input v-model="hform.HProcExchBillNo" placeholder="璇疯緭鍏ュ伐搴忔祦杞崱鍙�" />
+ </view>
+
+ </view>
+ <view class="form-item">
<view class="title">鐘舵��:</view>
<view class="right">
<picker :range="arrayStatus" :value="hform.HStatus" @change="HStatusChange">
@@ -38,17 +45,7 @@
<input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
</view>
</view>
- <view class="form-item">
- <view class="title">娴佽浆鍗″彿:</view>
- <view class="right">
- <input v-model="hform.HProcExchBillNo" placeholder="璇疯緭鍏ュ伐搴忔祦杞崱鍙�" />
- </view>
- <view>
- <uni-icons type="scan"
- style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;font-weight: 500;"
- size="20" @click="toScanCode"></uni-icons>
- </view>
- </view>
+
<view class="form-item">
<view class="title">浜у搧浠ｇ爜:</view>
<view class="right">
@@ -213,52 +210,41 @@
</view>
<view class="op" v-if="operations == index">
- <button class="op1" size="mini" plain @tap.stop="check(item)">瀹℃牳</button>
+ <button class="op1" size="mini" plain @tap.stop="check(item)" v-if="item.瀹℃牳浜�===''">瀹℃牳</button>
<!-- <button class="op2" size="mini" plain @tap.stop="antiCheck(item)">鍙嶅鏍�</button> -->
<button class="op1" size="mini" plain @tap.stop="firstCheck(item)" v-if="false">棣栨</button>
- <button class="op3" size="mini" plain @tap.stop="edit(item)" v-if="hform.HStatus === '宸插鏍�'">缂栬緫</button>
+ <button class="op3" size="mini" plain @tap.stop="edit(item)" v-if="item.瀹℃牳浜�===''">缂栬緫</button>
<button class="op4" size="mini" plain @tap.stop="del(item)" v-if="false">鍒犻櫎</button>
<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
</uni-card>
-
+
</view>
-
+ <StationOutBillPopup ref="billList"> </StationOutBillPopup>
<view class="over" v-if="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="popup-mask" v-if="popupVisible" @tap="cancelCheck">
- <view class="popup-content" @tap.stop>
- <view class="popup-title">瀹℃牳纭</view>
- <view class="popup-item">
- <text class="popup-label">鏁伴噺锛�</text>
- <input class="popup-input" type="number" v-model="popupForm.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
- </view>
- <view class="popup-item">
- <text class="popup-label">鍒跺崟浜猴細</text>
- <input class="popup-input" v-model="popupForm.HUser" placeholder="璇疯緭鍏ュ埗鍗曚汉" />
- </view>
- <view class="popup-btns">
- <button class="popup-btn cancel" @tap="cancelCheck">鍙栨秷</button>
- <button class="popup-btn confirm" @tap="confirmCheck()">纭畾</button>
- </view>
- </view>
- </view>
+
</view>
</template>
<script>
import { getUserInfo } from "@/utils/auth.js";
+ import StationOutBillPopup from "../../components/StationOutBillPopup/StationEntrustOutBillListPopup.vue"
export default {
+ components:{StationOutBillPopup},
data() {
return {
popupVisible: false,
popupItem: null,
popupForm: {
HQty: '',
- HUser: ''
+ HUser: '',
+ HWasterQty:'',//鎶ュ簾
+ HPieceQty:'',//涓嶈壇
+ HSourceName:'',//鐢熶骇璧勬簮
+ HCenter:'',//宸ヤ綔涓績
},
userInfo:getUserInfo(),
serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
@@ -283,6 +269,7 @@
page:1,
}
},
+
onLoad() {
this.getList()
// console.log(this.userInfo,uni.getStorageSync('HUserName'))
@@ -322,7 +309,7 @@
})
},
getList(){
- this.sWhere += ` and 鍒跺崟浜� like '%${this.userInfo.Czymc}'`
+ // this.sWhere += ` and 鍒跺崟浜� like '%${this.userInfo.Czymc}'`
console.log(this.sWhere)
uni.showLoading({
title:'鍔犺浇涓�...'
@@ -396,12 +383,12 @@
this.sWhere += " and 鍏抽棴浜�<>''";
}
}
- // if (this.hform.HBeginDate) {
- // this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HBeginDate + "'";
- // }
- // if (this.hform.HEndDate) {
- // this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HEndDate + "'";
- // }
+ if (this.hform.HBeginDate) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HBeginDate + "'";
+ }
+ if (this.hform.HEndDate) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HEndDate + "'";
+ }
if (this.hform.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
}
@@ -507,67 +494,13 @@
});
},
//瀹℃牳
- check(item){
+ check(item){
console.log(item)
- if (item.HBillStatus > 0) {
- // uni.showToast({
- // title:'鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒'
- // })
- this.popupItem = item;
- this.popupForm.HQty = 0;
- this.popupForm.HUser = uni.getStorageSync('HUserName');
- this.popupVisible = true;
- }
-
+ console.log(this.$refs.billList);
+ this.$refs.billList.showPopup(item)
},
- confirmCheck(item) {
- // if (!this.popupForm.HQty) {
- // uni.showToast({ title: '璇疯緭鍏ユ暟閲�', icon: 'none' });
- // return;
- // }
- // if (!this.popupForm.HUser) {
- // uni.showToast({ title: '璇疯緭鍏ュ埗鍗曚汉', icon: 'none' });
- // return;
- // }
- uni.request({
- url: this.serverUrl + '/Cj_StationEntrustOutBill/setOtherProperty',
- method: 'Get',
- data: {
- HInterID: this.popupItem.HInterID,
- HQty: this.popupForm.HQty,
- user: this.popupForm.HUser // 鍒跺崟浜�
- },
- success: (res) => {
- console.log(1, res);
- if (res.data.count == 1) {
- this.popupVisible = false;
- uni.showToast({
- title: '瀹℃牳鎴愬姛',
- icon: 'none'
- });
- this.search();
- } else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- });
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- });
- }
- });
- },
- cancelCheck() {
- this.popupVisible = false;
- this.popupItem = null;
- this.popupForm.HQty = '';
- this.popupForm.HUser = '';
- }
+
+
// //鍙嶅鏍�
// antiCheck(item){
diff --git a/pages/weiwailingliao/Kf_EntrustOutBill.vue b/pages/weiwailingliao/Kf_EntrustOutBill.vue
index d7bc152..7336cb2 100644
--- a/pages/weiwailingliao/Kf_EntrustOutBill.vue
+++ b/pages/weiwailingliao/Kf_EntrustOutBill.vue
@@ -2,9 +2,9 @@
<view>
<view class="form">
<view class="form-item">
- <view class="title">鏉＄爜:</view>
+ <view class="title">{{ $t("Kf_EntrustOutBill_PDA.BarCode") == "Kf_EntrustOutBill_PDA.BarCode" ? "鏉＄爜" : $t("Kf_EntrustOutBill_PDA.BarCode") }}:</view>
<view class="right" style="width: 380rpx;">
- <input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜"
+ <input :focus="barCodeFocus" v-model="hform.HBarCode" :placeholder="placeholder_BarCode"
@confirm="getCode(hform.HBarCode)" />
</view>
<view class="icon-wrapper" @click="toScanCode">
@@ -12,42 +12,42 @@
</view>
</view>
<view class="form-item">
- <view class="title">鏁伴噺:</view>
+ <view class="title">{{ $t("Kf_EntrustOutBill_PDA.Qty") == "Kf_EntrustOutBill_PDA.Qty" ? "鏁伴噺" : $t("Kf_EntrustOutBill_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("Kf_EntrustOutBill_PDA.SCWarehouse") == "Kf_EntrustOutBill_PDA.SCWarehouse" ? "璋冨嚭浠撳簱" : $t("Kf_EntrustOutBill_PDA.SCWarehouse") }}:</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" @confirm="HWHNameScan"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">浠撲綅:</view>
+ <view class="title">{{ $t("Kf_EntrustOutBill_PDA.SCStockPlace") == "Kf_EntrustOutBill_PDA.SCStockPlace" ? "璋冨嚭浠撲綅" : $t("Kf_EntrustOutBill_PDA.SCStockPlace") }}:</view>
<view class="right" v-show="showHStockPlaceName">
- <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+ <uni-combox :candidates="HStockPlaceNameListComputed" :placeholder="placeholder_SCStockPlace"
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="涓嶅彲鎿嶄綔" />
+ <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" :placeholder="unOperate" />
</view>
</view>
<view class="tabs">
- <view :class="tabs == 0 ? 'on' : ''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
- <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 == 4 ? 'on' : ''" @tap="tabs = 4">涓嬫灦淇℃伅</view>
+ <view :class="tabs == 0 ? 'on' : ''" @tap="tabs = 0">{{ $t("Kf_EntrustOutBill_PDA.selectSource") == "Kf_EntrustOutBill_PDA.selectSource" ? "閫夋嫨婧愬崟" : $t("Kf_EntrustOutBill_PDA.selectSource") }}</view>
+ <view :class="tabs == 1 ? 'on' : ''" @tap="tabs = 1">{{ $t("Kf_EntrustOutBill_PDA.tableInfo") == "Kf_EntrustOutBill_PDA.tableInfo" ? "琛ㄥご淇℃伅" : $t("Kf_EntrustOutBill_PDA.tableInfo") }}</view>
+ <view :class="tabs == 2 ? 'on' : ''" @tap="tabs = 2">{{ $t("Kf_EntrustOutBill_PDA.materInfo") == "Kf_EntrustOutBill_PDA.materInfo" ? "鐗╂枡淇℃伅" : $t("Kf_EntrustOutBill_PDA.materInfo") }}</view>
+ <view :class="tabs == 3 ? 'on' : ''" @tap="tabs = 3">{{ $t("Kf_EntrustOutBill_PDA.barInfo") == "Kf_EntrustOutBill_PDA.barInfo" ? "鏉＄爜淇℃伅" : $t("Kf_EntrustOutBill_PDA.barInfo") }}</view>
+ <view :class="tabs == 4 ? 'on' : ''" @tap="tabs = 4">{{ $t("Kf_EntrustOutBill_PDA.removeShelvesInfo") == "Kf_EntrustOutBill_PDA.removeShelvesInfo" ? "涓嬫灦淇℃伅" : $t("Kf_EntrustOutBill_PDA.removeShelvesInfo") }}</view>
</view>
<view v-if="tabs == 0">
<view class="form-item">
- <view class="title">婧愬崟绫诲瀷:</view>
+ <view class="title">{{ $t("Kf_EntrustOutBill_PDA.SourceBillType") == "Kf_EntrustOutBill_PDA.SourceBillType" ? "婧愬崟绫诲瀷" : $t("Kf_EntrustOutBill_PDA.SourceBillType") }}:</view>
<view class="right" v-show="showHMainSourceBillType">
<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
@change="HMainSourceBillTypeChange">
@@ -62,12 +62,12 @@
</view>
</view>
<view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="title">{{ $t("Kf_EntrustOutBill_PDA.SourceBillNo") == "Kf_EntrustOutBill_PDA.SourceBillNo" ? "婧愬崟鍗曞彿" : $t("Kf_EntrustOutBill_PDA.SourceBillNo") }}:</view>
<view class="right" v-show="showHSourceBillNo">
<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
<input :focus="HSourceBillNoFocus" @confirm="getHBarCodeData(hform.HSourceBillNo)" type="text"
- name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ name="HSourceBillNo" v-model="hform.HSourceBillNo" :placeholder="placeholder_SourceBillNo" />
</view>
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
@@ -75,18 +75,18 @@
</view>
<view class="righton" v-show="!showHSourceBillNo">
- <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" :placeholder="placeholder_SourceBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">鍏堣繘鍏堝嚭浠�:</view>
+ <view class="title">{{ $t("Kf_EntrustOutBill_PDA.FIFOwarehouse") == "Kf_EntrustOutBill_PDA.FIFOwarehouse" ? "鍏堣繘鍏堝嚭浠�" : $t("Kf_EntrustOutBill_PDA.FIFOwarehouse") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨" v-model="hform.HFIFOWHName"
+ <uni-combox :candidates="arrayHWHName" :placeholder="placeholder_FIFOwarehouse" v-model="hform.HFIFOWHName"
@input="HFIFOWHNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">鏃ユ湡:</view>
+ <view class="title">{{ $t("Kf_EntrustOutBill_PDA.Date") == "Kf_EntrustOutBill_PDA.Date" ? "鏃ユ湡" : $t("Kf_EntrustOutBill_PDA.Date") }}</view>
<view class="right">
<picker mode="date" v-model="hform.HDate" @change="HDateChange">
<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
@@ -95,13 +95,13 @@
</view>
</view>
<view class="form-item">
- <view class="title">鍒跺崟浜�:</view>
+ <view class="title">{{ $t("Kf_EntrustOutBill_PDA.Maker") == "Kf_EntrustOutBill_PDA.Maker" ? "鍒跺崟浜�" : $t("Kf_EntrustOutBill_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("Kf_EntrustOutBill_PDA.BillNo") == "Kf_EntrustOutBill_PDA.BillNo" ? "鍗曟嵁鍙�" : $t("Kf_EntrustOutBill_PDA.BillNo") }}:</view>
<view class="righton">
<input name="HBillNo" disabled v-model="hform.HBillNo" />
</view>
@@ -110,7 +110,7 @@
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁ID:</view>
+ <view class="title">{{ $t("Kf_EntrustOutBill_PDA.BillID") == "Kf_EntrustOutBill_PDA.BillID" ? "鍗曟嵁ID" : $t("Kf_EntrustOutBill_PDA.BillID") }}:</view>
<view class="righton">
<input name="HInterID" disabled v-model="hform.HInterID" />
</view>
@@ -119,38 +119,38 @@
<view v-if="tabs == 1">
<view class="form-item">
- <view class="title">淇濈:</view>
+ <view class="title">{{ $t("Kf_EntrustOutBill_PDA.Keeper") == "Kf_EntrustOutBill_PDA.Keeper" ? "淇濈" : $t("Kf_EntrustOutBill_PDA.Keeper") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
+ <uni-combox :candidates="arrayHEmpName":placeholder="placeholder_Keeper" v-model="hform.HKeeperName"
@input="HKeeperNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">楠屾敹:</view>
+ <view class="title">{{ $t("Kf_EntrustOutBill_PDA.SecManager") == "Kf_EntrustOutBill_PDA.SecManager" ? "楠屾敹" : $t("Kf_EntrustOutBill_PDA.SecManager") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
+ <uni-combox :candidates="arrayHEmpName" :placeholder="placeholder_SecManager" v-model="hform.HSecManagerName"
@input="HSecManagerNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">閮ㄩ棬:</view>
+ <view class="title">{{ $t("Kf_EntrustOutBill_PDA.Dept") == "Kf_EntrustOutBill_PDA.Dept" ? "閮ㄩ棬" : $t("Kf_EntrustOutBill_PDA.Dept") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+ <uni-combox :candidates="arrayHDeptName" :placeholder="placeholder_Dept" v-model="hform.HDeptName"
@input="HDeptNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">渚涘簲鍟�:</view>
+ <view class="title">{{ $t("Kf_EntrustOutBill_PDA.Supplier") == "Kf_EntrustOutBill_PDA.Supplier" ? "渚涘簲鍟�" : $t("Kf_EntrustOutBill_PDA.Supplier") }}:</view>
<!-- <view class="right" v-show="showHSupName">
<uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" v-model="hform.HSupName"
@input="HSupNameChange"></uni-combox>
</view> -->
<view class="righton">
- <input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
+ <input name="HSupName" disabled v-model="hform.HSupName" :placeholder="placeholder_Supplier" />
</view>
</view>
<view class="form-item">
- <view class="title">缁勭粐:</view>
+ <view class="title">{{ $t("Kf_EntrustOutBill_PDA.StockOrg") == "Kf_EntrustOutBill_PDA.StockOrg" ? "缁勭粐" : $t("Kf_EntrustOutBill_PDA.StockOrg") }}:</view>
<view class="righton">
<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
</view>
@@ -162,33 +162,33 @@
<uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠ｇ爜" style="margin: 10px;" @tap="delMater(item)">
<view class="card-detail">
<view class="detail">
- <text>婧愬崟鍗曞彿锛�</text>{{ item.婧愬崟鍗曞彿 }}
+ <text>{{ $t("Kf_EntrustOutBill_PDA.table_SourceBillNo") == "Kf_EntrustOutBill_PDA.table_SourceBillNo" ? "婧愬崟鍗曞彿" : $t("Kf_EntrustOutBill_PDA.table_SourceBillNo") }}锛�</text>{{ item.婧愬崟鍗曞彿 }}
</view>
<view class="detail">
- <text>婧愬崟鏁伴噺锛�</text>{{ item.婧愬崟鏁伴噺 }}
+ <text>{{ $t("Kf_EntrustOutBill_PDA.table_SourceBillQty") == "Kf_EntrustOutBill_PDA.table_SourceBillQty" ? "婧愬崟鏁伴噺" : $t("Kf_EntrustOutBill_PDA.table_SourceBillQty") }}锛�</text>{{ item.婧愬崟鏁伴噺 }}
</view>
<view class="detail">
- <text>鏁伴噺锛�</text>{{ item.鏁伴噺 }}
+ <text>{{ $t("Kf_EntrustOutBill_PDA.table_BarQty") == "Kf_EntrustOutBill_PDA.table_BarQty" ? "鏁伴噺" : $t("Kf_EntrustOutBill_PDA.table_BarQty") }}锛�</text>{{ item.鏁伴噺 }}
</view>
<view class="detail" v-if="item.鍚堣鏁伴噺">
- <text>鍚堣鏁伴噺锛�</text>{{item.鍚堣鏁伴噺}}
+ <text>{{ $t("Kf_EntrustOutBill_PDA.TotalQty") == "Kf_EntrustOutBill_PDA.TotalQty" ? "鍚堣鏁伴噺" : $t("Kf_EntrustOutBill_PDA.TotalQty") }}锛�</text>{{item.鍚堣鏁伴噺}}
</view>
<view class="detail">
- <text>鏉＄爜涓暟锛�</text>{{ item.鏉＄爜涓暟 }}
+ <text>{{ $t("Kf_EntrustOutBill_PDA.table_BarNum") == "Kf_EntrustOutBill_PDA.table_BarNum" ? "鏉＄爜涓暟" : $t("Kf_EntrustOutBill_PDA.table_BarNum") }}锛�</text>{{ item.鏉＄爜涓暟 }}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{ item.瑙勬牸鍨嬪彿 }}
+ <text>{{ $t("Kf_EntrustOutBill_PDA.table_MaterModel") == "Kf_EntrustOutBill_PDA.table_MaterModel" ? "瑙勬牸鍨嬪彿" : $t("Kf_EntrustOutBill_PDA.table_MaterModel") }}锛�</text>{{ item.瑙勬牸鍨嬪彿 }}
</view>
<view class="detail" v-if="item.杈呭姪灞炴��">
- <text>杈呭姪灞炴�э細</text>{{ item.杈呭姪灞炴�� }}
+ <text>{{ $t("Kf_EntrustOutBill_PDA.table_Aux") == "Kf_EntrustOutBill_PDA.table_Aux" ? "杈呭姪灞炴��" : $t("Kf_EntrustOutBill_PDA.table_Aux") }}锛�</text>{{ item.杈呭姪灞炴�� }}
</view>
<view class="detail" v-if="item.娆惧彿">
- <text>娆惧彿锛�</text>{{item.娆惧彿}}
+ <text>{{ $t("Kf_EntrustOutBill_PDA.StyleNo") == "Kf_EntrustOutBill_PDA.StyleNo" ? "娆惧彿" : $t("Kf_EntrustOutBill_PDA.StyleNo") }}锛�</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("Kf_EntrustOutBill_PDA.noData") == "Kf_EntrustOutBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("Kf_EntrustOutBill_PDA.noData") }}</view>
</view>
<view v-if="tabs == 4">
@@ -197,83 +197,83 @@
@tap="delMater(item)">
<view class="card-detail">
<view class="detail">
- <text>鏁伴噺锛�</text>{{ item.HQty }}
+ <text>{{ $t("Kf_EntrustOutBill_PDA.Qty") == "Kf_EntrustOutBill_PDA" ? "鏁伴噺" : $t("Kf_EntrustOutBill_PDA.Qty") }}锛�</text>{{ item.HQty }}
</view>
<view class="detail">
- <text>涓嬫灦鏁伴噺锛�</text>{{ item.HQtyMust }}
+ <text>{{ $t("Kf_EntrustOutBill_PDA.PutawayQty") == "Kf_EntrustOutBill_PDA.PutawayQty" ? "涓嬫灦鏁伴噺" : $t("Kf_EntrustOutBill_PDA.PutawayQty") }}锛�</text>{{ item.HQtyMust }}
</view>
<view class="detail">
- <text>浠撳簱锛�</text>{{ item.HWhName }}
+ <text>{{ $t("Kf_EntrustOutBill_PDA.Warehouse") == "Kf_EntrustOutBill_PDA.Warehouse" ? "浠撳簱" : $t("Kf_EntrustOutBill_PDA.Warehouse") }}锛�</text>{{ item.HWhName }}
</view>
<view class="detail">
- <text>浠撲綅锛�</text>{{ item.HSPName }}
+ <text>{{ $t("Kf_EntrustOutBill_PDA.StockPlace") == "Kf_EntrustOutBill_PDA.StockPlace" ? "浠撲綅" : $t("Kf_EntrustOutBill_PDA.StockPlace") }}锛�</text>{{ item.HSPName }}
</view>
<view class="detail">
- <text>瑙勬牸鍨嬪彿锛�</text>{{ item.HMaterModel }}
+ <text>{{ $t("Kf_EntrustOutBill_PDA.MaterModel") == "Kf_EntrustOutBill_PDA.MaterModel" ? "瑙勬牸鍨嬪彿" : $t("Kf_EntrustOutBill_PDA.MaterModel") }}锛�</text>{{ item.HMaterModel }}
</view>
<view class="detail" v-if="item.HBatchNo">
- <text>鎵瑰彿锛�</text>{{ item.HBatchNo }}
+ <text>{{ $t("Kf_EntrustOutBill_PDA.BatchNo") == "Kf_EntrustOutBill_PDA.BatchNo" ? "鎵瑰彿" : $t("Kf_EntrustOutBill_PDA.BatchNo") }}锛�</text>{{ item.HBatchNo }}
</view>
<view class="detail" v-if="item.HAuxPropName">
- <text>杈呭姪灞炴�э細</text>{{ item.HAuxPropName }}
+ <text>{{ $t("Kf_EntrustOutBill_PDA.table_Aux") == "Kf_EntrustOutBill_PDA.table_Aux" ? "杈呭姪灞炴��" : $t("Kf_EntrustOutBill_PDA.table_Aux") }}锛�</text>{{ item.HAuxPropName }}
</view>
</view>
</uni-card>
</view>
- <view class="over" v-if="FIFOlist.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="FIFOlist.length == 0">{{ $t("Kf_EntrustOutBill_PDA.noData") == "Kf_EntrustOutBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("Kf_EntrustOutBill_PDA.noData") }}</view>
</view>
<view v-if="tabs == 3">
<view class="form-item">
- <view class="title">鏉＄爜:</view>
+ <view class="title">{{ $t("Kf_EntrustOutBill_PDA.BarCode") == "Kf_EntrustOutBill_PDA.BarCode" ? "鏉＄爜" : $t("Kf_EntrustOutBill_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("Kf_EntrustOutBill_PDA.Material") == "Kf_EntrustOutBill_PDA.Material" ? "鐗╂枡" : $t("Kf_EntrustOutBill_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("Kf_EntrustOutBill_PDA.MaterModel") == "Kf_EntrustOutBill_PDA.MaterModel" ? "瑙勬牸" : $t("Kf_EntrustOutBill_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("Kf_EntrustOutBill_PDA.BatchNo") == "Kf_EntrustOutBill_PDA.BatchNo" ? "鎵规" : $t("Kf_EntrustOutBill_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("Kf_EntrustOutBill_PDA.Unit") == "Kf_EntrustOutBill_PDA.Unit" ? "鍗曚綅" : $t("Kf_EntrustOutBill_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("Kf_EntrustOutBill_PDA.Qty") == "Kf_EntrustOutBill_PDA.Qty" ? "鏁伴噺" : $t("Kf_EntrustOutBill_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("Kf_EntrustOutBill_PDA.Capacity") == "Kf_EntrustOutBill_PDA.Capacity" ? "瀹归噺" : $t("Kf_EntrustOutBill_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("Kf_EntrustOutBill_PDA.Warehouse") == "Kf_EntrustOutBill_PDA.Warehouse" ? "浠撳簱" : $t("Kf_EntrustOutBill_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("Kf_EntrustOutBill_PDA.StockPlace") == "Kf_EntrustOutBill_PDA.StockPlace" ? "璋冨叆浠撲綅" : $t("Kf_EntrustOutBill_PDA.StockPlace") }}:</view>
<view class="righton">
<input disabled v-model="hform.HSPName_B" />
</view>
@@ -281,12 +281,12 @@
</view>
<view class="bottom-btn">
- <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button class="btn-a" size="mini" @tap="submit">{{ $t("Kf_EntrustOutBill_PDA.btnSubmit") == "Kf_EntrustOutBill_PDA.btnSubmit" ? "鎻愪氦" : $t("Kf_EntrustOutBill_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("Kf_EntrustOutBill_PDA.btnAdd") == "Kf_EntrustOutBill_PDA.btnAdd" ? "鏂板" : $t("Kf_EntrustOutBill_PDA.btnAdd") }}</button>
+ <button class="btn-c" size="mini" @tap="goBack">{{ $t("Kf_EntrustOutBill_PDA.btnExit") == "Kf_EntrustOutBill_PDA.btnExit" ? "閫�鍑�" : $t("Kf_EntrustOutBill_PDA.btnExit") }}</button>
</view>
</view>
<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
@@ -390,7 +390,24 @@
HTMQty_B: '',
HWHName_B: '',
HSPName_B: '',
- }
+ },
+ placeholder_BarCode:this.$t("Kf_EntrustOutBill_PDA.placeholder_BarCode") == "Kf_EntrustOutBill_PDA.placeholder_BarCode" ? "璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" : this.$t("Kf_EntrustOutBill_PDA.placeholder_BarCode"),
+ placeholder_Qty:this.$t("Kf_EntrustOutBill_PDA.placeholder_Qty") == "Kf_EntrustOutBill_PDA.placeholder_Qty" ? "璇疯緭鍏ユ暟閲�" : this.$t("Kf_EntrustOutBill_PDA.placeholder_Qty"),
+ placeholder_DCWarehouse:this.$t("Kf_EntrustOutBill_PDA.placeholder_DCWarehouse") == "Kf_EntrustOutBill_PDA.placeholder_DCWarehouse" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" : this.$t("Kf_EntrustOutBill_PDA.placeholder_DCWarehouse"),
+ placeholder_DCStockPlace:this.$t("Kf_EntrustOutBill_PDA.placeholder_DCStockPlace") == "Kf_EntrustOutBill_PDA.placeholder_DCStockPlace" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" : this.$t("Kf_EntrustOutBill_PDA.placeholder_DCStockPlace"),
+ placeholder_SourceBillNo:this.$t("Kf_EntrustOutBill_PDA.placeholder_SourceBillNo") == "Kf_EntrustOutBill_PDA.placeholder_SourceBillNo" ? "璇疯緭鍏ユ簮鍗曞崟鍙�" : this.$t("Kf_EntrustOutBill_PDA.placeholder_SourceBillNo"),
+ placeholder_FIFOwarehouse:this.$t("Kf_EntrustOutBill_PDA.placeholder_FIFOwarehouse") == "Kf_EntrustOutBill_PDA.placeholder_FIFOwarehouse" ? "璇烽�夋嫨" : this.$t("Kf_EntrustOutBill_PDA.placeholder_FIFOwarehouse"),
+ placeholder_OutboundType:this.$t("Kf_EntrustOutBill_PDA.placeholder_OutboundType") == "Kf_EntrustOutBill_PDA.placeholder_OutboundType" ? "璇烽�夋嫨" : this.$t("Kf_EntrustOutBill_PDA.placeholder_OutboundType"),
+ placeholder_TransferDirection:this.$t("Kf_EntrustOutBill_PDA.placeholder_TransferDirection") == "Kf_EntrustOutBill_PDA.placeholder_TransferDirection" ? "璇烽�夋嫨璋冩嫧鏂瑰悜" : this.$t("Kf_EntrustOutBill_PDA.placeholder_TransferDirection"),
+ placeholder_TransferType:this.$t("Kf_EntrustOutBill_PDA.placeholder_TransferType") == "Kf_EntrustOutBill_PDA.placeholder_TransferType" ? "璇烽�夋嫨璋冩嫧绫诲瀷" : this.$t("Kf_EntrustOutBill_PDA.placeholder_TransferType"),
+ placeholder_SCWarehouse:this.$t("Kf_EntrustOutBill_PDA.placeholder_SCWarehouse") == "Kf_EntrustOutBill_PDA.placeholder_SCWarehouse" ? "璇烽�夋嫨璋冨嚭浠撳簱" : this.$t("Kf_EntrustOutBill_PDA.placeholder_SCWarehouse"),
+ placeholder_SCStockPlace:this.$t("Kf_EntrustOutBill_PDA.placeholder_SCStockPlace") == "Kf_EntrustOutBill_PDA.placeholder_SCStockPlace" ? "璇烽�夋嫨璋冨嚭浠撲綅" : this.$t("Kf_EntrustOutBill_PDA.placeholder_SCStockPlace"),
+ placeholder_SecManager:this.$t("Kf_EntrustOutBill_PDA.placeholder_SecManager") == "Kf_EntrustOutBill_PDA.placeholder_SecManager" ? "璇烽�夋嫨楠屾敹鍛�" : this.$t("Kf_EntrustOutBill_PDA.placeholder_SecManager"),
+ placeholder_Keeper:this.$t("Kf_EntrustOutBill_PDA.placeholder_Keeper") == "Kf_EntrustOutBill_PDA.placeholder_Keeper" ? "璇烽�夋嫨淇濈鍛�" : this.$t("Kf_EntrustOutBill_PDA.placeholder_Keeper"),
+ placeholder_Dept:this.$t("Kf_EntrustOutBill_PDA.placeholder_Dept") == "Kf_EntrustOutBill_PDA.placeholder_Dept" ? "璇烽�夋嫨閮ㄩ棬" : this.$t("Kf_EntrustOutBill_PDA.placeholder_Dept"),
+ placeholder_Supplier:this.$t("Kf_EntrustOutBill_PDA.placeholder_Supplier") == "Kf_EntrustOutBill_PDA.placeholder_Supplier" ? "璇烽�夋嫨渚涘簲鍟�" : this.$t("Kf_EntrustOutBill_PDA.placeholder_Supplier"),
+ placeholder_Customer:this.$t("Kf_EntrustOutBill_PDA.placeholder_Customer") == "Kf_EntrustOutBill_PDA.placeholder_Customer" ? "璇烽�夋嫨瀹㈡埛" : this.$t("Kf_EntrustOutBill_PDA.placeholder_Customer"),
+ unOperate:this.$t("Kf_EntrustOutBill_PDA.unOperate") == "Kf_EntrustOutBill_PDA.unOperate" ? "涓嶅彲鎿嶄綔" : this.$t("Kf_EntrustOutBill_PDA.unOperate")
}
},
components: {
@@ -408,6 +425,9 @@
}
},
onLoad(e) {
+ uni.setNavigationBarTitle({
+ title: this.$t("Kf_EntrustOutBill_PDA.title") == 'Kf_EntrustOutBill_PDA.title' ? '濮斿棰嗘枡鍗�' : this.$t("Kf_EntrustOutBill_PDA.title")
+ })
console.log(e, this.userInfo)
this.OperationType = e.OperationType
if (e.HInterID) {
diff --git a/pages/weiwailingliao/Kf_EntrustOutBillList.vue b/pages/weiwailingliao/Kf_EntrustOutBillList.vue
index 5cb5aa7..b6e263b 100644
--- a/pages/weiwailingliao/Kf_EntrustOutBillList.vue
+++ b/pages/weiwailingliao/Kf_EntrustOutBillList.vue
@@ -1,42 +1,33 @@
<template>
<view class="content">
<view class="tabs">
- <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 :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">{{ $t("Kf_EntrustOutBillList_PDA.cacheList") == "Kf_EntrustOutBillList_PDA.cacheList" ? "缂撳瓨鍒楄〃" : $t("Kf_EntrustOutBillList_PDA.cacheList") }}</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">{{ $t("Kf_EntrustOutBillList_PDA.updatedList") == "Kf_EntrustOutBillList_PDA.updatedList" ? "宸蹭笂浼犲垪琛�" : $t("Kf_EntrustOutBillList_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>
- {{ $t("Kf_EntrustOutBillList.btnAdd") == "Kf_EntrustOutBillList.btnAdd" ? "鏂板" : $t("Kf_EntrustOutBillList.btnAdd") }}
+ <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>{{ $t("Kf_EntrustOutBillList_PDA.btnAdd") == "Kf_EntrustOutBillList_PDA.btnAdd" ? "鏂板" : $t("Kf_EntrustOutBillList_PDA.btnAdd") }}
</view>
</view>
<view class="form" v-if="tabs == 1">
<view class="form-item">
- <view class="title">{{ $t("Kf_EntrustOutBillList.billNo") == "Kf_EntrustOutBillList.billNo" ? "鍗曟嵁鍙�:" : $t("Kf_EntrustOutBillList.billNo") }}:</view>
+ <view class="title">{{ $t("Kf_EntrustOutBillList_PDA.billNo") == "Kf_EntrustOutBillList_PDA.billNo" ? "鍗曟嵁鍙�" : $t("Kf_EntrustOutBillList_PDA.billNo") }}:</view>
<view class="right">
- <input v-model="hform.HBillNo" :placeholder="$t('Kf_EntrustOutBillList.billNoPlaceholder') == 'Kf_EntrustOutBillList.billNoPlaceholder' ? '璇疯緭鍏ュ崟鎹彿' : $t('Kf_EntrustOutBillList.billNoPlaceholder')" />
+ <input v-model="hform.HBillNo" :placeholder="billNoPlaceholder" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿:" : $t("Gy.HMainSourceBillNo") }}:</view>
+ <view class="title">{{ $t("Kf_EntrustOutBillList_PDA.sourceBillNo") == "Kf_EntrustOutBillList_PDA.sourceBillNo" ? "婧愬崟鍗曞彿" : $t("Kf_EntrustOutBillList_PDA.sourceBillNo") }}:</view>
<view class="right">
- <input v-model="hform.HSourceBillNo" :placeholder="$t('Kf_EntrustOutBillList.sourceBillNoPlaceholder') == 'Kf_EntrustOutBillList.sourceBillNoPlaceholder' ? '璇疯緭鍏ユ簮鍗曞崟鍙�' : $t('Kf_EntrustOutBillList.sourceBillNoPlaceholder')" />
+ <input v-model="hform.HSourceBillNo" :placeholder="sourceBillNoPlaceholder" />
</view>
</view>
<view class="buttons">
- <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>
+ <button class="btn-a" size="mini" type="default" @tap="clear">{{ $t("Kf_EntrustOutBillList_PDA.btn_Reset") == "Kf_EntrustOutBillList_PDA.btn_Reset" ? "閲嶇疆" : $t("Kf_EntrustOutBillList_PDA.btn_Reset") }}</button>
+ <button class="btn-c" size="mini" type="default" @tap="search">{{ $t("Kf_EntrustOutBillList_PDA.btn_Query") == "Kf_EntrustOutBillList_PDA.btn_Query" ? "鏌ヨ" : $t("Kf_EntrustOutBillList_PDA.btn_Query") }}</button>
</view>
</view>
@@ -46,85 +37,75 @@
<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>{{ $t("Gy.HMaker") == "Gy.HMaker" ? "鍒跺崟浜猴細" : $t("Gy.HMaker") }}锛�</text>{{item.鍒跺崟浜簘}
+ <text>{{ $t("Kf_EntrustOutBillList_PDA.table_Maker") == "Kf_EntrustOutBillList_PDA.table_Maker" ? "鍒跺崟浜�" : $t("Kf_EntrustOutBillList_PDA.table_Maker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鍗曟嵁鍐呯爜">
- <text>{{ $t("Kf_EntrustOutBillList.table_BillID") == "Kf_EntrustOutBillList.table_BillID" ? "鍗曟嵁鍐呯爜锛�" : $t("Kf_EntrustOutBillList.table_BillID") }}锛�</text>{{item.鍗曟嵁鍐呯爜}}
+ <text>{{ $t("Kf_EntrustOutBillList_PDA.table_BillID") == "Kf_EntrustOutBillList_PDA.table_BillID" ? "鍗曟嵁鍐呯爜" : $t("Kf_EntrustOutBillList_PDA.table_BillID") }}锛�</text>{{item.鍗曟嵁鍐呯爜}}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>{{ $t("Gy.HQty") == "Gy.HQty" ? "鏁伴噺锛�" : $t("Gy.HQty") }}锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("Kf_EntrustOutBillList_PDA.table_Qty") == "Kf_EntrustOutBillList_PDA.table_Qty" ? "鏁伴噺" : $t("Kf_EntrustOutBillList_PDA.table_Qty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("Gy.HMainSourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("Kf_EntrustOutBillList_PDA.table_SourceBillNo") == "Kf_EntrustOutBillList_PDA.table_SourceBillNo" ? "婧愬崟鍗曞彿" : $t("Kf_EntrustOutBillList_PDA.table_SourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>{{ $t("Kf_EntrustOutBillList.table_Org") == "Kf_EntrustOutBillList.table_Org" ? "缁勭粐锛�" : $t("Kf_EntrustOutBillList.table_Org") }}锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("Kf_EntrustOutBillList_PDA.table_Org") == "Kf_EntrustOutBillList_PDA.table_Org" ? "缁勭粐" : $t("Kf_EntrustOutBillList_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>
- {{ $t("Kf_EntrustOutBillList.btn_Edit") == "Kf_EntrustOutBillList.btn_Edit" ? "缂栬緫" : $t("Kf_EntrustOutBillList.btn_Edit") }}
+ <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>{{ $t("Kf_EntrustOutBillList_PDA.btn_Edit") == "Kf_EntrustOutBillList_PDA.btn_Edit" ? "缂栬緫" : $t("Kf_EntrustOutBillList_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>
- {{ $t("Kf_EntrustOutBillList.btn_Del") == "Kf_EntrustOutBillList.btn_Del" ? "鍒犻櫎" : $t("Kf_EntrustOutBillList.btn_Del") }}
+ <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>{{ $t("Kf_EntrustOutBillList_PDA.btn_Del") == "Kf_EntrustOutBillList_PDA.btn_Del" ? "鍒犻櫎" : $t("Kf_EntrustOutBillList_PDA.btn_Del") }}
</view>
</view>
</uni-card>
</view>
<view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==1">
- <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>{{ $t("Kf_EntrustOutBillList.table_Status") == "Kf_EntrustOutBillList.table_Status" ? "鐘舵�侊細" : $t("Kf_EntrustOutBillList.table_Status") }}锛�</text>{{item.鐘舵�亇}
- </view>
- <view class="detail" v-if="item.鍒跺崟浜�">
- <text>{{ $t("Gy.HMaker") == "Gy.HMaker" ? "鍒跺崟浜猴細" : $t("Gy.HMaker") }}锛�</text>{{item.鍒跺崟浜簘}
- </view>
- <view class="detail" v-if="item.鏁伴噺">
- <text>{{ $t("Gy.HQty") == "Gy.HQty" ? "鏁伴噺锛�" : $t("Gy.HQty") }}锛�</text>{{item.鏁伴噺}}
- </view>
- <view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("Gy.HMainSourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
- </view>
- <view class="detail" v-if="item.鐗╂枡浠ｇ爜">
- <text>{{ $t("Gy.HNumber") == "Gy.HNumber" ? "鐗╂枡浠ｇ爜锛�" : $t("Gy.HNumber") }}锛�</text>{{item.鐗╂枡浠ｇ爜}}
- </view>
- <view class="detail" v-if="item.鐗╂枡鍚嶇О">
- <text>{{ $t("Gy.HName") == "Gy.HName" ? "鐗╂枡鍚嶇О锛�" : $t("Gy.HName") }}锛�</text>{{item.鐗╂枡鍚嶇О}}
- </view>
- <view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>{{ $t("Gy.HModel") == "Gy.HModel" ? "瑙勬牸鍨嬪彿锛�" : $t("Gy.HModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
- </view>
- <view class="detail" v-if="item.缁勭粐">
- <text>{{ $t("Kf_EntrustOutBillList.table_Org") == "Kf_EntrustOutBillList.table_Org" ? "缁勭粐锛�" : $t("Kf_EntrustOutBillList.table_Org") }}锛�</text>{{item.缁勭粐}}
- </view>
- </view>
+ <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>{{ $t("Kf_EntrustOutBillList_PDA.table_Status") == "Kf_EntrustOutBillList_PDA.table_Status" ? "鐘舵��" : $t("Kf_EntrustOutBillList_PDA.table_Status") }}锛�</text>{{item.鐘舵�亇}
+ </view>
+ <view class="detail" v-if="item.鍒跺崟浜�">
+ <text>{{ $t("Kf_EntrustOutBillList_PDA.table_Maker") == "Kf_EntrustOutBillList_PDA.table_Maker" ? "鍒跺崟浜�" : $t("Kf_EntrustOutBillList_PDA.table_Maker") }}锛�</text>{{item.鍒跺崟浜簘}
+ </view>
+ <view class="detail" v-if="item.鏁伴噺">
+ <text>{{ $t("Kf_EntrustOutBillList_PDA.table_Qty") == "Kf_EntrustOutBillList_PDA.table_Qty" ? "鏁伴噺" : $t("Kf_EntrustOutBillList_PDA.table_Qty") }}锛�</text>{{item.鏁伴噺}}
+ </view>
+ <view class="detail" v-if="item.婧愬崟鍗曞彿">
+ <text>{{ $t("Kf_EntrustOutBillList_PDA.sourceBillNo") == "Kf_EntrustOutBillList_PDA.sourceBillNo" ? "婧愬崟鍗曞彿" : $t("Kf_EntrustOutBillList_PDA.sourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
+ </view>
+ <view class="detail" v-if="item.鐗╂枡浠ｇ爜">
+ <text>{{ $t("Kf_EntrustOutBillList_PDA.table_MaterNumber") == "Kf_EntrustOutBillList_PDA.table_MaterNumber" ? "鐗╂枡浠ｇ爜" : $t("Kf_EntrustOutBillList_PDA.table_MaterNumber") }}锛�</text>{{item.鐗╂枡浠ｇ爜}}
+ </view>
+ <view class="detail" v-if="item.鐗╂枡鍚嶇О">
+ <text>{{ $t("Kf_EntrustOutBillList_PDA.table_MaterName") == "Kf_EntrustOutBillList_PDA.table_MaterName" ? "鐗╂枡鍚嶇О" : $t("Kf_EntrustOutBillList_PDA.table_MaterName") }}锛�</text>{{item.鐗╂枡鍚嶇О}}
+ </view>
+ <view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+ <text>{{ $t("Kf_EntrustOutBillList_PDA.table_MaterModel") == "Kf_EntrustOutBillList_PDA.table_MaterModel" ? "瑙勬牸鍨嬪彿" : $t("Kf_EntrustOutBillList_PDA.table_MaterModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ </view>
+ <view class="detail" v-if="item.缁勭粐">
+ <text>{{ $t("Kf_EntrustOutBillList_PDA.table_Org") == "Kf_EntrustOutBillList_PDA.table_Org" ? "缁勭粐" : $t("Kf_EntrustOutBillList_PDA.table_Org") }}锛�</text>{{item.缁勭粐}}
+ </view>
+ </view>
- <view class="more">
- <view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
- <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>
- {{ $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>
- {{ $t("Kf_EntrustOutBillList.btn_Revoke") == "Kf_EntrustOutBillList.btn_Revoke" ? "鎾ら攢" : $t("Kf_EntrustOutBillList.btn_Revoke") }}
- </view>
- </view>
- </uni-card>
+ <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>{{ $t("Kf_EntrustOutBillList_PDA.btn_DisplayCode") == "Kf_EntrustOutBillList_PDA.btn_DisplayCode" ? "鏄剧ず浜岀淮鐮�" : $t("Kf_EntrustOutBillList_PDA.btn_DisplayCode") }}
+ </view>
+ <view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
+ <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>{{ $t("Kf_EntrustOutBillList_PDA.btn_Revoke") == "Kf_EntrustOutBillList_PDA.btn_Revoke" ? "鎾ら攢" : $t("Kf_EntrustOutBillList_PDA.btn_Revoke") }}
+ </view>
+ </view>
+ </uni-card> <!-- 娣诲姞闂悎鏍囩 -->
</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>
+ <view class="over" v-if="!listData || listData.length == 0">{{ $t("Kf_EntrustOutBillList_PDA.noDate") == "Kf_EntrustOutBillList_PDA.noDate" ? "鏆傛棤鏁版嵁" : $t("Kf_EntrustOutBillList_PDA.noDate") }}</view>
+ <view class="over" v-if="listData.length != 0 && listData.length != showList.length">{{ $t("Kf_EntrustOutBillList_PDA.Loading") == "Kf_EntrustOutBillList_PDA.Loading" ? "鍔犺浇涓�..." : $t("Kf_EntrustOutBillList_PDA.Loading") }}</view>
+ <view class="over" v-if="listData.length != 0 && listData.length == showList.length">{{ $t("Kf_EntrustOutBillList_PDA.bottom") == "Kf_EntrustOutBillList_PDA.bottom" ? "宸插埌搴�" : $t("Kf_EntrustOutBillList_PDA.bottom") }}</view>
<BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
</view>
</template>
@@ -139,7 +120,7 @@
serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
tabs:0,
urls:'/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
- MvarReportTitle: this.$t('Kf_EntrustOutBillList.reportTitle') == 'Kf_EntrustOutBillList.reportTitle' ? '鐢熶骇棰嗘枡鍗曠紦瀛樺垪琛�' : this.$t('Kf_EntrustOutBillList.reportTitle'),
+ MvarReportTitle:'鐢熶骇棰嗘枡鍗曠紦瀛樺垪琛�',
hform:{
HBillNo:'',
HSourceBillNo:'',
@@ -153,10 +134,15 @@
showDetail:-1,
page:1,
+ billNoPlaceholder:this.$t("Kf_EntrustOutBillList_PDA.billNoPlaceholder") == "Kf_EntrustOutBillList_PDA.billNoPlaceholder" ? "璇疯緭鍏ュ崟鎹彿" : this.$t("Kf_EntrustOutBillList_PDA.billNoPlaceholder"),
+ sourceBillNoPlaceholder:this.$t("MoveStockBillList.sourceBillNoPlaceholder") == "Kf_EntrustOutBillList_PDA.sourceBillNoPlaceholder" ? "璇疯緭鍏ユ簮鍗曠紪鍙�" : this.$t("Kf_EntrustOutBillList_PDA.sourceBillNoPlaceholder"),
}
},
onShow() {
//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+ uni.setNavigationBarTitle({
+ title: this.$t("Kf_EntrustOutBillList_PDA.title") == 'Kf_EntrustOutBillList_PDA.title' ? '濮斿棰嗘枡' : this.$t("Kf_EntrustOutBillList_PDA.title")
+ })
this.CheckModRight()
this.changeTab(0)
console.log(this.userInfo,uni.getStorageSync('HUserName'))
@@ -200,7 +186,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: this.$t('Kf_EntrustOutBillList.requestFailed') == 'Kf_EntrustOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('Kf_EntrustOutBillList.requestFailed'),
+ title:'鎺ュ彛璇锋眰澶辫触',
icon:'none'
})
},
@@ -227,7 +213,7 @@
},
getList(){
uni.showLoading({
- title: this.$t('Kf_EntrustOutBillList.loadingTitle') == 'Kf_EntrustOutBillList.loadingTitle' ? '鍔犺浇涓�...' : this.$t('Kf_EntrustOutBillList.loadingTitle')
+ title:'鍔犺浇涓�...'
})
uni.request({
url: this.serverUrl + this.urls,
@@ -253,7 +239,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: this.$t('Kf_EntrustOutBillList.requestFailed') == 'Kf_EntrustOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('Kf_EntrustOutBillList.requestFailed'),
+ title:'鎺ュ彛璇锋眰澶辫触',
icon:'none'
})
},
@@ -318,7 +304,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: this.$t('Kf_EntrustOutBillList.requestFailed') == 'Kf_EntrustOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('Kf_EntrustOutBillList.requestFailed'),
+ title:'鎺ュ彛璇锋眰澶辫触',
icon:'none'
})
},
@@ -328,8 +314,8 @@
del(item){
// console.log(item.hmainid,uni.getStorageSync('HUserName'))
uni.showModal({
- 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'),
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -356,7 +342,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: this.$t('Kf_EntrustOutBillList.requestFailed') == 'Kf_EntrustOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('Kf_EntrustOutBillList.requestFailed'),
+ title:'鎺ュ彛璇锋眰澶辫触',
icon:'none'
})
},
@@ -371,8 +357,8 @@
revoke(item){
// console.log(item.hmainid,uni.getStorageSync('HUserName'))
uni.showModal({
- 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'),
+ title: '鎻愮ず',
+ content: '鏄惁纭鎾ら攢',
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -399,7 +385,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: this.$t('Kf_EntrustOutBillList.requestFailed') == 'Kf_EntrustOutBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('Kf_EntrustOutBillList.requestFailed'),
+ title:'鎺ュ彛璇锋眰澶辫触',
icon:'none'
})
},
@@ -526,4 +512,5 @@
}
}
}
-</style>
\ No newline at end of file
+
+</style>
--
Gitblit v1.9.1