From b007e23a8a249af8488ffe32822b046c345bddc0 Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期五, 13 三月 2026 08:55:14 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList.vue | 19 ++
pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue | 2
pages/xiaoshouchuku/SellOutBill.vue | 29 ++
pages/qitaruku_v2/OtherInBill.vue | 18 ++
pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue | 5
pages/index/tab1.vue | 50 ++++-
pages/shengchanrukushengdan/Kf_ProductInBill.vue | 13 +
pages/caigouruku/POStockInBill.vue | 10 +
pages/caigoutuiliao/POStockInBackBill.vue | 9 +
manifest.json | 4
pages/index/tab3.vue | 20 ++
pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue | 13 +
pages/zhijiediaobo/MoveStockBill.vue | 17 +
pages/index/login.vue | 14
pages/baogong/DayPlanBillList.vue | 36 ++++
pages/qitachuku_v2/OtherOutBill.vue | 213 +++++++++++++++++++-------
16 files changed, 370 insertions(+), 102 deletions(-)
diff --git a/manifest.json b/manifest.json
index 422b499..26a1709 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "2.091",
- "versionCode" : 291,
+ "versionName" : "2.092",
+ "versionCode" : 292,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue b/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
index 39ec9a8..8cf5531 100644
--- a/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
+++ b/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
@@ -108,6 +108,12 @@
<input v-model="hform.HEquipName" disabled />
</view>
</view>
+ <view class="form-item">
+ <view class="title">妯″叿:</view>
+ <view class="righton">
+ <input v-model="hform.HMouldName" disabled />
+ </view>
+ </view>
</view>
</template>
<!-- 鍏朵粬淇℃伅 -->
@@ -412,7 +418,9 @@
"HUpDater": "",
"HDeleteMan": "",
"HUpDateDate": "",
- "HDeleteDate": ""
+ "HDeleteDate": "",
+ "HMouldName": "",
+ "HMouldID": 0,
}
};
},
@@ -1003,6 +1011,9 @@
"HMainSourceEntryID": data[0].HEntryID,
"HMainSourceBillNo": data[0].鍗曟嵁鍙�,
"HMainSourceBillType": data[0].鍗曟嵁绫诲瀷,
+
+ "HMouldName": data[0].妯″叿鍚嶇О,
+ "HMouldID": data[0].HMouldID
})
this.HTechParams = data.map(item => {
diff --git a/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue
index 7ca551e..77e289d 100644
--- a/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue
+++ b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue
@@ -560,7 +560,7 @@
this.hform.HMouldMaintainRuleInterNo = data.鍗曟嵁鍙�;
this.hform.HMouldMaintainRuleInterID = data.hmainid;
this.hform.HPlanNo = data.淇濆吇璁″垝鍙� == null ? "" : data.淇濆吇璁″垝鍙�;
- this.hform.HPlanInterID = data.淇濆吇璁″垝id == null ? 0 : ata.淇濆吇璁″垝id,
+ this.hform.HPlanInterID = data.淇濆吇璁″垝id == null ? 0 : data.淇濆吇璁″垝id,
this.hform.HMouldMaintainPlanInterID = data.淇濆吇璁″垝id == null ? 0 :
data.淇濆吇璁″垝id;
this.hform.HMouldMaintainPlanEntryID = data.淇濆吇璁″垝瀛恑d == null ? 0 : data
diff --git a/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList.vue b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList.vue
index 1b2d665..1826255 100644
--- a/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList.vue
+++ b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList.vue
@@ -50,12 +50,27 @@
<view class="list" v-for="(item,index) in listData" :key="index">
<uni-card :title="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
- <view class="detail" v-if="item.鐐规鍛ㄦ湡">
- <text>鐐规鍛ㄦ湡锛�</text>{{item.鐐规鍛ㄦ湡}}
+ <view class="detail" v-if="item.淇濆吇璁″垝鍙�">
+ <text>淇濆吇璁″垝鍙凤細</text>{{item.淇濆吇璁″垝鍙穧}
+ </view>
+ <view class="detail" v-if="item.淇濆吇璁″垝id" v-show="false">
+ <text>淇濆吇璁″垝id锛�</text>{{item.淇濆吇璁″垝id}}
+ </view>
+ <view class="detail" v-if="item.淇濆吇璁″垝瀛恑d" v-show="false">
+ <text>淇濆吇璁″垝瀛恑d锛�</text>{{item.淇濆吇璁″垝瀛恑d}}
+ </view>
+ <view class="detail" v-if="item.淇濆吇鍛ㄦ湡">
+ <text>淇濆吇鍛ㄦ湡锛�</text>{{item.淇濆吇鍛ㄦ湡}}
</view>
<view class="detail" v-if="item.鍛ㄦ湡鍗曚綅">
<text>鍛ㄦ湡鍗曚綅锛�</text>{{item.鍛ㄦ湡鍗曚綅}}
</view>
+ <view class="detail" v-if="item.淇濆吇寮�濮嬫棩鏈�">
+ <text>淇濆吇寮�濮嬫棩鏈燂細</text>{{item.淇濆吇寮�濮嬫棩鏈�.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.淇濆吇缁撴潫鏃ユ湡">
+ <text>淇濆吇缁撴潫鏃ユ湡锛�</text>{{item.淇濆吇缁撴潫鏃ユ湡.substr(0,10)}}
+ </view>
<view class="detail" v-if="item.鎽樿">
<text>鎽樿锛�</text>{{item.鎽樿}}
</view>
diff --git a/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue b/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
index 09189f9..0098e9b 100644
--- a/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
+++ b/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
@@ -175,7 +175,7 @@
}
},
onSearchClickHandler() {
- this.getWorkLinkList()
+ this.switchTab(this.tabs)
},
onResetClickHandler() {
this.dateRangePicker = ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"],
@@ -187,6 +187,7 @@
},
switchTab(tabIndex) {
this.tabs = tabIndex
+ this.sWhere = ''
switch (tabIndex) {
case 0:
this.sWhere =
@@ -207,8 +208,8 @@
this.getWorkLinkList()
},
async getWorkLinkList() {
+ this.sWhere += ` and 鏃ユ湡 >= CONVERT(VARCHAR(10), '${this.startDate}', 23) and 鏃ユ湡 <= CONVERT(VARCHAR(10), '${this.endDate}', 23)`
try {
- this.sWhere += ` and 鏃ユ湡 >= CONVERT(VARCHAR(10), '${this.startDate}', 23) and 鏃ユ湡 <= CONVERT(VARCHAR(10), '${this.endDate}', 23)`
let res = await CommonUtils.doRequest2Async({
url: 'Sc_MESTransFerWorkBill/GetOA_WorkLinkBillList',
diff --git a/pages/baogong/DayPlanBillList.vue b/pages/baogong/DayPlanBillList.vue
index f0ccc8e..f23beb2 100644
--- a/pages/baogong/DayPlanBillList.vue
+++ b/pages/baogong/DayPlanBillList.vue
@@ -1,5 +1,39 @@
<template>
<view class="content">
+ <view class="list">
+ <uni-card :title="'褰撴湡璁㈠崟锛�'+currentOrder[0].HSourceBillNo"
+ style="margin: 10px;">
+ <view class="card-detail">
+ <view class="detail" v-if="currentOrder[0].HSourceName" style="width: 100%;">
+ <text>褰撳墠璁惧锛�</text>{{currentOrder[0].HSourceName}}
+ </view>
+ <view class="detail" v-if="currentOrder[0].棣栨娆℃暟?currentOrder[0].棣栨娆℃暟:0" style="width: 100%;">
+ <text>棣栨娆℃暟锛�</text>{{currentOrder[0].棣栨娆℃暟}}
+ </view>
+ <view class="detail">
+ <text>宸℃娆℃暟锛�</text>{{currentOrder[0].宸℃娆℃暟?currentOrder[0].宸℃娆℃暟:0}}
+ </view>
+ <view class="detail">
+ <text>杩囩▼妫�娆℃暟锛�</text>{{currentOrder[0].杩囩▼妫�娆℃暟?currentOrder[0].杩囩▼妫�娆℃暟:0}}
+ </view>
+ <view class="detail" v-if="currentOrder[0].褰撴棩鐐规瀹屾垚鎯呭喌">
+ <text>鐐规瀹屾垚鎯呭喌锛�</text>{{currentOrder[0].褰撴棩鐐规瀹屾垚鎯呭喌}}
+ </view>
+ <view class="detail" v-if="currentOrder[0].瀹夌伅鏈獙鏀舵暟閲�">
+ <text>寮傚父鍙嶉鏈獙鏀讹細</text>{{currentOrder[0].瀹夌伅鏈獙鏀舵暟閲弣}
+ <view style="width: 6rpx; display: inline-block;"></view>
+ <template v-if="currentOrder[0].瀹夌伅鏈獙鏀舵暟閲� == 0">
+ <uni-icons type="smallcircle-filled" size="12"
+ color="#13ad4c"></uni-icons>
+ </template>
+ <template v-else-if="currentOrder[0].瀹夌伅鏈獙鏀舵暟閲� != 0">
+ <uni-icons type="smallcircle-filled" size="12"
+ color="#e74c3c"></uni-icons>
+ </template>
+ </view>
+ </view>
+ </uni-card>
+ </view>
<view class="list" v-for="(item,index) in listData" :key="index">
<uni-card :title="'宸ュ崟鍙凤細'+item.HICMOBillNo" :extra="'鏃ユ湡锛�'+item.璁″垝鏃ユ湡" style="margin: 10px;" @tap="edit(item)">
<view class="card-detail">
@@ -58,6 +92,7 @@
chooseIt: '',
popList: ['浜哄憳鍘熷洜', '璁惧鍘熷洜', '鏉愭枡鍘熷洜', '宸ヨ壓鍘熷洜', '妯″叿鍘熷洜', '娴嬭瘯鍘熷洜', '鐜鍘熷洜'],
badReasonBackTypeList: [],
+ currentOrder: [],
// 瀹氫箟鎿嶄綔鏄犲皠閰嶇疆
actionConfig: {
'寮�宸�': {
@@ -177,6 +212,7 @@
if (res.data.count == 1) {
console.log(res.data.data.h_p_JIT_GetWorkBillListInfoBySource)
this.listData = res.data.data.h_p_JIT_GetWorkBillListInfoBySource
+ this.currentOrder = res.data.data.h_p_JIT_GetWorkBillListInfoBySource1
for (var i = 0; i < this.listData.length; i++) {
this.listData[i].percent = (this.listData[i].HDateFinishQty / this.listData[
i].HDatePlanQty).toFixed(4)
diff --git a/pages/caigouruku/POStockInBill.vue b/pages/caigouruku/POStockInBill.vue
index aa6e88c..17a731c 100644
--- a/pages/caigouruku/POStockInBill.vue
+++ b/pages/caigouruku/POStockInBill.vue
@@ -83,8 +83,12 @@
</view>
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+ <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
+ </view>
+ <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
</view>
+
<view class="righton" v-show="!showHSourceBillNo">
<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
@@ -298,6 +302,7 @@
} from "@/utils/userRelationManager.js"
import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+import { MpaasScan } from '../../utils/mpaasScan';
export default {
data() {
return {
@@ -438,6 +443,11 @@
uni.$off('BillSelectComplete')
},
methods: {
+ toScanBillCode() {
+ MpaasScan.scanCode((res) => {
+ this.getHBarCodeData(res)
+ })
+ },
async HWHNameScan(e) {
return
// 鎵弿浠撳簱鐮�
diff --git a/pages/caigoutuiliao/POStockInBackBill.vue b/pages/caigoutuiliao/POStockInBackBill.vue
index 01962d0..7605161 100644
--- a/pages/caigoutuiliao/POStockInBackBill.vue
+++ b/pages/caigoutuiliao/POStockInBackBill.vue
@@ -74,6 +74,9 @@
</view>
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+ <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
+ </view>
+ <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
</view>
<view class="righton" v-show="!showHSourceBillNo">
@@ -271,6 +274,7 @@
import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
import BillSelectPopupXiaoWeiVue from '../../components/BillSelectPopupXiaoWei/BillSelectPopupXiaoWei.vue';
+import { MpaasScan } from '../../utils/mpaasScan';
export default {
components: {
BillListPopupVue,
@@ -443,6 +447,11 @@
uni.$off('BillSelectComplete')
},
methods: {
+ toScanBillCode() {
+ MpaasScan.scanCode((res) => {
+ this.getHBarCodeData(res)
+ })
+ },
async HWHNameScan(e) {
// 鎵弿浠撳簱鐮�
console.log('浠撳簱鐮�: ', e);
diff --git a/pages/index/login.vue b/pages/index/login.vue
index d366219..443f3c4 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -165,13 +165,13 @@
methods: {
async ApplyLanguagePack(lang, forceUpdate = false) {
// 璇诲彇璇█鍖呭苟鍔犺浇
- let {
- data,
- getRemoteFile
- } = await getLanguagePackJson(lang)
- if (getRemoteFile) {
- this.$i18n.setLocaleMessage(lang, data)
- }
+ // let {
+ // data,
+ // getRemoteFile
+ // } = await getLanguagePackJson(lang)
+ // if (getRemoteFile) {
+ // this.$i18n.setLocaleMessage(lang, data)
+ // }
this.$i18n.locale = lang
},
onLanguageChangeHandler(e) {
diff --git a/pages/index/tab1.vue b/pages/index/tab1.vue
index 5eaf4ed..3d933b9 100644
--- a/pages/index/tab1.vue
+++ b/pages/index/tab1.vue
@@ -9,8 +9,7 @@
<view v-if="!canEdit" :hidden="item.hidden||!item.id" class="box" v-for="(item,index) in itemData"
:key="index" @tap="toUrl(item)">
<template v-if="item.corner">
- <uni-badge :text="item.cornerCount" type="error" :max-num="99" size="normal"
- absolute="rightTop"
+ <uni-badge :text="item.cornerCount" type="error" :max-num="99" size="normal" absolute="rightTop"
:offset="[7, 7]">
<image :src="item.img" mode=""></image>
</uni-badge>
@@ -195,26 +194,46 @@
this.getHiddenItem()
},
async onShow() {
- if(this.initFinished) {
+ if (this.initFinished) {
let MessageIdentifier = await this.getMessageIdentifierCount(this.menuListName)
- if(MessageIdentifier.code == 0) {
+ if (MessageIdentifier.code == 0) {
CommonUtils.showTips({
title: "娓╅Θ鎻愮ず",
message: MessageIdentifier.msg
})
-
+
return
}
-
+
this.itemData.forEach((e, index) => {
- if(MessageIdentifier.data[e.text] != undefined) {
+ if (MessageIdentifier.data[e.text] != undefined) {
this.itemData[index]["corner"] = true
this.itemData[index]["cornerCount"] = MessageIdentifier.data[e.text]
}
})
-
+
this.$forceUpdate()
}
+ },
+ async onReady() {
+ let MessageIdentifier = await this.getMessageIdentifierCount(this.menuListName)
+ if (MessageIdentifier.code == 0) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: MessageIdentifier.msg
+ })
+
+ return
+ }
+
+ this.itemData.forEach((e, index) => {
+ if (MessageIdentifier.data[e.text] != undefined) {
+ this.itemData[index]["corner"] = true
+ this.itemData[index]["cornerCount"] = MessageIdentifier.data[e.text]
+ }
+ })
+
+ this.$forceUpdate()
},
methods: {
async getWorkLinkList() {
@@ -269,7 +288,7 @@
acc[item['moduleName']] = item.count
return acc
}, {})
-
+
return {
code: 1,
msg: Message,
@@ -283,14 +302,14 @@
}
}
} catch (err) {
-
+
}
},
async getHiddenItem() {
let data = await getMenuList({
menuName: this.menuListName
})
-
+
Array.from(data).forEach((e, index) => {
if (index < this.itemData.length) {
this.itemData[e["HIndex"]]["hidden"] = !CommonUtils.stringToBoolean(e[
@@ -298,22 +317,23 @@
this.itemData[e["HIndex"]].id = e["HEntryID"]; //id涓�0寮哄埗闅愯棌
}
})
-
+
let MessageIdentifier = await this.getMessageIdentifierCount(this.menuListName)
if (MessageIdentifier.code == 0) {
CommonUtils.showTips({
title: "娓╅Θ鎻愮ず",
message: MessageIdentifier.msg
})
-
+
return
}
-
+
Array.from(data).forEach((e, index) => {
if (index < this.itemData.length) {
if (MessageIdentifier.data[this.itemData[e["HIndex"]].text]) {
this.$set(this.itemData[e["HIndex"]], "corner", true)
- this.$set(this.itemData[e["HIndex"]], "cornerCount", MessageIdentifier.data[this.itemData[e["HIndex"]].text])
+ this.$set(this.itemData[e["HIndex"]], "cornerCount", MessageIdentifier.data[this
+ .itemData[e["HIndex"]].text])
}
}
})
diff --git a/pages/index/tab3.vue b/pages/index/tab3.vue
index 02c704f..0f1f1d2 100644
--- a/pages/index/tab3.vue
+++ b/pages/index/tab3.vue
@@ -323,6 +323,26 @@
this.$forceUpdate()
}
},
+ async onReady() {
+ let MessageIdentifier = await this.getMessageIdentifierCount(this.menuListName)
+ if (MessageIdentifier.code == 0) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: MessageIdentifier.msg
+ })
+
+ return
+ }
+
+ this.itemData.forEach((e, index) => {
+ if (MessageIdentifier.data[e.text] != undefined) {
+ this.itemData[index]["corner"] = true
+ this.itemData[index]["cornerCount"] = MessageIdentifier.data[e.text]
+ }
+ })
+
+ this.$forceUpdate()
+ },
methods: {
judgeHidden() {
return process.env.NODE_ENV === 'development'
diff --git a/pages/qitachuku_v2/OtherOutBill.vue b/pages/qitachuku_v2/OtherOutBill.vue
index e8b17ba..b2c20ed 100644
--- a/pages/qitachuku_v2/OtherOutBill.vue
+++ b/pages/qitachuku_v2/OtherOutBill.vue
@@ -2,7 +2,9 @@
<view>
<view class="form">
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.BarCode") == "Kf_OtherOutBill_PDA.BarCode" ? "鏉＄爜" : $t("Kf_OtherOutBill_PDA.BarCode") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.BarCode") == "Kf_OtherOutBill_PDA.BarCode" ? "鏉＄爜" : $t("Kf_OtherOutBill_PDA.BarCode") }}锛�
+ </view>
<view class="right" style="width: 380rpx;">
<input :focus="BarCodeFocus" v-model="hform.HBarCode" :placeholder="placeholder_BarCode"
@confirm="getCode(hform.HBarCode)" />
@@ -12,40 +14,59 @@
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Qty") == "Kf_OtherOutBill_PDA.Qty" ? "鏁伴噺" : $t("Kf_OtherOutBill_PDA.Qty") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Qty") == "Kf_OtherOutBill_PDA.Qty" ? "鏁伴噺" : $t("Kf_OtherOutBill_PDA.Qty") }}锛�
+ </view>
<view class="right">
<input v-model="hform.HQty" :placeholder="placeholder_Qty" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Warehouse") == "Kf_OtherOutBill_PDA.Warehouse" ? "浠撳簱" : $t("Kf_OtherOutBill_PDA.Warehouse") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Warehouse") == "Kf_OtherOutBill_PDA.Warehouse" ? "浠撳簱" : $t("Kf_OtherOutBill_PDA.Warehouse") }}锛�
+ </view>
<view class="right">
<uni-combox :candidates="arrayHWHName" :placeholder="placeholder_Warehouse" v-model="hform.HWHName"
@input="HWHNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.StockPlace") == "Kf_OtherOutBill_PDA.StockPlace" ? "浠撲綅" : $t("Kf_OtherOutBill_PDA.StockPlace") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.StockPlace") == "Kf_OtherOutBill_PDA.StockPlace" ? "浠撲綅" : $t("Kf_OtherOutBill_PDA.StockPlace") }}锛�
+ </view>
<view class="right" v-show="showHStockPlaceName">
<uni-combox :candidates="HStockPlaceNameListComputed" :placeholder="placeholder_StockPlace"
v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
</view>
<view class="righton" v-show="!showHStockPlaceName">
- <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" :placeholder="$t('Kf_OtherOutBill_PDA.disabledPlaceholder')" />
+ <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName"
+ :placeholder="$t('Kf_OtherOutBill_PDA.disabledPlaceholder')" />
</view>
</view>
<view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">{{ $t("Kf_OtherOutBill_PDA.selectSource") == "Kf_OtherOutBill_PDA.selectSource" ? "閫夋嫨婧愬崟" : $t("Kf_OtherOutBill_PDA.selectSource") }}</view>
- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">{{ $t("Kf_OtherOutBill_PDA.tableInfo") == "Kf_OtherOutBill_PDA.tableInfo" ? "琛ㄥご淇℃伅" : $t("Kf_OtherOutBill_PDA.tableInfo") }}</view>
- <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">{{ $t("Kf_OtherOutBill_PDA.materInfo") == "Kf_OtherOutBill_PDA.materInfo" ? "鐗╂枡淇℃伅" : $t("Kf_OtherOutBill_PDA.materInfo") }}</view>
- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">{{ $t("Kf_OtherOutBill_PDA.barInfo") == "Kf_OtherOutBill_PDA.barInfo" ? "鏉＄爜淇℃伅" : $t("Kf_OtherOutBill_PDA.barInfo") }}</view>
- <view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">{{ $t("Kf_OtherOutBill_PDA.removeShelvesInfo") == "Kf_OtherOutBill_PDA.removeShelvesInfo" ? "涓嬫灦淇℃伅" : $t("Kf_OtherOutBill_PDA.removeShelvesInfo") }}</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">
+ {{ $t("Kf_OtherOutBill_PDA.selectSource") == "Kf_OtherOutBill_PDA.selectSource" ? "閫夋嫨婧愬崟" : $t("Kf_OtherOutBill_PDA.selectSource") }}
+ </view>
+ <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">
+ {{ $t("Kf_OtherOutBill_PDA.tableInfo") == "Kf_OtherOutBill_PDA.tableInfo" ? "琛ㄥご淇℃伅" : $t("Kf_OtherOutBill_PDA.tableInfo") }}
+ </view>
+ <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">
+ {{ $t("Kf_OtherOutBill_PDA.materInfo") == "Kf_OtherOutBill_PDA.materInfo" ? "鐗╂枡淇℃伅" : $t("Kf_OtherOutBill_PDA.materInfo") }}
+ </view>
+ <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">
+ {{ $t("Kf_OtherOutBill_PDA.barInfo") == "Kf_OtherOutBill_PDA.barInfo" ? "鏉＄爜淇℃伅" : $t("Kf_OtherOutBill_PDA.barInfo") }}
+ </view>
+ <view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">
+ {{ $t("Kf_OtherOutBill_PDA.removeShelvesInfo") == "Kf_OtherOutBill_PDA.removeShelvesInfo" ? "涓嬫灦淇℃伅" : $t("Kf_OtherOutBill_PDA.removeShelvesInfo") }}
+ </view>
</view>
<view v-if="tabs == 0">
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.SourceBillType") == "Kf_OtherOutBill_PDA.SourceBillType" ? "婧愬崟绫诲瀷" : $t("Kf_OtherOutBill_PDA.SourceBillType") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.SourceBillType") == "Kf_OtherOutBill_PDA.SourceBillType" ? "婧愬崟绫诲瀷" : $t("Kf_OtherOutBill_PDA.SourceBillType") }}锛�
+ </view>
<view class="right" v-show="showHMainSourceBillType">
<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
@change="HMainSourceBillTypeChange">
@@ -60,54 +81,75 @@
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.SourceBillNo") == "Kf_OtherOutBill_PDA.SourceBillNo" ? "婧愬崟鍗曞彿" : $t("Kf_OtherOutBill_PDA.SourceBillNo") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.SourceBillNo") == "Kf_OtherOutBill_PDA.SourceBillNo" ? "婧愬崟鍗曞彿" : $t("Kf_OtherOutBill_PDA.SourceBillNo") }}锛�
+ </view>
<view class="right" v-show="showHSourceBillNo">
<input :focus="HSourceBillNoFocus" @confirm="onHSourceBillNoConfirmHandler" type="text"
- name="HSourceBillNo" v-model="hform.HSourceBillNo" :placeholder="placeholder_SourceBillNo" />
+ name="HSourceBillNo" v-model="hform.HSourceBillNo"
+ :placeholder="placeholder_SourceBillNo" />
</view>
+ <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+ <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
+ </view>
+
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType == -1">
<uni-icons :hidden="hform.HMainSourceBillType == -1" type="search" size="20"
@click="showBillList"></uni-icons>
</view>
<view class="righton" v-show="!showHSourceBillNo">
- <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" :placeholder="placeholder_SourceBillNo" />
+ <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo"
+ :placeholder="placeholder_SourceBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.BillSubType") == "Kf_OtherOutBill_PDA.BillSubType" ? "鍗曟嵁瀛愮被鍨�" : $t("Kf_OtherOutBill_PDA.BillSubType") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.BillSubType") == "Kf_OtherOutBill_PDA.BillSubType" ? "鍗曟嵁瀛愮被鍨�" : $t("Kf_OtherOutBill_PDA.BillSubType") }}锛�
+ </view>
<view class="right">
<picker :range="arrayHBillSubType" v-model="hform.HBillSubType" @change="HBillSubTypeChange">
- <input disabled name="HMainSourceBillType" v-model="HBillSubType" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_BillSubType')" />
+ <input disabled name="HMainSourceBillType" v-model="HBillSubType"
+ :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_BillSubType')" />
<view class="picker-overlay"></view>
</picker>
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.FIFOWarehouse") == "Kf_OtherOutBill_PDA.FIFOWarehouse" ? "鍏堣繘鍏堝嚭浠�" : $t("Kf_OtherOutBill_PDA.FIFOWarehouse") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.FIFOWarehouse") == "Kf_OtherOutBill_PDA.FIFOWarehouse" ? "鍏堣繘鍏堝嚭浠�" : $t("Kf_OtherOutBill_PDA.FIFOWarehouse") }}锛�
+ </view>
<view class="right">
- <uni-combox :candidates="arrayHWHName" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_FIFOWarehouse')" v-model="hform.HFIFOWHName"
- @input="HFIFOWHNameChange"></uni-combox>
+ <uni-combox :candidates="arrayHWHName"
+ :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_FIFOWarehouse')"
+ v-model="hform.HFIFOWHName" @input="HFIFOWHNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Date") == "Kf_OtherOutBill_PDA.Date" ? "鏃ユ湡" : $t("Kf_OtherOutBill_PDA.Date") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Date") == "Kf_OtherOutBill_PDA.Date" ? "鏃ユ湡" : $t("Kf_OtherOutBill_PDA.Date") }}锛�
+ </view>
<view class="right">
<picker mode="date" v-model="hform.HDate" @change="HDateChange">
<view class="picker-overlay"></view>
- <input disabled v-model="hform.HDate" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Date')" />
+ <input disabled v-model="hform.HDate"
+ :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Date')" />
</picker>
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Maker") == "Kf_OtherOutBill_PDA.Maker" ? "鍒跺崟浜�" : $t("Kf_OtherOutBill_PDA.Maker") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Maker") == "Kf_OtherOutBill_PDA.Maker" ? "鍒跺崟浜�" : $t("Kf_OtherOutBill_PDA.Maker") }}锛�
+ </view>
<view class="righton">
<input name="HMaker" disabled v-model="hform.HMaker" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.BillNo") == "Kf_OtherOutBill_PDA.BillNo" ? "鍗曟嵁鍙�" : $t("Kf_OtherOutBill_PDA.BillNo") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.BillNo") == "Kf_OtherOutBill_PDA.BillNo" ? "鍗曟嵁鍙�" : $t("Kf_OtherOutBill_PDA.BillNo") }}锛�
+ </view>
<view class="righton">
<input name="HBillNo" disabled v-model="hform.HBillNo" />
</view>
@@ -116,7 +158,9 @@
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.BillID") == "Kf_OtherOutBill_PDA.BillID" ? "鍗曟嵁ID" : $t("Kf_OtherOutBill_PDA.BillID") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.BillID") == "Kf_OtherOutBill_PDA.BillID" ? "鍗曟嵁ID" : $t("Kf_OtherOutBill_PDA.BillID") }}锛�
+ </view>
<view class="righton">
<input name="HInterID" disabled v-model="hform.HInterID" />
</view>
@@ -125,34 +169,48 @@
<view v-if="tabs == 1">
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Keeper") == "Kf_OtherOutBill_PDA.Keeper" ? "淇濈" : $t("Kf_OtherOutBill_PDA.Keeper") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Keeper") == "Kf_OtherOutBill_PDA.Keeper" ? "淇濈" : $t("Kf_OtherOutBill_PDA.Keeper") }}锛�
+ </view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Keeper')" v-model="hform.HKeeperName"
+ <uni-combox :candidates="arrayHEmpName"
+ :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Keeper')" v-model="hform.HKeeperName"
@input="HKeeperNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.SecManager") == "Kf_OtherOutBill_PDA.SecManager" ? "楠屾敹" : $t("Kf_OtherOutBill_PDA.SecManager") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.SecManager") == "Kf_OtherOutBill_PDA.SecManager" ? "楠屾敹" : $t("Kf_OtherOutBill_PDA.SecManager") }}锛�
+ </view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_SecManager')" v-model="hform.HSecManagerName"
- @input="HSecManagerNameChange"></uni-combox>
+ <uni-combox :candidates="arrayHEmpName"
+ :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_SecManager')"
+ v-model="hform.HSecManagerName" @input="HSecManagerNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Dept") == "Kf_OtherOutBill_PDA.Dept" ? "閮ㄩ棬" : $t("Kf_OtherOutBill_PDA.Dept") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Dept") == "Kf_OtherOutBill_PDA.Dept" ? "閮ㄩ棬" : $t("Kf_OtherOutBill_PDA.Dept") }}锛�
+ </view>
<view class="right">
- <uni-combox :candidates="arrayHDeptName" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Dept')" v-model="hform.HDeptName"
+ <uni-combox :candidates="arrayHDeptName"
+ :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Dept')" v-model="hform.HDeptName"
@input="HDeptNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Customer") == "Kf_OtherOutBill_PDA.Customer" ? "瀹㈡埛" : $t("Kf_OtherOutBill_PDA.Customer") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Customer") == "Kf_OtherOutBill_PDA.Customer" ? "瀹㈡埛" : $t("Kf_OtherOutBill_PDA.Customer") }}锛�
+ </view>
<view class="righton">
- <input name="HSupName" disabled v-model="hform.HSupName" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Customer')" />
+ <input name="HSupName" disabled v-model="hform.HSupName"
+ :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Customer')" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.StockOrg") == "Kf_OtherOutBill_PDA.StockOrg" ? "缁勭粐" : $t("Kf_OtherOutBill_PDA.StockOrg") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.StockOrg") == "Kf_OtherOutBill_PDA.StockOrg" ? "缁勭粐" : $t("Kf_OtherOutBill_PDA.StockOrg") }}锛�
+ </view>
<view class="righton">
<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
</view>
@@ -184,7 +242,9 @@
</view>
</uni-card>
</view>
- <view class="over" v-if="Materlist.length == 0">{{ $t("Kf_OtherOutBill_PDA.noData") == "Kf_OtherOutBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("Kf_OtherOutBill_PDA.noData") }}</view>
+ <view class="over" v-if="Materlist.length == 0">
+ {{ $t("Kf_OtherOutBill_PDA.noData") == "Kf_OtherOutBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("Kf_OtherOutBill_PDA.noData") }}
+ </view>
</view>
<view v-if="tabs == 4">
@@ -216,60 +276,80 @@
</view>
</uni-card>
</view>
- <view class="over" v-if="FIFOlist.length == 0">{{ $t("Kf_OtherOutBill_PDA.noData") == "Kf_OtherOutBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("Kf_OtherOutBill_PDA.noData") }}</view>
+ <view class="over" v-if="FIFOlist.length == 0">
+ {{ $t("Kf_OtherOutBill_PDA.noData") == "Kf_OtherOutBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("Kf_OtherOutBill_PDA.noData") }}
+ </view>
</view>
<view v-if="tabs == 3">
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.BarCode") == "Kf_OtherOutBill_PDA.BarCode" ? "鏉＄爜" : $t("Kf_OtherOutBill_PDA.BarCode") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.BarCode") == "Kf_OtherOutBill_PDA.BarCode" ? "鏉＄爜" : $t("Kf_OtherOutBill_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">{{ $t("Kf_OtherOutBill_PDA.Material") == "Kf_OtherOutBill_PDA.Material" ? "鐗╂枡" : $t("Kf_OtherOutBill_PDA.Material") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Material") == "Kf_OtherOutBill_PDA.Material" ? "鐗╂枡" : $t("Kf_OtherOutBill_PDA.Material") }}锛�
+ </view>
<view class="righton">
<input disabled v-model="hform.HMaterName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.MaterModel") == "Kf_OtherOutBill_PDA.MaterModel" ? "瑙勬牸" : $t("Kf_OtherOutBill_PDA.MaterModel") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.MaterModel") == "Kf_OtherOutBill_PDA.MaterModel" ? "瑙勬牸" : $t("Kf_OtherOutBill_PDA.MaterModel") }}锛�
+ </view>
<view class="righton">
<input disabled v-model="hform.HMaterModel_B" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.BatchNo") == "Kf_OtherOutBill_PDA.BatchNo" ? "鎵规" : $t("Kf_OtherOutBill_PDA.BatchNo") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.BatchNo") == "Kf_OtherOutBill_PDA.BatchNo" ? "鎵规" : $t("Kf_OtherOutBill_PDA.BatchNo") }}锛�
+ </view>
<view class="righton">
<input disabled v-model="hform.HBatchNo_B" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Unit") == "Kf_OtherOutBill_PDA.Unit" ? "鍗曚綅" : $t("Kf_OtherOutBill_PDA.Unit") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Unit") == "Kf_OtherOutBill_PDA.Unit" ? "鍗曚綅" : $t("Kf_OtherOutBill_PDA.Unit") }}锛�
+ </view>
<view class="righton">
<input disabled v-model="hform.HUnitName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Qty") == "Kf_OtherOutBill_PDA.Qty" ? "鏁伴噺" : $t("Kf_OtherOutBill_PDA.Qty") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Qty") == "Kf_OtherOutBill_PDA.Qty" ? "鏁伴噺" : $t("Kf_OtherOutBill_PDA.Qty") }}锛�
+ </view>
<view class="righton">
<input disabled v-model="hform.HQty_B" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Capacity") == "Kf_OtherOutBill_PDA.Capacity" ? "瀹归噺" : $t("Kf_OtherOutBill_PDA.Capacity") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Capacity") == "Kf_OtherOutBill_PDA.Capacity" ? "瀹归噺" : $t("Kf_OtherOutBill_PDA.Capacity") }}锛�
+ </view>
<view class="righton">
<input disabled v-model="hform.HTMQty_B" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Warehouse") == "Kf_OtherOutBill_PDA.Warehouse" ? "浠撳簱" : $t("Kf_OtherOutBill_PDA.Warehouse") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Warehouse") == "Kf_OtherOutBill_PDA.Warehouse" ? "浠撳簱" : $t("Kf_OtherOutBill_PDA.Warehouse") }}锛�
+ </view>
<view class="righton">
<input disabled v-model="hform.HWHName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.StockPlace") == "Kf_OtherOutBill_PDA.StockPlace" ? "浠撲綅" : $t("Kf_OtherOutBill_PDA.StockPlace") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.StockPlace") == "Kf_OtherOutBill_PDA.StockPlace" ? "浠撲綅" : $t("Kf_OtherOutBill_PDA.StockPlace") }}锛�
+ </view>
<view class="righton">
<input disabled v-model="hform.HSPName_B" />
</view>
@@ -277,10 +357,13 @@
</view>
<view class="bottom-btn">
- <button class="btn-a" size="mini" @tap="submit">{{ $t("Kf_OtherOutBill_PDA.btnSubmit") == "Kf_OtherOutBill_PDA.btnSubmit" ? "鎻愪氦" : $t("Kf_OtherOutBill_PDA.btnSubmit") }}</button>
+ <button class="btn-a" size="mini"
+ @tap="submit">{{ $t("Kf_OtherOutBill_PDA.btnSubmit") == "Kf_OtherOutBill_PDA.btnSubmit" ? "鎻愪氦" : $t("Kf_OtherOutBill_PDA.btnSubmit") }}</button>
<view style="flex: 1;"></view>
- <button class="btn-a" size="mini" @tap="addNew">{{ $t("Kf_OtherOutBill_PDA.btnAdd") == "Kf_OtherOutBill_PDA.btnAdd" ? "鏂板" : $t("Kf_OtherOutBill_PDA.btnAdd") }}</button>
- <button class="btn-c" size="mini" @tap="goBack">{{ $t("Kf_OtherOutBill_PDA.btnExit") == "Kf_OtherOutBill_PDA.btnExit" ? "閫�鍑�" : $t("Kf_OtherOutBill_PDA.btnExit") }}</button>
+ <button class="btn-a" size="mini"
+ @tap="addNew">{{ $t("Kf_OtherOutBill_PDA.btnAdd") == "Kf_OtherOutBill_PDA.btnAdd" ? "鏂板" : $t("Kf_OtherOutBill_PDA.btnAdd") }}</button>
+ <button class="btn-c" size="mini"
+ @tap="goBack">{{ $t("Kf_OtherOutBill_PDA.btnExit") == "Kf_OtherOutBill_PDA.btnExit" ? "閫�鍑�" : $t("Kf_OtherOutBill_PDA.btnExit") }}</button>
</view>
</view>
<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
@@ -301,14 +384,24 @@
getUserStockRelation
} from '../../utils/userRelationManager';
import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+ import { MpaasScan } from '../../utils/mpaasScan';
export default {
data() {
return {
- placeholder_BarCode: this.$t("Kf_OtherOutBill_PDA.placeholder_BarCode") == "Kf_OtherOutBill_PDA.placeholder_BarCode" ? "璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" : this.$t("Kf_OtherOutBill_PDA.placeholder_BarCode"),
- placeholder_Qty: this.$t("Kf_OtherOutBill_PDA.placeholder_Qty") == "Kf_OtherOutBill_PDA.placeholder_Qty" ? "璇疯緭鍏ユ暟閲�" : this.$t("Kf_OtherOutBill_PDA.placeholder_Qty"),
- placeholder_Warehouse: this.$t("Kf_OtherOutBill_PDA.placeholder_Warehouse") == "Kf_OtherOutBill_PDA.placeholder_Warehouse" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" : this.$t("Kf_OtherOutBill_PDA.placeholder_Warehouse"),
- placeholder_StockPlace: this.$t("Kf_OtherOutBill_PDA.placeholder_StockPlace") == "Kf_OtherOutBill_PDA.placeholder_StockPlace" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" : this.$t("Kf_OtherOutBill_PDA.placeholder_StockPlace"),
- placeholder_SourceBillNo: this.$t("Kf_OtherOutBill_PDA.placeholder_SourceBillNo") == "Kf_OtherOutBill_PDA.placeholder_SourceBillNo" ? "璇疯緭鍏ユ簮鍗曞崟鍙�" : this.$t("Kf_OtherOutBill_PDA.placeholder_SourceBillNo"),
+ placeholder_BarCode: this.$t("Kf_OtherOutBill_PDA.placeholder_BarCode") ==
+ "Kf_OtherOutBill_PDA.placeholder_BarCode" ? "璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" : this.$t(
+ "Kf_OtherOutBill_PDA.placeholder_BarCode"),
+ placeholder_Qty: this.$t("Kf_OtherOutBill_PDA.placeholder_Qty") ==
+ "Kf_OtherOutBill_PDA.placeholder_Qty" ? "璇疯緭鍏ユ暟閲�" : this.$t("Kf_OtherOutBill_PDA.placeholder_Qty"),
+ placeholder_Warehouse: this.$t("Kf_OtherOutBill_PDA.placeholder_Warehouse") ==
+ "Kf_OtherOutBill_PDA.placeholder_Warehouse" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" : this.$t(
+ "Kf_OtherOutBill_PDA.placeholder_Warehouse"),
+ placeholder_StockPlace: this.$t("Kf_OtherOutBill_PDA.placeholder_StockPlace") ==
+ "Kf_OtherOutBill_PDA.placeholder_StockPlace" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" : this.$t(
+ "Kf_OtherOutBill_PDA.placeholder_StockPlace"),
+ placeholder_SourceBillNo: this.$t("Kf_OtherOutBill_PDA.placeholder_SourceBillNo") ==
+ "Kf_OtherOutBill_PDA.placeholder_SourceBillNo" ? "璇疯緭鍏ユ簮鍗曞崟鍙�" : this.$t(
+ "Kf_OtherOutBill_PDA.placeholder_SourceBillNo"),
userInfo: getUserInfo(),
serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
HModName: 'Kf_OtherOutBill_PDA',
@@ -419,8 +512,9 @@
},
onLoad(e) {
uni.setNavigationBarTitle({
- title: this.$t("Kf_OtherOutBill_PDA.title")
- });
+ title: this.$t("Kf_OtherOutBill_PDA.title") == 'Kf_OtherOutBill_PDA.title' ?
+ '鍏朵粬鍑哄簱鍗�' : this.$t("Kf_OtherOutBill_PDA.title")
+ });
console.log(e, this.userInfo)
this.OperationType = e.OperationType
if (e.HInterID) {
@@ -453,6 +547,11 @@
uni.$off('BillSelectComplete')
},
methods: {
+ toScanBillCode() {
+ MpaasScan.scanCode((res) => {
+ this.getHBarCodeData(res)
+ })
+ },
async HWHNameScan(e) {
// 鎵弿浠撳簱鐮�
console.log('浠撳簱鐮�: ', e);
@@ -470,7 +569,7 @@
// 鎵弿浠撲綅鐮�
console.log('浠撲綅鐮�: ', e);
let index = this.HStockPlaceNameList.findIndex(elem => elem['鏉＄爜缂栧彿'] == e.trim())
- // 涓嶅厛缃┖鐨勮瘽锛屾暟鎹啀娆℃壂鎻忕浉鍚岀殑浠撲綅鐮� 涓嶄細瑙﹀彂缁勪欢鍐呯殑鍒锋柊
+ // 涓嶅厛缃┖鐨勮瘽锛屾暟鎹啀娆℃壂鎻忕浉鍚岀殑浠撲綅鐮� 涓嶄細瑙﹀彂缁勪欢鍐呯殑鍒锋柊
this.hform.HStockPlaceID = 0
this.hform.HStockPlaceName = ''
await this.$nextTick()
@@ -1907,7 +2006,7 @@
font-weight: bold;
}
}
-
+
.right {
// width: 450rpx;
diff --git a/pages/qitaruku_v2/OtherInBill.vue b/pages/qitaruku_v2/OtherInBill.vue
index 2f1f286..d2d0819 100644
--- a/pages/qitaruku_v2/OtherInBill.vue
+++ b/pages/qitaruku_v2/OtherInBill.vue
@@ -74,6 +74,13 @@
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType == -1">
<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
</view>
+ <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+ <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
+ </view>
+
+ <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType == -1">
+ <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+ </view>
<view class="righton" v-show="!showHSourceBillNo">
<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" :placeholder="Kf_OtherInBill_PDA" />
@@ -312,6 +319,7 @@
import {
getUserStockRelation
} from '../../utils/userRelationManager';
+ import { MpaasScan } from '@/utils/mpaasScan';
export default {
data() {
return {
@@ -442,8 +450,9 @@
},
onLoad(e) {
uni.setNavigationBarTitle({
- title: this.$t("Kf_OtherInBill_PDA.title")
- })
+ title: this.$t("Kf_OtherInBill_PDA.title") == 'Kf_OtherInBill_PDA.title'
+ ? '鍏朵粬鍏ュ簱鍗�' : this.$t("Kf_OtherInBill_PDA.title")
+ })
console.log(e, this.userInfo)
this.OperationType = e.OperationType
if (e.HInterID) {
@@ -476,6 +485,11 @@
uni.$off('BillSelectComplete')
},
methods: {
+ toScanBillCode() {
+ MpaasScan.scanCode((res) => {
+ this.getHBarCodeData(res)
+ })
+ },
async HWHNameScan(e) {
// 鎵弿浠撳簱鐮�
console.log('浠撳簱鐮�: ', e);
diff --git a/pages/shengchanrukushengdan/Kf_ProductInBill.vue b/pages/shengchanrukushengdan/Kf_ProductInBill.vue
index 13093c7..f48236f 100644
--- a/pages/shengchanrukushengdan/Kf_ProductInBill.vue
+++ b/pages/shengchanrukushengdan/Kf_ProductInBill.vue
@@ -73,6 +73,9 @@
:placeholder="placeholder_SourceBillNo" />
</view>
+ <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+ <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
+ </view>
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
</view>
@@ -305,7 +308,8 @@
getUserStockRelation
} from "@/utils/userRelationManager.js"
import BillSelectPopupXiaoWeiVue from '../../components/BillSelectPopupXiaoWei/BillSelectPopupXiaoWei.vue';
- export default {
+ import { MpaasScan } from '../../utils/mpaasScan';
+ export default {
data() {
return {
userInfo: getUserInfo(),
@@ -428,7 +432,7 @@
},
async onLoad(e) {
uni.setNavigationBarTitle({
- title: this.$t("Kf_ProductInBill_PDA.title")
+ title: this.$t("Kf_ProductInBill_PDA.title") == 'Kf_ProductInBill_PDA.title' ? '鐢熶骇鍏ュ簱鍗�' : this.$t("Kf_ProductInBill_PDA.title")
})
console.log(e, this.userInfo)
this.OperationType = e.OperationType
@@ -459,6 +463,11 @@
uni.$off('BillSelectComplete')
},
methods: {
+ toScanBillCode() {
+ MpaasScan.scanCode((res) => {
+ this.getHBarCodeData(res)
+ })
+ },
async HWHNameScan(e) {
return
// 鎵弿浠撳簱鐮�
diff --git a/pages/xiaoshouchuku/SellOutBill.vue b/pages/xiaoshouchuku/SellOutBill.vue
index 503ce49..657a1c0 100644
--- a/pages/xiaoshouchuku/SellOutBill.vue
+++ b/pages/xiaoshouchuku/SellOutBill.vue
@@ -27,12 +27,17 @@
<view class="form-item">
<view class="title">{{ $t("SellOutBill_PDA.StockPlace") == "SellOutBill_PDA.StockPlace" ? "浠撲綅" : $t("SellOutBill_PDA.StockPlace") }}:</view>
<!-- 鍥涚淮灏斿惎鐢ㄤ粨浣嶆壂鐮� 鍏朵粬瀹㈡埛鎸夐渶鍚敤鎺у埗 -->
+<<<<<<< HEAD
<view class="right" >
<uni-combox :candidates="HStockPlaceNameListComputed" :placeholder="placeholder_SCStockPlace"
+=======
+ <view class="right">
+ <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+>>>>>>> ab4be81fa6146ef1238f96ba3bc92bc64f74a553
v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
@confirm="HStockPlaceNameScan"></uni-combox>
</view>
-<!-- <view class="righton" v-show="!showHStockPlaceName">
+ <!-- <view class="righton" v-show="!showHStockPlaceName">
<input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="涓嶅彲鎿嶄綔" />
</view> -->
</view>
@@ -79,6 +84,10 @@
name="HSourceBillNo" v-model="hform.HSourceBillNo" :placeholder="placeholder_SourceBillNo" />
</view>
+ <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+ <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
+ </view>
+
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
</view>
@@ -316,6 +325,7 @@
CommonUtils
} from '../../utils/common';
import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+ import { MpaasScan } from '../../utils/mpaasScan';
export default {
data() {
return {
@@ -484,6 +494,11 @@
uni.$off('BillSelectComplete')
},
methods: {
+ toScanBillCode() {
+ MpaasScan.scanCode((res) => {
+ this.getHBarCodeData(res)
+ })
+ },
async HWHNameScan(e) {
return
// 鎵弿浠撳簱鐮�
@@ -512,9 +527,9 @@
Organization: uni.getStorageSync('Organization')
},
})
-
+
if (res.data.count == 1) {
-
+
this.hform.HStockPlaceID = res.data.data[0].HMainID
this.hform.HStockPlaceName = res.data.data[0].浠撲綅鍚嶇О
this.hform.HWHID = res.data.data[0].HWHID
@@ -525,7 +540,7 @@
icon: 'none'
})
}
-
+
} catch (err) {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
@@ -829,7 +844,7 @@
if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
this.showHStockPlaceName = true
this.getStockPlaceRemote(this.HWHNameList[i]["HSPGroupID"])
- }
+ }
}
}
},
@@ -843,7 +858,7 @@
Organization: uni.getStorageSync('Organization')
},
})
-
+
if (res.data.count == 1) {
this.HStockPlaceNameList = res.data.data
for (var i = 0; i < res.data.data.length; i++) {
@@ -855,7 +870,7 @@
icon: 'none'
})
}
-
+
} catch (err) {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
diff --git a/pages/zhijiediaobo/MoveStockBill.vue b/pages/zhijiediaobo/MoveStockBill.vue
index 8addda0..cb86cdf 100644
--- a/pages/zhijiediaobo/MoveStockBill.vue
+++ b/pages/zhijiediaobo/MoveStockBill.vue
@@ -72,6 +72,9 @@
</view>
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+ <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
+ </view>
+ <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
</view>
@@ -392,6 +395,7 @@
getUserStockRelation
} from '../../utils/userRelationManager';
import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+ import { MpaasScan } from '../../utils/mpaasScan';
export default {
data() {
return {
@@ -616,6 +620,11 @@
}
},
methods: {
+ toScanBillCode() {
+ MpaasScan.scanCode((res) => {
+ this.getHBarCodeData(res)
+ })
+ },
//鑾峰彇渚涘簲鍟嗘暟鎹�
getHCusList() {
if (!this.hform.HStockOrgID) {
@@ -1063,7 +1072,7 @@
for (var i = 0; i < res.data.data.length; i++) {
this.arrayHWHInName[i] = res.data.data[i].浠撳簱鍚嶇О
}
-
+
this.HWHInNameChange(getUserInfo()["HSCWHName"])
} else {
uni.showToast({
@@ -1451,13 +1460,13 @@
},
//閫夋嫨婧愬崟绫诲瀷
HMainSourceBillTypeChange(e) {
- console.log('e: ',e);
+ console.log('e: ', e);
let index = e.detail.value
if (index != -1) {
this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[index]
}
-
+
},
//鑾峰彇渚涘簲鍟嗘暟鎹�
@@ -2069,7 +2078,7 @@
console.log(33, res.data.data[0]);
if (res.data.count == 1) {
var data = res.data.data[0]
-
+
this.hform.HInterID = data.HInterID
this.hform.HBillNo = data.HBillNo
this.hform.HMainSourceBillType = data.HSourceBillType
--
Gitblit v1.9.1