From 7fee2d3972fc2d9a9bd251279c658aaf5d6a039e Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 30 三月 2026 09:56:01 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue | 162 +-
pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue | 118 +-
pages/index/tab2.vue | 7
pages/MJGL/shangmudan/MouldUpperBill.vue | 155 +-
pages/index/tab4.vue | 7
pages/gongxuOut/Cj_StationOutBill_Standard.vue | 172 ++-
pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue | 10
pages/ZLGL/QCNoPassProdRequestBillMain/QCNoPassProdRequestBillMain.vue | 1368 +++++++++++++++++++++++++++
pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP.vue | 61 +
pages/ZLGL/QCNoPassProdRequestBillMain/QCNoPassProdRequestBillMainList.vue | 8
pages/tiaomamingxi/tiaomamingxi.vue | 509 ++++++++++
package.json | 2
pages/index/login.vue | 2
pages/weiwaigxOut/Cj_StationEntrustOutBill.vue | 7
pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue | 4
pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue | 173 +-
pages/weiwaigxIn/Cj_StationEntrustInBill.vue | 10
pages/MJGL/xiamodan/MouldLowerBill.vue | 122 +-
18 files changed, 2,458 insertions(+), 439 deletions(-)
diff --git a/package.json b/package.json
index 7077f66..fe27dc0 100644
--- a/package.json
+++ b/package.json
@@ -22,4 +22,4 @@
"uqrcodejs": "^4.0.7",
"vue-i18n": "^9.1.9"
}
-}
\ 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 059f5f1..0ca6c49 100644
--- a/pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP.vue
+++ b/pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP.vue
@@ -219,8 +219,9 @@
<view class="form" :style="{
height: containerHeight + 'px',
overflow: 'auto'
- }">
- <view class="list" v-for="(item,index) in HMaterList" :key="index">
+ }">
+ <!-- 鐗╂枡鍒楄〃 - 浣跨敤鎺掑簭鍚庣殑鏁版嵁 -->
+ <view class="list" v-for="(item,index) in paginatedMaterList" :key="index">
<uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠ｇ爜" style="margin: 10px;" @tap="delMater(item)">
<view class="card-detail">
<view class="detail">
@@ -241,15 +242,21 @@
<view class="detail" v-if="item.杈呭姪灞炴��">
<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
</view>
- <!-- 鍏磋揪瀹㈡埛 鍔熻兘 -->
- <view class="detail" v-if="materMeta[0].HWHName && /鍏磋揪/.test(hform.HStockOrgName
- )">
+ <view class="detail" v-if="materMeta[0].HWHName && /鍏磋揪/.test(hform.HStockOrgName)">
<text>浠撳簱锛�</text>{{materMeta[0].HWHName}}
</view>
</view>
</uni-card>
</view>
- <view class="over" v-if="HMaterList.length == 0">鏆傛棤鏁版嵁</view>
+ <view style="padding: 10px; background: #f5f5f5; display: flex; justify-content: space-between; align-items: center;">
+ <text>鍏� {{ sortedMaterList.length }} 鏉�</text>
+ <view>
+ <button size="mini" @click="prevPage" :disabled="currentPage === 1" style="margin-right: 10px;">涓婁竴椤�</button>
+ <text>{{ currentPage }}/{{ totalPages }}</text>
+ <button size="mini" @click="nextPage" :disabled="currentPage === totalPages" style="margin-left: 10px;">涓嬩竴椤�</button>
+ </view>
+ </view>
+ <view class="over" v-if="sortedMaterList.length == 0">鏆傛棤鏁版嵁</view>
</view>
</template>
@@ -400,6 +407,10 @@
},
data() {
return {
+ currentPage: 1,
+ pageSize: 10,
+ sortedMaterList: [], // 鎺掑簭鍚庣殑鐗╂枡鍒楄〃
+ paginatedMaterList: [] ,// 褰撳墠椤垫樉绀虹殑鐗╂枡
tabs: 0,
hcpFocus: false,
barCodeFocus: false,
@@ -565,6 +576,39 @@
this.barCodeFocus = true;
}, 100);
},
+ // 鎺掑簭鐗╂枡锛堟湁鏁伴噺鐨勬帓鍦ㄥ墠闈級
+ sortMaterList(list) {
+ if (!list || list.length === 0) return []
+ return [...list].sort((a, b) => {
+ // 鏁伴噺澶т簬0鐨勬帓鍦ㄥ墠闈�
+ if (a.鏁伴噺 > 0 && b.鏁伴噺 <= 0) return -1
+ if (a.鏁伴噺 <= 0 && b.鏁伴噺 > 0) return 1
+ return b.鏁伴噺 - a.鏁伴噺 // 閮芥湁鏁伴噺鎴栭兘娌℃湁锛屾寜鏁伴噺闄嶅簭
+ })
+ },
+
+ // 鏇存柊褰撳墠椤垫暟鎹�
+ updatePageData() {
+ const start = (this.currentPage - 1) * this.pageSize
+ const end = start + this.pageSize
+ this.paginatedMaterList = this.sortedMaterList.slice(start, end)
+ },
+
+ // 涓婁竴椤�
+ prevPage() {
+ if (this.currentPage > 1) {
+ this.currentPage--
+ this.updatePageData()
+ }
+ },
+
+ // 涓嬩竴椤�
+ nextPage() {
+ if (this.currentPage < Math.ceil(this.sortedMaterList.length / this.pageSize)) {
+ this.currentPage++
+ this.updatePageData()
+ }
+ },
async set_InitBillSubType(){
try{
let res = await CommonUtils.doRequest2Async({
@@ -816,6 +860,8 @@
}
});
},
+
+
// 鍣ㄥ叿鍒犻櫎
async delMould(item) {
uni.showModal({
@@ -1772,6 +1818,9 @@
this.FIFOlist = data.FIFOlist
}
}
+ this.sortedMaterList = this.sortMaterList(this.HMaterList)
+ this.currentPage = 1
+ this.updatePageData()
// 鏍规嵁鏄惁鏄鏉＄爜閰嶇疆浠撲綅淇℃伅
if (sBarCodePrefix == 'PAK') {
diff --git a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
index fea4951..5d42826 100644
--- a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
+++ b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
@@ -1,8 +1,12 @@
<template>
<view>
<view class="tabs" id="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
- <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">
+ {{ $t("Sb_EquipConkBookBill.tabBasic") == "Sb_EquipConkBookBill.tabBasic" ? "鍩烘湰淇℃伅" : $t("Sb_EquipConkBookBill.tabBasic") }}
+ </view>
+ <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">
+ {{ $t("Sb_EquipConkBookBill.tabOther") == "Sb_EquipConkBookBill.tabOther" ? "鍏朵粬淇℃伅" : $t("Sb_EquipConkBookBill.tabOther") }}
+ </view>
</view>
<!-- 鍩烘湰淇℃伅 -->
<template v-if="tabs == 0">
@@ -11,94 +15,85 @@
overflow: 'auto'
}">
<view class="form-item">
- <view class="title">璁惧鏉＄爜:</view>
+ <view class="title">{{ $t("Sb_EquipConkBookBill.HBarCode") == "Sb_EquipConkBookBill.HBarCode" ? "璁惧鏉＄爜:" : $t("Sb_EquipConkBookBill.HBarCode") }}</view>
<view :class="enableEdit?'right':'righton'">
<input v-model="hform.HBarCode" :disabled="!enableEdit"
- @confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)璁惧鏉＄爜" />
+ @confirm="GetMessageByBarCode(hform.HBarCode)" :placeholder="$t('Sb_EquipConkBookBill.HBarCode_Placeholder') == 'Sb_EquipConkBookBill.HBarCode_Placeholder' ? '璇疯緭鍏�(鎴栨壂鎻�)璁惧鏉＄爜' : $t('Sb_EquipConkBookBill.HBarCode_Placeholder')" />
</view>
<view class="icon-wrapper">
<uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
</view>
</view>
<view class="form-item">
- <view class="title">寮�濮嬫椂闂�:</view>
+ <view class="title">{{ $t("Sb_EquipConkBookBill.HConkBeginDate") == "Sb_EquipConkBookBill.HConkBeginDate" ? "寮�濮嬫椂闂�:" : $t("Sb_EquipConkBookBill.HConkBeginDate") }}</view>
<view class="right">
<uni-datetime-picker type="datetime" :clear-icon="false" v-model="hform.HRepairPlanBeginDate">
- <input :value="hform.HConkBeginDate" />
+ <input :value="hform.HConkBeginDate" :placeholder="$t('Gy.HDate_Placeholder') == 'Gy.HDate_Placeholder' ? '璇烽�夋嫨' : $t('Gy.HDate_Placeholder')" />
</uni-datetime-picker>
</view>
</view>
<view class="form-item">
- <view class="title required">鏁呴殰绫诲埆:</view>
+ <view class="title required">{{ $t("Sb_EquipConkBookBill.HConkTypeName") == "Sb_EquipConkBookBill.HConkTypeName" ? "鏁呴殰绫诲埆:" : $t("Sb_EquipConkBookBill.HConkTypeName") }}</view>
<zxz-uni-data-select required class="right" :localdata="HConkTypeList" dataKey="鏁呴殰绫诲埆鍚嶇О"
dataValue="hitemid" v-model="hform.HConkTypeID">
-
</zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
</view>
<view class="form-item">
- <view class="title required">鏁呴殰鍘熷洜:</view>
+ <view class="title required">{{ $t("Sb_EquipConkBookBill.HConkReasonName") == "Sb_EquipConkBookBill.HConkReasonName" ? "鏁呴殰鍘熷洜:" : $t("Sb_EquipConkBookBill.HConkReasonName") }}</view>
<zxz-uni-data-select required class="right" :localdata="HConkReasonList" dataKey="HName"
dataValue="HItemID" v-model="hform.HConkReasonID">
</zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
</view>
<view class="form-item">
- <view class="title">鏁呴殰鎻忚堪:</view>
+ <view class="title">{{ $t("Sb_EquipConkBookBill.HExplanation") == "Sb_EquipConkBookBill.HExplanation" ? "鏁呴殰鎻忚堪:" : $t("Sb_EquipConkBookBill.HExplanation") }}</view>
<view class="right">
- <textarea v-model="hform.HExplanation" placeholder="璇疯緭鍏ユ晠闅滄弿杩�" />
+ <textarea v-model="hform.HExplanation" :placeholder="$t('Sb_EquipConkBookBill.HExplanation_Placeholder') == 'Sb_EquipConkBookBill.HExplanation_Placeholder' ? '璇疯緭鍏ユ晠闅滄弿杩�' : $t('Sb_EquipConkBookBill.HExplanation_Placeholder')" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("Gy.HBillNo") == "Gy.HBillNo" ? "鍗曟嵁鍙�:" : $t("Gy.HBillNo") }}</view>
<view class="righton">
<input disabled v-model="hform.HBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁鏃ユ湡:</view>
+ <view class="title">{{ $t("Gy.HDate") == "Gy.HDate" ? "鍗曟嵁鏃ユ湡:" : $t("Gy.HDate") }}</view>
<view class="righton">
<input disabled v-model="hform.HDate" />
</view>
</view>
<view class="form-item">
- <view class="title required">閮ㄩ棬:</view>
+ <view class="title required">{{ $t("Gy.HDeptName") == "Gy.HDeptName" ? "閮ㄩ棬:" : $t("Gy.HDeptName") }}</view>
<zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
dataValue="HItemID" v-model="hform.HDeptID">
-
</zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
</view>
<view class="form-item">
- <view class="title required">鍙戠幇浜�:</view>
+ <view class="title required">{{ $t("Sb_EquipConkBookBill.HEmpName") == "Sb_EquipConkBookBill.HEmpName" ? "鍙戠幇浜�:" : $t("Sb_EquipConkBookBill.HEmpName") }}</view>
<zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
dataValue="HItemID" v-model="hform.HEmpID">
-
</zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
</view>
<view class="form-item">
- <view class="title required">楠屾敹浜�:</view>
+ <view class="title required">{{ $t("Sb_EquipConkBookBill.HManagerName") == "Sb_EquipConkBookBill.HManagerName" ? "楠屾敹浜�:" : $t("Sb_EquipConkBookBill.HManagerName") }}</view>
<zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
dataValue="HItemID" v-model="hform.HManagerID">
-
</zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
</view>
<view class="form-item">
- <view class="title">璁惧鍚嶇О:</view>
+ <view class="title">{{ $t("Sb_EquipConkBookBill.HBarName") == "Sb_EquipConkBookBill.HBarName" ? "璁惧鍚嶇О:" : $t("Sb_EquipConkBookBill.HBarName") }}</view>
<view class="righton">
<input v-model="hform.HBarName" disabled />
</view>
</view>
<view class="form-item">
- <view class="title">璁惧瑙勬牸:</view>
+ <view class="title">{{ $t("Sb_EquipConkBookBill.HBarSpec") == "Sb_EquipConkBookBill.HBarSpec" ? "璁惧瑙勬牸:" : $t("Sb_EquipConkBookBill.HBarSpec") }}</view>
<view class="righton">
<input v-model="hform.HBarSpec" disabled />
</view>
</view>
<view class="form-item">
- <view class="title">璁惧鍨嬪彿:</view>
+ <view class="title">{{ $t("Sb_EquipConkBookBill.HBarModel") == "Sb_EquipConkBookBill.HBarModel" ? "璁惧鍨嬪彿:" : $t("Sb_EquipConkBookBill.HBarModel") }}</view>
<view class="righton">
<input v-model="hform.HBarModel" disabled />
</view>
@@ -113,49 +108,49 @@
overflow: 'auto'
}">
<view class="form-item">
- <view class="title">鍒涘缓浜�:</view>
+ <view class="title">{{ $t("Gy.HMaker") == "Gy.HMaker" ? "鍒涘缓浜�:" : $t("Gy.HMaker") }}</view>
<view class="righton">
<input v-model="hform.HMaker" />
</view>
</view>
<view class="form-item">
- <view class="title">鍒涘缓鏃ユ湡:</view>
+ <view class="title">{{ $t("Gy.HMakeDate") == "Gy.HMakeDate" ? "鍒涘缓鏃ユ湡:" : $t("Gy.HMakeDate") }}</view>
<view class="righton">
<input v-model="hform.HMakeDate" />
</view>
</view>
<view class="form-item">
- <view class="title">淇敼浜�:</view>
+ <view class="title">{{ $t("Gy.HUpDater") == "Gy.HUpDater" ? "淇敼浜�:" : $t("Gy.HUpDater") }}</view>
<view class="righton">
<input v-model="hform.HUpDater" />
</view>
</view>
<view class="form-item">
- <view class="title">淇敼鏃ユ湡:</view>
+ <view class="title">{{ $t("Gy.HUpDateDate") == "Gy.HUpDateDate" ? "淇敼鏃ユ湡:" : $t("Gy.HUpDateDate") }}</view>
<view class="righton">
<input v-model="hform.HUpDateDate" />
</view>
</view>
<view class="form-item">
- <view class="title">瀹℃牳浜�:</view>
+ <view class="title">{{ $t("Gy.HChecker") == "Gy.HChecker" ? "瀹℃牳浜�:" : $t("Gy.HChecker") }}</view>
<view class="righton">
<input v-model="hform.HChecker" />
</view>
</view>
<view class="form-item">
- <view class="title">瀹℃牳鏃堕棿:</view>
+ <view class="title">{{ $t("Gy.HCheckDate") == "Gy.HCheckDate" ? "瀹℃牳鏃堕棿:" : $t("Gy.HCheckDate") }}</view>
<view class="righton">
<input v-model="hform.HCheckDate" />
</view>
</view>
<view class="form-item">
- <view class="title">浣滃簾浜�:</view>
+ <view class="title">{{ $t("Gy.HDeleteMan") == "Gy.HDeleteMan" ? "浣滃簾浜�:" : $t("Gy.HDeleteMan") }}</view>
<view class="righton">
<input v-model="hform.HDeleteMan" />
</view>
</view>
<view class="form-item">
- <view class="title">浣滃簾鏃ユ湡:</view>
+ <view class="title">{{ $t("Gy.HDeleteDate") == "Gy.HDeleteDate" ? "浣滃簾鏃ユ湡:" : $t("Gy.HDeleteDate") }}</view>
<view class="righton">
<input v-model="hform.HDeleteDate" />
</view>
@@ -165,12 +160,11 @@
</template>
<!-- 鎿嶄綔鎸夐挳 -->
<view class="buttons" id="buttons">
- <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button class="btn-a" size="mini" @tap="submit">{{ $t("Sb_EquipConkBookBill.submit") == "Sb_EquipConkBookBill.submit" ? "鎻愪氦" : $t("Sb_EquipConkBookBill.submit") }}</button>
<view style="flex: 1;"></view>
- <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
- <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ <button class="btn-a" size="mini" @tap="addNew">{{ $t("Sb_EquipConkBookBill.addNew") == "Sb_EquipConkBookBill.addNew" ? "鏂板" : $t("Sb_EquipConkBookBill.addNew") }}</button>
+ <button class="btn-c" size="mini" @tap="goBack">{{ $t("Sb_EquipConkBookBill.goBack") == "Sb_EquipConkBookBill.goBack" ? "閫�鍑�" : $t("Sb_EquipConkBookBill.goBack") }}</button>
</view>
- <!-- <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload> -->
</view>
</template>
@@ -278,14 +272,14 @@
this.HConkTypeList = data
} else {
CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇鏁呴殰绫诲埆澶辫触: ${Message}`
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
+ message: `${this.$t('Sb_EquipConkBookBill.getConkTypeFailed') == 'Sb_EquipConkBookBill.getConkTypeFailed' ? '鑾峰彇鏁呴殰绫诲埆澶辫触' : this.$t('Sb_EquipConkBookBill.getConkTypeFailed')}: ${Message}`
})
}
} catch (err) {
CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇鏁呴殰绫诲埆澶辫触: ${err}`
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
+ message: `${this.$t('Sb_EquipConkBookBill.getConkTypeFailed') == 'Sb_EquipConkBookBill.getConkTypeFailed' ? '鑾峰彇鏁呴殰绫诲埆澶辫触' : this.$t('Sb_EquipConkBookBill.getConkTypeFailed')}: ${err}`
})
}
},
@@ -308,14 +302,14 @@
this.HConkReasonList = data
} else {
CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇鏁呴殰鍘熷洜澶辫触: ${Message}`
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
+ message: `${this.$t('Sb_EquipConkBookBill.getConkReasonFailed') == 'Sb_EquipConkBookBill.getConkReasonFailed' ? '鑾峰彇鏁呴殰鍘熷洜澶辫触' : this.$t('Sb_EquipConkBookBill.getConkReasonFailed')}: ${Message}`
})
}
} catch (err) {
CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇鏁呴殰鍘熷洜澶辫触: ${err}`
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
+ message: `${this.$t('Sb_EquipConkBookBill.getConkReasonFailed') == 'Sb_EquipConkBookBill.getConkReasonFailed' ? '鑾峰彇鏁呴殰鍘熷洜澶辫触' : this.$t('Sb_EquipConkBookBill.getConkReasonFailed')}: ${err}`
})
}
},
@@ -327,37 +321,37 @@
ValidCheck() {
if (this.hform.HEquipID == 0) {
return {
- Message: "鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!",
+ Message: this.$t('Sb_EquipConkBookBill.noEquipInfo') == 'Sb_EquipConkBookBill.noEquipInfo' ? '鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!' : this.$t('Sb_EquipConkBookBill.noEquipInfo'),
state: false
}
}
if (this.hform.HDeptID == 0) {
return {
- Message: "閮ㄩ棬涓嶅緱涓虹┖!",
+ Message: this.$t('Sb_EquipConkBookBill.deptRequired') == 'Sb_EquipConkBookBill.deptRequired' ? '閮ㄩ棬涓嶅緱涓虹┖!' : this.$t('Sb_EquipConkBookBill.deptRequired'),
state: false
}
}
if (this.hform.HEmpID == 0) {
return {
- Message: "鍙戠幇浜轰笉寰椾负绌�!",
+ Message: this.$t('Sb_EquipConkBookBill.discovererRequired') == 'Sb_EquipConkBookBill.discovererRequired' ? '鍙戠幇浜轰笉寰椾负绌�!' : this.$t('Sb_EquipConkBookBill.discovererRequired'),
state: false
}
}
if (this.hform.HManagerID == 0) {
return {
- Message: "楠屾敹浜轰笉寰椾负绌�!",
+ Message: this.$t('Sb_EquipConkBookBill.checkerRequired') == 'Sb_EquipConkBookBill.checkerRequired' ? '楠屾敹浜轰笉寰椾负绌�!' : this.$t('Sb_EquipConkBookBill.checkerRequired'),
state: false
}
}
if (this.hform.HConkReasonID == 0) {
return {
- Message: "鏁呴殰鍘熷洜涓嶅緱涓虹┖!",
+ Message: this.$t('Sb_EquipConkBookBill.reasonRequired') == 'Sb_EquipConkBookBill.reasonRequired' ? '鏁呴殰鍘熷洜涓嶅緱涓虹┖!' : this.$t('Sb_EquipConkBookBill.reasonRequired'),
state: false
}
}
if (this.hform.HConkTypeID == 0) {
return {
- Message: "鏁呴殰绫诲埆涓嶅緱涓虹┖!",
+ Message: this.$t('Sb_EquipConkBookBill.typeRequired') == 'Sb_EquipConkBookBill.typeRequired' ? '鏁呴殰绫诲埆涓嶅緱涓虹┖!' : this.$t('Sb_EquipConkBookBill.typeRequired'),
state: false
}
}
@@ -397,14 +391,14 @@
},
success: (uploadRes) => {
CommonUtils.showTips({
- message: "涓婁紶鎴愬姛"
+ message: this.$t('Sb_EquipConkBookBill.uploadSuccess') == 'Sb_EquipConkBookBill.uploadSuccess' ? '涓婁紶鎴愬姛' : this.$t('Sb_EquipConkBookBill.uploadSuccess')
})
- this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
+ this.attachmentInfo[index].status = this.$t('Sb_EquipConkBookBill.uploadSuccess') == 'Sb_EquipConkBookBill.uploadSuccess' ? '涓婁紶鎴愬姛' : this.$t('Sb_EquipConkBookBill.uploadSuccess')
},
fail: (err) => {
CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `涓婁紶澶辫触: ${err}`
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
+ message: `${this.$t('Sb_EquipConkBookBill.uploadFailed') == 'Sb_EquipConkBookBill.uploadFailed' ? '涓婁紶澶辫触' : this.$t('Sb_EquipConkBookBill.uploadFailed')}: ${err}`
})
}
})
@@ -412,8 +406,8 @@
delFile(index) {
console.log('attachmentInfo: ', this.attachmentInfo[index]);
uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+ title: this.$t('Sb_EquipConkBookBill.confirmTitle') == 'Sb_EquipConkBookBill.confirmTitle' ? '鎻愮ず' : this.$t('Sb_EquipConkBookBill.confirmTitle'),
+ content: this.$t('Sb_EquipConkBookBill.delConfirm') == 'Sb_EquipConkBookBill.delConfirm' ? '纭瑕佸垹闄� " ' : this.$t('Sb_EquipConkBookBill.delConfirm') + this.attachmentInfo[index].fileName + this.$t('Sb_EquipConkBookBill.delConfirmSuffix') == 'Sb_EquipConkBookBill.delConfirmSuffix' ? ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�' : this.$t('Sb_EquipConkBookBill.delConfirmSuffix'),
success: (res) => {
if (res.confirm) {
this.attachmentInfo.splice(index, 1)
@@ -428,7 +422,7 @@
this.attachmentInfo.push({
fileName: fileInfo.name,
size: fileInfo.size,
- status: '绛夊緟涓婁紶',
+ status: this.$t('Sb_EquipConkBookBill.uploadWaiting') == 'Sb_EquipConkBookBill.uploadWaiting' ? '绛夊緟涓婁紶' : this.$t('Sb_EquipConkBookBill.uploadWaiting'),
filePath: fileInfo.tempFilePath
})
},
@@ -455,13 +449,13 @@
this.HShiftsList = data
} else {
CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
message: Message
})
}
} catch (err) {
CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
message: err
})
}
@@ -487,13 +481,13 @@
this.HDeptList = data
} else {
CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
message: Message
})
}
} catch (err) {
CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
message: err
})
}
@@ -522,13 +516,13 @@
this.HEmpList = data
} else {
CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
message: Message
})
}
} catch (err) {
CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
message: err
})
}
@@ -571,14 +565,14 @@
this.enableEdit = false
} else {
CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
message: Message
})
}
} catch (err) {
CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
message: err
})
}
@@ -631,14 +625,14 @@
} else {
CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${Message}`
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
+ message: `${this.$t('Sb_EquipConkBookBill.getCheckRuleFailed') == 'Sb_EquipConkBookBill.getCheckRuleFailed' ? '鑾峰彇鐐规瑙勭▼閿欒' : this.$t('Sb_EquipConkBookBill.getCheckRuleFailed')}: ${Message}`
})
}
} catch (err) {
CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
+ message: `${this.$t('Sb_EquipConkBookBill.getCheckRuleFailed') == 'Sb_EquipConkBookBill.getCheckRuleFailed' ? '鑾峰彇鐐规瑙勭▼閿欒' : this.$t('Sb_EquipConkBookBill.getCheckRuleFailed')}: ${err}`
})
}
},
@@ -669,8 +663,8 @@
this.hform.HBillNo = data[0]["HBillNo"]
} catch (err) {
CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
+ message: `${this.$t('Sb_EquipConkBookBill.getBillInfoFailed') == 'Sb_EquipConkBookBill.getBillInfoFailed' ? '鑾峰彇鍗曟嵁淇℃伅寮傚父' : this.$t('Sb_EquipConkBookBill.getBillInfoFailed')}: ` + err
})
}
},
@@ -709,8 +703,8 @@
} = res.data
if (count == 1) {
uni.showModal({
- title: '鎻愮ず',
- content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ title: this.$t('Sb_EquipConkBookBill.confirmTitle') == 'Sb_EquipConkBookBill.confirmTitle' ? '鎻愮ず' : this.$t('Sb_EquipConkBookBill.confirmTitle'),
+ content: res.data.Message + (this.$t('Sb_EquipConkBookBill.continueAdd') == 'Sb_EquipConkBookBill.continueAdd' ? '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)' : this.$t('Sb_EquipConkBookBill.continueAdd')),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -727,16 +721,16 @@
});
} else {
CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
+ message: `${this.$t('Sb_EquipConkBookBill.submitFailed') == 'Sb_EquipConkBookBill.submitFailed' ? '鎻愪氦鍗曟嵁澶辫触' : this.$t('Sb_EquipConkBookBill.submitFailed')}: ` + Message
})
}
} catch (err) {
CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: "鎻愪氦鍗曟嵁澶辫触: " + err
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
+ message: `${this.$t('Sb_EquipConkBookBill.submitFailed') == 'Sb_EquipConkBookBill.submitFailed' ? '鎻愪氦鍗曟嵁澶辫触' : this.$t('Sb_EquipConkBookBill.submitFailed')}: ` + err
})
}
},
@@ -762,15 +756,15 @@
this.enableEdit = false
} else {
CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇鏁呴殰鐧昏鍗曞け璐�: ${msg}`
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
+ message: `${this.$t('Sb_EquipConkBookBill.getEditFailed') == 'Sb_EquipConkBookBill.getEditFailed' ? '鑾峰彇鏁呴殰鐧昏鍗曞け璐�' : this.$t('Sb_EquipConkBookBill.getEditFailed')}: ${msg}`
})
}
} catch (err) {
CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇鏁呴殰鐧昏鍗曞け璐�: ${err}`
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
+ message: `${this.$t('Sb_EquipConkBookBill.getEditFailed') == 'Sb_EquipConkBookBill.getEditFailed' ? '鑾峰彇鏁呴殰鐧昏鍗曞け璐�' : this.$t('Sb_EquipConkBookBill.getEditFailed')}: ${err}`
})
}
},
@@ -803,19 +797,22 @@
})
} else {
CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇璁惧鏁版嵁澶辫触: ${Message}`
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
+ message: `${this.$t('Sb_EquipConkBookBill.getEquipFailed') == 'Sb_EquipConkBookBill.getEquipFailed' ? '鑾峰彇璁惧鏁版嵁澶辫触' : this.$t('Sb_EquipConkBookBill.getEquipFailed')}: ${Message}`
})
}
} catch (err) {
CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇璁惧鏁版嵁澶辫触: ${err}`
+ title: this.$t('Sb_EquipConkBookBill.tipTitle') == 'Sb_EquipConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sb_EquipConkBookBill.tipTitle'),
+ message: `${this.$t('Sb_EquipConkBookBill.getEquipFailed') == 'Sb_EquipConkBookBill.getEquipFailed' ? '鑾峰彇璁惧鏁版嵁澶辫触' : this.$t('Sb_EquipConkBookBill.getEquipFailed')}: ${err}`
})
}
}
},
onLoad(e) {
+ uni.setNavigationBarTitle({
+ title: this.$t("Sb_EquipConkBookBill.title") == 'Sb_EquipConkBookBill.title' ? '璁惧鏁呴殰鐧昏鍗�' : this.$t("Sb_EquipConkBookBill.title")
+ })
console.log('e: ', e);
if (!e.operationType) {
this.operationType = 1
diff --git a/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue b/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
index ed70cdf..b3e1da1 100644
--- a/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
+++ b/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
@@ -2,33 +2,36 @@
<view>
<view class="form">
<view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鍏朵粬淇℃伅</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">
+ {{ $t("Sc_MouldConkBookBill.tabBasic") == "Sc_MouldConkBookBill.tabBasic" ? "鍩烘湰淇℃伅" : $t("Sc_MouldConkBookBill.tabBasic") }}
+ </view>
+ <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">
+ {{ $t("Sc_MouldConkBookBill.tabOther") == "Sc_MouldConkBookBill.tabOther" ? "鍏朵粬淇℃伅" : $t("Sc_MouldConkBookBill.tabOther") }}
+ </view>
</view>
<view v-if="tabs == 0">
<view class="form-item">
- <view class="title">妯″叿鏉＄爜</view>
+ <view class="title">{{ $t("Sc_MouldConkBookBill.HBarCode") == "Sc_MouldConkBookBill.HBarCode" ? "妯″叿鏉＄爜" : $t("Sc_MouldConkBookBill.HBarCode") }}</view>
<view class="right" :class="barcodeReadOnly?'readonly':''">
<input type="text" :disabled="barcodeReadOnly" :focus="barCodeFocus" v-model="hform.HBarCode"
- @confirm="getHBarCodeData(hform.HBarCode)" />
+ @confirm="getHBarCodeData(hform.HBarCode)" :placeholder="$t('Sc_MouldConkBookBill.HBarCode_Placeholder') == 'Sc_MouldConkBookBill.HBarCode_Placeholder' ? '璇疯緭鍏�(鎴栨壂鎻�)妯″叿鏉＄爜' : $t('Sc_MouldConkBookBill.HBarCode_Placeholder')" />
</view>
<uni-icons type="scan"
style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;flex-shrink: 0;"
size="20" @click="toScanCode"></uni-icons>
</view>
<view class="form-item" @click="searchModule">
- <view class="title">妯″叿</view>
+ <view class="title">{{ $t("Sc_MouldConkBookBill.HMould") == "Sc_MouldConkBookBill.HMould" ? "妯″叿" : $t("Sc_MouldConkBookBill.HMould") }}</view>
<view class="righton" style="width: 350rpx;">
- <input placeholder="璇烽�夋嫨妯″叿" />
+ <input :placeholder="$t('Sc_MouldConkBookBill.HMould_Placeholder') == 'Sc_MouldConkBookBill.HMould_Placeholder' ? '璇烽�夋嫨妯″叿' : $t('Sc_MouldConkBookBill.HMould_Placeholder')" />
</view>
<uni-icons type="search"
style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
size="20"></uni-icons>
</view>
<view class="form-item">
- <view class="title">鏁呴殰鍙戠敓鏃ユ湡</view>
-
+ <view class="title">{{ $t("Sc_MouldConkBookBill.HConkBeginDate") == "Sc_MouldConkBookBill.HConkBeginDate" ? "鏁呴殰鍙戠敓鏃ユ湡" : $t("Sc_MouldConkBookBill.HConkBeginDate") }}</view>
<view class="right">
<uni-datetime-picker type="date">
<view style="font-size: 30rpx;">{{hform.HConkBeginDate}}</view>
@@ -36,33 +39,31 @@
</view>
</view>
<view class="form-item">
- <view class="title required">鏁呴殰绫诲埆</view>
+ <view class="title required">{{ $t("Sc_MouldConkBookBill.HConkTypeName") == "Sc_MouldConkBookBill.HConkTypeName" ? "鏁呴殰绫诲埆" : $t("Sc_MouldConkBookBill.HConkTypeName") }}</view>
<view class="right">
- <uni-combox :candidates="ConkTypeNameList" placeholder="璇烽�夋嫨鏁呴殰绫诲埆" v-model="hform.HConkTypeName"
- @input="ConkTypeNameChange"></uni-combox>
+ <uni-combox :candidates="ConkTypeNameList" :placeholder="$t('Sc_MouldConkBookBill.HConkTypeName_Placeholder') == 'Sc_MouldConkBookBill.HConkTypeName_Placeholder' ? '璇烽�夋嫨鏁呴殰绫诲埆' : $t('Sc_MouldConkBookBill.HConkTypeName_Placeholder')" v-model="hform.HConkTypeName" @input="ConkTypeNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title required">鏁呴殰鍘熷洜</view>
+ <view class="title required">{{ $t("Sc_MouldConkBookBill.HConkReasonName") == "Sc_MouldConkBookBill.HConkReasonName" ? "鏁呴殰鍘熷洜" : $t("Sc_MouldConkBookBill.HConkReasonName") }}</view>
<view class="right">
- <uni-combox :candidates="ConkReasonNameList" placeholder="璇烽�夋嫨鏁呴殰鍘熷洜"
- v-model="hform.HConkReasonName" @input="ConkReasonChange"></uni-combox>
+ <uni-combox :candidates="ConkReasonNameList" :placeholder="$t('Sc_MouldConkBookBill.HConkReasonName_Placeholder') == 'Sc_MouldConkBookBill.HConkReasonName_Placeholder' ? '璇烽�夋嫨鏁呴殰鍘熷洜' : $t('Sc_MouldConkBookBill.HConkReasonName_Placeholder')" v-model="hform.HConkReasonName" @input="ConkReasonChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">鏁呴殰鎻忚堪</view>
+ <view class="title">{{ $t("Sc_MouldConkBookBill.HExplanation") == "Sc_MouldConkBookBill.HExplanation" ? "鏁呴殰鎻忚堪" : $t("Sc_MouldConkBookBill.HExplanation") }}</view>
<view class="right">
- <textarea value="" style="height: 6em;" maxlength="2000" placeholder="璇疯緭鍏ユ晠闅滄弿杩�..." />
+ <textarea value="" style="height: 6em;" maxlength="2000" :placeholder="$t('Sc_MouldConkBookBill.HExplanation_Placeholder') == 'Sc_MouldConkBookBill.HExplanation_Placeholder' ? '璇疯緭鍏ユ晠闅滄弿杩�...' : $t('Sc_MouldConkBookBill.HExplanation_Placeholder')" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁鍙�</view>
+ <view class="title">{{ $t("Gy.HBillNo") == "Gy.HBillNo" ? "鍗曟嵁鍙�" : $t("Gy.HBillNo") }}</view>
<view class="right">
<input name="HInterID" v-model="hform.HBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁鏃ユ湡</view>
+ <view class="title">{{ $t("Gy.HDate") == "Gy.HDate" ? "鍗曟嵁鏃ユ湡" : $t("Gy.HDate") }}</view>
<view class="right">
<uni-datetime-picker type="date">
<view style="font-size: 30rpx;">{{hform.HDate}}</view>
@@ -70,91 +71,88 @@
</view>
</view>
<view class="form-item">
- <view class="title required">閮ㄩ棬</view>
+ <view class="title required">{{ $t("Gy.HDeptName") == "Gy.HDeptName" ? "閮ㄩ棬" : $t("Gy.HDeptName") }}</view>
<view class="right">
- <uni-combox :candidates="DeptNameList" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
- @input="DeptChange"></uni-combox>
+ <uni-combox :candidates="DeptNameList" :placeholder="$t('Gy.HDeptName_Placeholder') == 'Gy.HDeptName_Placeholder' ? '璇烽�夋嫨閮ㄩ棬' : $t('Gy.HDeptName_Placeholder')" v-model="hform.HDeptName" @input="DeptChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title required">鍙戠幇浜�</view>
+ <view class="title required">{{ $t("Sc_MouldConkBookBill.HEmpName") == "Sc_MouldConkBookBill.HEmpName" ? "鍙戠幇浜�" : $t("Sc_MouldConkBookBill.HEmpName") }}</view>
<view class="right">
- <uni-combox :candidates="EmpNameList" placeholder="璇烽�夋嫨鍙戠幇浜�" v-model="hform.HEmpName"
- @input="EmpChange"></uni-combox>
+ <uni-combox :candidates="EmpNameList" :placeholder="$t('Sc_MouldConkBookBill.HEmpName_Placeholder') == 'Sc_MouldConkBookBill.HEmpName_Placeholder' ? '璇烽�夋嫨鍙戠幇浜�' : $t('Sc_MouldConkBookBill.HEmpName_Placeholder')" v-model="hform.HEmpName" @input="EmpChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title required">楠屾敹浜�</view>
+ <view class="title required">{{ $t("Sc_MouldConkBookBill.HManagerName") == "Sc_MouldConkBookBill.HManagerName" ? "楠屾敹浜�" : $t("Sc_MouldConkBookBill.HManagerName") }}</view>
<view class="right">
- <uni-combox :candidates="EmpNameList" placeholder="璇烽�夋嫨楠屾敹浜�" v-model="hform.HManagerName"
- @input="ManagerChange"></uni-combox>
+ <uni-combox :candidates="EmpNameList" :placeholder="$t('Sc_MouldConkBookBill.HManagerName_Placeholder') == 'Sc_MouldConkBookBill.HManagerName_Placeholder' ? '璇烽�夋嫨楠屾敹浜�' : $t('Sc_MouldConkBookBill.HManagerName_Placeholder')" v-model="hform.HManagerName" @input="ManagerChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">妯″叿鍚嶇О</view>
+ <view class="title">{{ $t("Sc_MouldConkBookBill.HBarName") == "Sc_MouldConkBookBill.HBarName" ? "妯″叿鍚嶇О" : $t("Sc_MouldConkBookBill.HBarName") }}</view>
<view class="righton">
- <input disabled type="text" placeholder="璇疯緭鍏ュ櫒鍏峰悕绉�" v-model="hform.HBarName" />
+ <input disabled type="text" :placeholder="$t('Sc_MouldConkBookBill.HBarName_Placeholder') == 'Sc_MouldConkBookBill.HBarName_Placeholder' ? '璇疯緭鍏ュ櫒鍏峰悕绉�' : $t('Sc_MouldConkBookBill.HBarName_Placeholder')" v-model="hform.HBarName" />
</view>
</view>
<view class="form-item">
- <view class="title">妯″叿瑙勬牸</view>
+ <view class="title">{{ $t("Sc_MouldConkBookBill.HBarSpec") == "Sc_MouldConkBookBill.HBarSpec" ? "妯″叿瑙勬牸" : $t("Sc_MouldConkBookBill.HBarSpec") }}</view>
<view class="righton">
- <input disabled type="text" placeholder="璇疯緭鍏ュ櫒鍏疯鏍�" v-model="hform.HBarSpec" />
+ <input disabled type="text" :placeholder="$t('Sc_MouldConkBookBill.HBarSpec_Placeholder') == 'Sc_MouldConkBookBill.HBarSpec_Placeholder' ? '璇疯緭鍏ュ櫒鍏疯鏍�' : $t('Sc_MouldConkBookBill.HBarSpec_Placeholder')" v-model="hform.HBarSpec" />
</view>
</view>
<view class="form-item">
- <view class="title">妯″叿鍨嬪彿</view>
+ <view class="title">{{ $t("Sc_MouldConkBookBill.HBarModel") == "Sc_MouldConkBookBill.HBarModel" ? "妯″叿鍨嬪彿" : $t("Sc_MouldConkBookBill.HBarModel") }}</view>
<view class="righton">
- <input disabled type="text" placeholder="璇疯緭鍏ュ櫒鍏峰瀷鍙�" v-model="hform.HBarModel" />
+ <input disabled type="text" :placeholder="$t('Sc_MouldConkBookBill.HBarModel_Placeholder') == 'Sc_MouldConkBookBill.HBarModel_Placeholder' ? '璇疯緭鍏ュ櫒鍏峰瀷鍙�' : $t('Sc_MouldConkBookBill.HBarModel_Placeholder')" v-model="hform.HBarModel" />
</view>
</view>
</view>
<view v-if="tabs == 1">
<view class="form-item">
- <view class="title">鍒涘缓浜�:</view>
+ <view class="title">{{ $t("Gy.HMaker") == "Gy.HMaker" ? "鍒涘缓浜�:" : $t("Gy.HMaker") }}</view>
<view class="righton">
<input type="text" v-model="hform.HMaker" disabled />
</view>
</view>
<view class="form-item">
- <view class="title">鍒涘缓鏃ユ湡:</view>
+ <view class="title">{{ $t("Gy.HMakeDate") == "Gy.HMakeDate" ? "鍒涘缓鏃ユ湡:" : $t("Gy.HMakeDate") }}</view>
<view class="righton">
<input type="text" v-model="hform.HMakeDate" disabled />
</view>
</view>
<view class="form-item">
- <view class="title">淇敼浜�:</view>
+ <view class="title">{{ $t("Gy.HUpDater") == "Gy.HUpDater" ? "淇敼浜�:" : $t("Gy.HUpDater") }}</view>
<view class="righton">
<input type="text" v-model="hform.HUpDater" disabled />
</view>
</view>
<view class="form-item">
- <view class="title">淇敼鏃ユ湡:</view>
+ <view class="title">{{ $t("Gy.HUpDateDate") == "Gy.HUpDateDate" ? "淇敼鏃ユ湡:" : $t("Gy.HUpDateDate") }}</view>
<view class="righton">
<input type="text" v-model="hform.HUpDateDate" disabled />
</view>
</view>
<view class="form-item">
- <view class="title">瀹℃牳浜�:</view>
+ <view class="title">{{ $t("Gy.HChecker") == "Gy.HChecker" ? "瀹℃牳浜�:" : $t("Gy.HChecker") }}</view>
<view class="righton">
<input type="text" v-model="hform.HChecker" disabled />
</view>
</view>
<view class="form-item">
- <view class="title">瀹℃牳鏃ユ湡:</view>
+ <view class="title">{{ $t("Gy.HCheckDate") == "Gy.HCheckDate" ? "瀹℃牳鏃ユ湡:" : $t("Gy.HCheckDate") }}</view>
<view class="righton">
<input type="text" v-model="hform.HCheckDate" disabled />
</view>
</view>
<view class="form-item">
- <view class="title">浣滃簾浜�:</view>
+ <view class="title">{{ $t("Gy.HDeleteMan") == "Gy.HDeleteMan" ? "浣滃簾浜�:" : $t("Gy.HDeleteMan") }}</view>
<view class="righton">
<input type="text" v-model="hform.HDeleteMan" disabled />
</view>
</view>
<view class="form-item">
- <view class="title">浣滃簾鏃ユ湡:</view>
+ <view class="title">{{ $t("Gy.HDeleteDate") == "Gy.HDeleteDate" ? "浣滃簾鏃ユ湡:" : $t("Gy.HDeleteDate") }}</view>
<view class="righton">
<input type="text" v-model="hform.HDeleteDate" disabled />
</view>
@@ -163,10 +161,10 @@
<view class="bottom-btn">
<button :class="EnableSave?'btn-a':'btn-c'" :disabled="!EnableSave" size="mini"
- @tap="submit">鎻愪氦</button>
+ @tap="submit">{{ $t("Sc_MouldConkBookBill.submit") == "Sc_MouldConkBookBill.submit" ? "鎻愪氦" : $t("Sc_MouldConkBookBill.submit") }}</button>
<view style="flex: 1;"></view>
- <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
- <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ <button class="btn-a" size="mini" @tap="addNew">{{ $t("Sc_MouldConkBookBill.addNew") == "Sc_MouldConkBookBill.addNew" ? "鏂板" : $t("Sc_MouldConkBookBill.addNew") }}</button>
+ <button class="btn-c" size="mini" @tap="goBack">{{ $t("Sc_MouldConkBookBill.goBack") == "Sc_MouldConkBookBill.goBack" ? "閫�鍑�" : $t("Sc_MouldConkBookBill.goBack") }}</button>
</view>
</view>
</view>
@@ -270,6 +268,9 @@
},
async onLoad(e) {
+ uni.setNavigationBarTitle({
+ title: this.$t("Sc_MouldConkBookBill.title") == 'Sc_MouldConkBookBill.title' ? '妯″叿鏁呴殰鐧昏鍗�' : this.$t("Sc_MouldConkBookBill.title")
+ })
console.log(e, this.userInfo)
this.operationType = e.operationType || 1
if (this.operationType == 1) {
@@ -333,14 +334,14 @@
this.ConkTypeNameList = Array.from(data).map(elem => elem['鏁呴殰绫诲埆鍚嶇О'])
} else {
CommonUtils.showTips({
- title: '閿欒鎻愮ず',
- message: "鍒濆鍖栨晠闅滅被鍨嬮敊璇�: " + Message,
+ title: this.$t('Sc_MouldConkBookBill.errorTitle') == 'Sc_MouldConkBookBill.errorTitle' ? '閿欒鎻愮ず' : this.$t('Sc_MouldConkBookBill.errorTitle'),
+ message: this.$t('Sc_MouldConkBookBill.initConkTypeFailed') == 'Sc_MouldConkBookBill.initConkTypeFailed' ? '鍒濆鍖栨晠闅滅被鍨嬮敊璇�: ' : this.$t('Sc_MouldConkBookBill.initConkTypeFailed') + Message,
})
}
} catch (err) {
CommonUtils.showTips({
- title: '閿欒鎻愮ず',
- message: "鍒濆鍖栨晠闅滅被鍨嬮敊璇�: " + err,
+ title: this.$t('Sc_MouldConkBookBill.errorTitle') == 'Sc_MouldConkBookBill.errorTitle' ? '閿欒鎻愮ず' : this.$t('Sc_MouldConkBookBill.errorTitle'),
+ message: this.$t('Sc_MouldConkBookBill.initConkTypeFailed') == 'Sc_MouldConkBookBill.initConkTypeFailed' ? '鍒濆鍖栨晠闅滅被鍨嬮敊璇�: ' : this.$t('Sc_MouldConkBookBill.initConkTypeFailed') + err,
})
}
},
@@ -377,14 +378,14 @@
this.ConkReasonNameList = Array.from(data).map(elem => elem['HName'])
} else {
CommonUtils.showTips({
- title: '閿欒鎻愮ず',
- message: "鍒濆鍖栨晠闅滃師鍥犻敊璇�: " + Message,
+ title: this.$t('Sc_MouldConkBookBill.errorTitle') == 'Sc_MouldConkBookBill.errorTitle' ? '閿欒鎻愮ず' : this.$t('Sc_MouldConkBookBill.errorTitle'),
+ message: this.$t('Sc_MouldConkBookBill.initConkReasonFailed') == 'Sc_MouldConkBookBill.initConkReasonFailed' ? '鍒濆鍖栨晠闅滃師鍥犻敊璇�: ' : this.$t('Sc_MouldConkBookBill.initConkReasonFailed') + Message,
})
}
} catch (err) {
CommonUtils.showTips({
- title: '閿欒鎻愮ず',
- message: "鍒濆鍖栨晠闅滃師鍥犻敊璇�: " + err,
+ title: this.$t('Sc_MouldConkBookBill.errorTitle') == 'Sc_MouldConkBookBill.errorTitle' ? '閿欒鎻愮ず' : this.$t('Sc_MouldConkBookBill.errorTitle'),
+ message: this.$t('Sc_MouldConkBookBill.initConkReasonFailed') == 'Sc_MouldConkBookBill.initConkReasonFailed' ? '鍒濆鍖栨晠闅滃師鍥犻敊璇�: ' : this.$t('Sc_MouldConkBookBill.initConkReasonFailed') + err,
})
}
},
@@ -421,14 +422,14 @@
this.DeptNameList = Array.from(data).map(elem => elem['HName'])
} else {
CommonUtils.showTips({
- title: '閿欒鎻愮ず',
- message: "鍒濆鍖栭儴闂ㄩ敊璇�: " + Message,
+ title: this.$t('Sc_MouldConkBookBill.errorTitle') == 'Sc_MouldConkBookBill.errorTitle' ? '閿欒鎻愮ず' : this.$t('Sc_MouldConkBookBill.errorTitle'),
+ message: this.$t('Sc_MouldConkBookBill.initDeptFailed') == 'Sc_MouldConkBookBill.initDeptFailed' ? '鍒濆鍖栭儴闂ㄩ敊璇�: ' : this.$t('Sc_MouldConkBookBill.initDeptFailed') + Message,
})
}
} catch (err) {
CommonUtils.showTips({
- title: '閿欒鎻愮ず',
- message: "鍒濆鍖栭儴闂ㄩ敊璇�: " + err,
+ title: this.$t('Sc_MouldConkBookBill.errorTitle') == 'Sc_MouldConkBookBill.errorTitle' ? '閿欒鎻愮ず' : this.$t('Sc_MouldConkBookBill.errorTitle'),
+ message: this.$t('Sc_MouldConkBookBill.initDeptFailed') == 'Sc_MouldConkBookBill.initDeptFailed' ? '鍒濆鍖栭儴闂ㄩ敊璇�: ' : this.$t('Sc_MouldConkBookBill.initDeptFailed') + err,
})
}
},
@@ -467,14 +468,14 @@
this.EmpNameList = Array.from(data).map(elem => elem['HName'])
} else {
CommonUtils.showTips({
- title: '閿欒鎻愮ず',
- message: "鍒濆鍖栬亴鍛橀敊璇�: " + Message,
+ title: this.$t('Sc_MouldConkBookBill.errorTitle') == 'Sc_MouldConkBookBill.errorTitle' ? '閿欒鎻愮ず' : this.$t('Sc_MouldConkBookBill.errorTitle'),
+ message: this.$t('Sc_MouldConkBookBill.initEmpFailed') == 'Sc_MouldConkBookBill.initEmpFailed' ? '鍒濆鍖栬亴鍛橀敊璇�: ' : this.$t('Sc_MouldConkBookBill.initEmpFailed') + Message,
})
}
} catch (err) {
CommonUtils.showTips({
- title: '閿欒鎻愮ず',
- message: "鍒濆鍖栬亴鍛橀敊璇�: " + err,
+ title: this.$t('Sc_MouldConkBookBill.errorTitle') == 'Sc_MouldConkBookBill.errorTitle' ? '閿欒鎻愮ず' : this.$t('Sc_MouldConkBookBill.errorTitle'),
+ message: this.$t('Sc_MouldConkBookBill.initEmpFailed') == 'Sc_MouldConkBookBill.initEmpFailed' ? '鍒濆鍖栬亴鍛橀敊璇�: ' : this.$t('Sc_MouldConkBookBill.initEmpFailed') + err,
})
}
},
@@ -537,7 +538,7 @@
mpaasScanModule.mpaasScan({
'hideAlbum': true,
'timeoutInterval': '10', //瓒呮椂鏃堕棿
- 'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ 'timeoutText': this.$t('Sc_MouldConkBookBill.scanTimeoutText') == 'Sc_MouldConkBookBill.scanTimeoutText' ? '鏈瘑鍒埌浜岀淮鐮�' : this.$t('Sc_MouldConkBookBill.scanTimeoutText') //瓒呮椂鎻愰啋
}, (ret) => {
console.log(ret.resp_result)
if (this.hform.HBarCode == '*') {
@@ -559,7 +560,7 @@
async getHBarCodeData(HBarCode) {
if (!HBarCode) {
CommonUtils.showTips({
- message: '鏉″舰鐮佷笉鑳戒负绌�'
+ message: this.$t('Sc_MouldConkBookBill.barCodeEmpty') == 'Sc_MouldConkBookBill.barCodeEmpty' ? '鏉″舰鐮佷笉鑳戒负绌�' : this.$t('Sc_MouldConkBookBill.barCodeEmpty')
})
return
}
@@ -585,15 +586,15 @@
} else {
this.refreshBarCodeState()
return CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
+ title: this.$t('Sc_MouldConkBookBill.tipTitle') == 'Sc_MouldConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sc_MouldConkBookBill.tipTitle'),
message: Message
})
}
} catch (err) {
this.refreshBarCodeState()
return CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: "鎺ュ彛璇锋眰澶辫触" + err
+ title: this.$t('Sc_MouldConkBookBill.tipTitle') == 'Sc_MouldConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sc_MouldConkBookBill.tipTitle'),
+ message: this.$t('Sc_MouldConkBookBill.requestFailed') == 'Sc_MouldConkBookBill.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('Sc_MouldConkBookBill.requestFailed') + err
})
}
@@ -627,7 +628,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('Sc_MouldConkBookBill.requestFailed') == 'Sc_MouldConkBookBill.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('Sc_MouldConkBookBill.requestFailed'),
icon: 'none'
})
},
@@ -637,15 +638,15 @@
let message = ''
if (!this.hform.HConkTypeName) {
- message = '鏈～鍐欐晠闅滅被鍒�'
+ message = this.$t('Sc_MouldConkBookBill.noConkType') == 'Sc_MouldConkBookBill.noConkType' ? '鏈～鍐欐晠闅滅被鍒�' : this.$t('Sc_MouldConkBookBill.noConkType')
} else if (!this.hform.HConkReasonName) {
- message = '鏈～鍐欐晠闅滃師鍥�'
+ message = this.$t('Sc_MouldConkBookBill.noConkReason') == 'Sc_MouldConkBookBill.noConkReason' ? '鏈～鍐欐晠闅滃師鍥�' : this.$t('Sc_MouldConkBookBill.noConkReason')
} else if (!this.hform.HDeptName) {
- message = '鏈～鍐欓儴闂�'
+ message = this.$t('Sc_MouldConkBookBill.noDept') == 'Sc_MouldConkBookBill.noDept' ? '鏈～鍐欓儴闂�' : this.$t('Sc_MouldConkBookBill.noDept')
} else if (!this.hform.HEmpName) {
- message = '鏈～鍐欏彂鐜颁汉'
+ message = this.$t('Sc_MouldConkBookBill.noDiscoverer') == 'Sc_MouldConkBookBill.noDiscoverer' ? '鏈～鍐欏彂鐜颁汉' : this.$t('Sc_MouldConkBookBill.noDiscoverer')
} else if (!this.hform.HManagerName) {
- message = '鏈～鍐欓獙鏀朵汉'
+ message = this.$t('Sc_MouldConkBookBill.noChecker') == 'Sc_MouldConkBookBill.noChecker' ? '鏈～鍐欓獙鏀朵汉' : this.$t('Sc_MouldConkBookBill.noChecker')
}
if (!message) {
return true
@@ -692,8 +693,8 @@
} = res.data
if (count == 1) {
uni.showModal({
- title: '鎻愮ず',
- content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵',
+ title: this.$t('Sc_MouldConkBookBill.confirmTitle') == 'Sc_MouldConkBookBill.confirmTitle' ? '鎻愮ず' : this.$t('Sc_MouldConkBookBill.confirmTitle'),
+ content: res.data.Message + (this.$t('Sc_MouldConkBookBill.continueAdd') == 'Sc_MouldConkBookBill.continueAdd' ? '銆傛槸鍚︾户缁柊澧烇紵' : this.$t('Sc_MouldConkBookBill.continueAdd')),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -710,14 +711,14 @@
});
} else {
CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
+ title: this.$t('Sc_MouldConkBookBill.tipTitle') == 'Sc_MouldConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sc_MouldConkBookBill.tipTitle'),
message: Message
})
this.EnableSave = true
}
} catch (err) {
CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
+ title: this.$t('Sc_MouldConkBookBill.tipTitle') == 'Sc_MouldConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sc_MouldConkBookBill.tipTitle'),
message: err
})
this.EnableSave = true
@@ -726,8 +727,8 @@
goBack() {
uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+ title: this.$t('Sc_MouldConkBookBill.confirmTitle') == 'Sc_MouldConkBookBill.confirmTitle' ? '鎻愮ず' : this.$t('Sc_MouldConkBookBill.confirmTitle'),
+ content: this.$t('Sc_MouldConkBookBill.exitConfirm') == 'Sc_MouldConkBookBill.exitConfirm' ? '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�' : this.$t('Sc_MouldConkBookBill.exitConfirm'),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -759,7 +760,7 @@
console.log('data: ', data.h_v_Sc_MouldConkBookBillList_Edit);
let data1 = data.h_v_Sc_MouldConkBookBillList_Edit[0]
this.hform.HMainSourceBillType = HSourceBillType
- this.HMainSourceBillType = '鍣ㄥ叿鏁呴殰鐧昏鍗�'
+ this.HMainSourceBillType = this.$t('Sc_MouldConkBookBill.sourceBillTypeName') == 'Sc_MouldConkBookBill.sourceBillTypeName' ? '鍣ㄥ叿鏁呴殰鐧昏鍗�' : this.$t('Sc_MouldConkBookBill.sourceBillTypeName')
this.hform.HMainSourceBillNo = data1.鍗曟嵁鍙�
this.hform.HMainSourceInterID = data1.hmainid
this.hform.HMainSourceEntryID = data1.hsubid
@@ -773,8 +774,8 @@
} else {
CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇婧愬崟澶辫触: ${Message}`
+ title: this.$t('Sc_MouldConkBookBill.tipTitle') == 'Sc_MouldConkBookBill.tipTitle' ? '娓╅Θ鎻愮ず' : this.$t('Sc_MouldConkBookBill.tipTitle'),
+ message: this.$t('Sc_MouldConkBookBill.getSourceFailed') == 'Sc_MouldConkBookBill.getSourceFailed' ? '鑾峰彇婧愬崟澶辫触: ' : this.$t('Sc_MouldConkBookBill.getSourceFailed') + Message
})
}
@@ -788,6 +789,7 @@
</script>
<style lang="scss" scoped>
+ /* 鏍峰紡淇濇寔涓嶅彉 */
.form {
width: 668rpx;
margin: 20rpx auto;
diff --git a/pages/MJGL/shangmudan/MouldUpperBill.vue b/pages/MJGL/shangmudan/MouldUpperBill.vue
index 7a88654..2f13d0b 100644
--- a/pages/MJGL/shangmudan/MouldUpperBill.vue
+++ b/pages/MJGL/shangmudan/MouldUpperBill.vue
@@ -2,9 +2,10 @@
<view>
<view class="form">
<view class="form-item">
- <view class="title">鏉＄爜</view>
+ <view class="title">{{ $t("MouldUpperBill.HBarCode") == "MouldUpperBill.HBarCode" ? "鏉＄爜" : $t("MouldUpperBill.HBarCode") }}</view>
<view class="right" style="width: 350rpx;">
- <input type="text" :focus="HBarCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜"
+ <input type="text" :focus="HBarCodeFocus" v-model="hform.HBarCode"
+ :placeholder="$t('MouldUpperBill.HBarCode_Placeholder') == 'MouldUpperBill.HBarCode_Placeholder' ? '璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜' : $t('MouldUpperBill.HBarCode_Placeholder')"
@confirm="getHBarCodeData(hform.HBarCode)" />
</view>
<uni-icons type="scan"
@@ -12,78 +13,80 @@
size="20" @click="toScanCode"></uni-icons>
</view>
<view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="() => { tabs = 0; reFocusBarCode(); }">鍗曟嵁淇℃伅</view>
- <view :class="tabs == 1 ? 'on':''" @tap="() => { tabs = 1; reFocusBarCode(); }">妯″叿淇℃伅</view>
- <view :class="tabs == 2 ? 'on':''" @tap="() => { tabs = 2; reFocusBarCode(); }">鍒跺崟淇℃伅</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="() => { tabs = 0; reFocusBarCode(); }">
+ {{ $t("MouldUpperBill.tabBillInfo") == "MouldUpperBill.tabBillInfo" ? "鍗曟嵁淇℃伅" : $t("MouldUpperBill.tabBillInfo") }}
+ </view>
+ <view :class="tabs == 1 ? 'on':''" @tap="() => { tabs = 1; reFocusBarCode(); }">
+ {{ $t("MouldUpperBill.tabMouldInfo") == "MouldUpperBill.tabMouldInfo" ? "妯″叿淇℃伅" : $t("MouldUpperBill.tabMouldInfo") }}
+ </view>
+ <view :class="tabs == 2 ? 'on':''" @tap="() => { tabs = 2; reFocusBarCode(); }">
+ {{ $t("MouldUpperBill.tabMakerInfo") == "MouldUpperBill.tabMakerInfo" ? "鍒跺崟淇℃伅" : $t("MouldUpperBill.tabMakerInfo") }}
+ </view>
</view>
<!-- 鍗曟嵁淇℃伅 -->
<view v-if="tabs == 0">
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("Gy.HBillNo") == "Gy.HBillNo" ? "鍗曟嵁鍙�:" : $t("Gy.HBillNo") }}</view>
<view class="righton">
<input name="HBillNo" disabled v-model="hform.HBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁鏃ユ湡:</view>
+ <view class="title">{{ $t("Gy.HDate") == "Gy.HDate" ? "鍗曟嵁鏃ユ湡:" : $t("Gy.HDate") }}</view>
<view class="right">
<picker mode="date" v-model="hform.HDate" @change="HDateChange">
- <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+ <input disabled v-model="hform.HDate" :placeholder="$t('Gy.HDate_Placeholder') == 'Gy.HDate_Placeholder' ? '璇烽�夋嫨鏃ユ湡' : $t('Gy.HDate_Placeholder')" />
</picker>
</view>
</view>
<view class="form-item">
- <view class="title"><text>*</text>浣跨敤閮ㄩ棬:</view>
+ <view class="title"><text>*</text>{{ $t("Gy.HDeptName") == "Gy.HDeptName" ? "浣跨敤閮ㄩ棬:" : $t("Gy.HDeptName") }}</view>
<view class="right">
- <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
- @input="HDeptNameChange"></uni-combox>
+ <uni-combox :candidates="arrayHDeptName" :placeholder="$t('Gy.HDeptName_Placeholder') == 'Gy.HDeptName_Placeholder' ? '璇烽�夋嫨閮ㄩ棬' : $t('Gy.HDeptName_Placeholder')" v-model="hform.HDeptName" @input="HDeptNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title"><text>*</text>鎿嶄綔鍛�:</view>
+ <view class="title"><text>*</text>{{ $t("MouldUpperBill.HEmpName") == "MouldUpperBill.HEmpName" ? "鎿嶄綔鍛�:" : $t("MouldUpperBill.HEmpName") }}</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName"
- @input="HEmpNameChange"></uni-combox>
+ <uni-combox :candidates="arrayHEmpName" :placeholder="$t('MouldUpperBill.HEmpName_Placeholder') == 'MouldUpperBill.HEmpName_Placeholder' ? '璇烽�夋嫨鎿嶄綔鍛�' : $t('MouldUpperBill.HEmpName_Placeholder')" v-model="hform.HEmpName" @input="HEmpNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title"><text>*</text>璐熻矗浜�:</view>
+ <view class="title"><text>*</text>{{ $t("MouldUpperBill.HManagerName") == "MouldUpperBill.HManagerName" ? "璐熻矗浜�:" : $t("MouldUpperBill.HManagerName") }}</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨璐熻矗浜�" v-model="hform.HMangerName"
- @input="HManagerNameChange"></uni-combox>
+ <uni-combox :candidates="arrayHEmpName" :placeholder="$t('MouldUpperBill.HManagerName_Placeholder') == 'MouldUpperBill.HManagerName_Placeholder' ? '璇烽�夋嫨璐熻矗浜�' : $t('MouldUpperBill.HManagerName_Placeholder')" v-model="hform.HMangerName" @input="HManagerNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title"><text>*</text>鐢熶骇璧勬簮:</view>
+ <view class="title"><text>*</text>{{ $t("MouldUpperBill.HSourceName") == "MouldUpperBill.HSourceName" ? "鐢熶骇璧勬簮:" : $t("MouldUpperBill.HSourceName") }}</view>
<view class="right">
- <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
- @input="HSourceNameChange"></uni-combox>
+ <uni-combox :candidates="arrayHSourceName" :placeholder="$t('MouldUpperBill.HSourceName_Placeholder') == 'MouldUpperBill.HSourceName_Placeholder' ? '璇烽�夋嫨鐢熶骇璧勬簮' : $t('MouldUpperBill.HSourceName_Placeholder')" v-model="hform.HSourceName" @input="HSourceNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">涓婃ā鏃堕棿:</view>
+ <view class="title">{{ $t("MouldUpperBill.HScanDate") == "MouldUpperBill.HScanDate" ? "涓婃ā鏃堕棿:" : $t("MouldUpperBill.HScanDate") }}</view>
<view class="righton">
- <input name="HScanDate" disabled v-model="hform.HScanDate" placeholder="璇烽�夋嫨" />
+ <input name="HScanDate" disabled v-model="hform.HScanDate" :placeholder="$t('Gy.HDate_Placeholder') == 'Gy.HDate_Placeholder' ? '璇烽�夋嫨' : $t('Gy.HDate_Placeholder')" />
</view>
</view>
<view class="form-item">
- <view class="title">鐢熶骇璁㈠崟:</view>
+ <view class="title">{{ $t("MouldUpperBill.HICMOBillNo") == "MouldUpperBill.HICMOBillNo" ? "鐢熶骇璁㈠崟:" : $t("MouldUpperBill.HICMOBillNo") }}</view>
<view class="righton">
<input name="HICMOBillNo" disabled v-model="hform.HICMOBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">娴佽浆鍗�:</view>
+ <view class="title">{{ $t("MouldUpperBill.HProcExchBillNo") == "MouldUpperBill.HProcExchBillNo" ? "娴佽浆鍗�:" : $t("MouldUpperBill.HProcExchBillNo") }}</view>
<view class="righton">
<input disabled v-model="hform.HProcExchBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">澶囨敞:</view>
+ <view class="title">{{ $t("Gy.HRemark") == "Gy.HRemark" ? "澶囨敞:" : $t("Gy.HRemark") }}</view>
<view class="right">
- <textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="璇疯緭鍏ュ娉�"></textarea>
+ <textarea name="HRemark" v-model="hform.HRemark" auto-height :placeholder="$t('Gy.HRemark_Placeholder') == 'Gy.HRemark_Placeholder' ? '璇疯緭鍏ュ娉�' : $t('Gy.HRemark_Placeholder')"></textarea>
</view>
</view>
@@ -96,72 +99,72 @@
<uni-card style="margin: 10rpx 0;">
<view class="card-content">
<view class="card-row">
- <text class="label">搴忓彿锛�</text>
+ <text class="label">{{ $t("MouldUpperBill.table_SerialNo") == "MouldUpperBill.table_SerialNo" ? "搴忓彿锛�" : $t("MouldUpperBill.table_SerialNo") }}</text>
<text class="value">{{ index + 1 }}</text>
</view>
<view class="card-row">
- <text class="label">鍣ㄥ叿缂栫爜锛�</text>
+ <text class="label">{{ $t("MouldUpperBill.table_MouldCode") == "MouldUpperBill.table_MouldCode" ? "鍣ㄥ叿缂栫爜锛�" : $t("MouldUpperBill.table_MouldCode") }}</text>
<text class="value">{{ item.鍣ㄥ叿缂栫爜 }}</text>
</view>
<view class="card-row">
- <text class="label">鍣ㄥ叿鍚嶇О锛�</text>
+ <text class="label">{{ $t("MouldUpperBill.table_MouldName") == "MouldUpperBill.table_MouldName" ? "鍣ㄥ叿鍚嶇О锛�" : $t("MouldUpperBill.table_MouldName") }}</text>
<text class="value">{{ item.鍣ㄥ叿鍚嶇О }}</text>
</view>
<view class="card-row">
- <text class="label">鍣ㄥ叿鍨嬪彿锛�</text>
+ <text class="label">{{ $t("MouldUpperBill.table_MouldModel") == "MouldUpperBill.table_MouldModel" ? "鍣ㄥ叿鍨嬪彿锛�" : $t("MouldUpperBill.table_MouldModel") }}</text>
<text class="value">{{ item.鍣ㄥ叿鍨嬪彿 }}</text>
</view>
<view class="card-row">
- <text class="label">鍣ㄥ叿鏉＄爜锛�</text>
+ <text class="label">{{ $t("Gy.HBarCode") == "Gy.HBarCode" ? "鍣ㄥ叿鏉＄爜锛�" : $t("Gy.HBarCode") }}</text>
<text class="value">{{ item.鍣ㄥ叿鏉＄爜 }}</text>
</view>
<view class="card-row">
- <text class="label">鍣ㄥ叿鏁伴噺锛�</text>
+ <text class="label">{{ $t("Gy.HQty") == "Gy.HQty" ? "鍣ㄥ叿鏁伴噺锛�" : $t("Gy.HQty") }}</text>
<text class="value">{{ item.鍣ㄥ叿鏁伴噺 }}</text>
</view>
</view>
</uni-card>
</view>
- <view class="over" v-if="listData.length == 0">鏆傛棤妯″叿鏁版嵁</view>
+ <view class="over" v-if="listData.length == 0">{{ $t("MouldUpperBill.noMouldData") == "MouldUpperBill.noMouldData" ? "鏆傛棤妯″叿鏁版嵁" : $t("MouldUpperBill.noMouldData") }}</view>
</view>
</view>
<view v-if="tabs == 2">
<view class="form-item">
- <view class="title">鍒跺崟浜�:</view>
+ <view class="title">{{ $t("Gy.HMaker") == "Gy.HMaker" ? "鍒跺崟浜�:" : $t("Gy.HMaker") }}</view>
<view class="righton">
<input v-model="hform.HMaker" disabled />
</view>
</view>
<view class="form-item">
- <view class="title">鍒跺崟鏃ユ湡:</view>
+ <view class="title">{{ $t("Gy.HMakeDate") == "Gy.HMakeDate" ? "鍒跺崟鏃ユ湡:" : $t("Gy.HMakeDate") }}</view>
<view class="righton">
<input v-if="hform.HMakeDate" v-model="hform.HMakeDate.substr(0,10)" disabled />
<input v-else v-model="hform.HMakeDate" disabled />
</view>
</view>
<view class="form-item">
- <view class="title">淇敼浜�:</view>
+ <view class="title">{{ $t("Gy.HUpDater") == "Gy.HUpDater" ? "淇敼浜�:" : $t("Gy.HUpDater") }}</view>
<view class="righton">
<input v-model="hform.HUpDater" disabled />
</view>
</view>
<view class="form-item">
- <view class="title">淇敼鏃ユ湡:</view>
+ <view class="title">{{ $t("Gy.HUpDateDate") == "Gy.HUpDateDate" ? "淇敼鏃ユ湡:" : $t("Gy.HUpDateDate") }}</view>
<view class="righton">
<input v-if="hform.HUpDateDate" v-model="hform.HUpDateDate.substr(0,10)" disabled />
<input v-else v-model="hform.HUpDateDate" disabled />
</view>
</view>
<view class="form-item">
- <view class="title">瀹℃牳浜�:</view>
+ <view class="title">{{ $t("Gy.HChecker") == "Gy.HChecker" ? "瀹℃牳浜�:" : $t("Gy.HChecker") }}</view>
<view class="righton">
<input v-model="hform.HChecker" disabled />
</view>
</view>
<view class="form-item">
- <view class="title">瀹℃牳鏃ユ湡:</view>
+ <view class="title">{{ $t("Gy.HCheckDate") == "Gy.HCheckDate" ? "瀹℃牳鏃ユ湡:" : $t("Gy.HCheckDate") }}</view>
<view class="righton">
<input v-if="hform.HCheckDate" v-model="hform.HCheckDate.substr(0,10)" disabled />
<input v-else v-model="hform.HCheckDate" disabled />
@@ -171,10 +174,10 @@
</view>
<view class="bottom-btn">
- <button v-if="btnType == 1 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
- <button v-if="btnType != 1 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button>
- <button v-if="btnType != 1 && isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
- <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ <button v-if="btnType == 1 && !isEdit" class="btn-a" size="mini" @tap="submit">{{ $t("MouldUpperBill.submit") == "MouldUpperBill.submit" ? "鎻愪氦" : $t("MouldUpperBill.submit") }}</button>
+ <button v-if="btnType != 1 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">{{ $t("MouldUpperBill.modify") == "MouldUpperBill.modify" ? "淇敼" : $t("MouldUpperBill.modify") }}</button>
+ <button v-if="btnType != 1 && isEdit" class="btn-a" size="mini" @tap="submit">{{ $t("MouldUpperBill.submit") == "MouldUpperBill.submit" ? "鎻愪氦" : $t("MouldUpperBill.submit") }}</button>
+ <button class="btn-c" size="mini" @tap="goBack">{{ $t("MouldUpperBill.goBack") == "MouldUpperBill.goBack" ? "閫�鍑�" : $t("MouldUpperBill.goBack") }}</button>
</view>
</view>
@@ -256,6 +259,10 @@
}
},
onLoad(e) {
+
+uni.setNavigationBarTitle({
+ title: this.$t("MouldUpperBill.title") == 'MouldUpperBill.title' ? '涓婃ā鍗�' : this.$t("MouldUpperBill.title")
+ })
this.HBarCodeFocus = true
this.getHDeptList()
this.getHEmpList()
@@ -289,7 +296,7 @@
mpaasScanModule.mpaasScan({
'hideAlbum': true,
'timeoutInterval': '10', //瓒呮椂鏃堕棿
- 'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ 'timeoutText': this.$t('MouldUpperBill.scanTimeoutText') == 'MouldUpperBill.scanTimeoutText' ? '鏈瘑鍒埌浜岀淮鐮�' : this.$t('MouldUpperBill.scanTimeoutText') //瓒呮椂鎻愰啋
}, (ret) => {
console.log(ret.resp_result)
this.hform.HBarCode = ret.resp_result
@@ -320,7 +327,7 @@
if (uni.getStorageSync('Organization') == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�") {
if (!this.hform.HSourceName) {
uni.showToast({
- title: '璇峰厛閫夋嫨鎴栨壂鎻忕敓浜ц祫婧�',
+ title: this.$t('MouldUpperBill.selectSourceFirst') == 'MouldUpperBill.selectSourceFirst' ? '璇峰厛閫夋嫨鎴栨壂鎻忕敓浜ц祫婧�' : this.$t('MouldUpperBill.selectSourceFirst'),
icon: 'none'
});
return;
@@ -388,7 +395,7 @@
case 3:
if (!this.hform.HICMOBillNo && !this.hform.HProcExchBillNo) {
uni.showToast({
- title: '璇峰厛鎵弿鐢熶骇宸ュ崟',
+ title: this.$t('MouldUpperBill.scanWorkOrderFirst') == 'MouldUpperBill.scanWorkOrderFirst' ? '璇峰厛鎵弿鐢熶骇宸ュ崟' : this.$t('MouldUpperBill.scanWorkOrderFirst'),
icon: 'none'
});
return;
@@ -435,7 +442,7 @@
break;
default:
uni.showToast({
- title: '鏈煡鐨勮繑鍥炵被鍨�',
+ title: this.$t('MouldUpperBill.unknownType') == 'MouldUpperBill.unknownType' ? '鏈煡鐨勮繑鍥炵被鍨�' : this.$t('MouldUpperBill.unknownType'),
icon: 'none',
});
break;
@@ -451,7 +458,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('MouldUpperBill.requestFailed') == 'MouldUpperBill.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('MouldUpperBill.requestFailed'),
icon: 'none'
})
},
@@ -472,7 +479,7 @@
if (existingIndex === -1) {
// 濡傛灉涓嶅瓨鍦紝璇存槑涓嶅湪褰撳墠鐗╂枡鐨勬鍏锋竻鍗曚腑
uni.showToast({
- title: '褰撳墠妫�鍏蜂笉鍦ㄥ綋鍓嶇墿鏂欑殑妫�鍏锋竻鍗曚腑',
+ title: this.$t('MouldUpperBill.mouldNotInList') == 'MouldUpperBill.mouldNotInList' ? '褰撳墠妫�鍏蜂笉鍦ㄥ綋鍓嶇墿鏂欑殑妫�鍏锋竻鍗曚腑' : this.$t('MouldUpperBill.mouldNotInList'),
icon: 'none',
duration: 1500
});
@@ -484,7 +491,7 @@
this.listData[existingIndex].鍣ㄥ叿鏉＄爜 = this.hform.HBarCode;
this.listData[existingIndex].鍣ㄥ叿鏁伴噺 = 1;
uni.showToast({
- title: '鎵弿鎴愬姛',
+ title: this.$t('MouldUpperBill.scanSuccess') == 'MouldUpperBill.scanSuccess' ? '鎵弿鎴愬姛' : this.$t('MouldUpperBill.scanSuccess'),
icon: 'success',
duration: 1500
});
@@ -492,7 +499,7 @@
} else {
// 鍣ㄥ叿鏁伴噺宸蹭负1锛屾彁绀轰笉鍏佽閲嶅鎵弿
uni.showToast({
- title: '璇ユā鍏峰凡鎵弿锛屼笉鍏佽閲嶅鎵弿',
+ title: this.$t('MouldUpperBill.mouldAlreadyScanned') == 'MouldUpperBill.mouldAlreadyScanned' ? '璇ユā鍏峰凡鎵弿锛屼笉鍏佽閲嶅鎵弿' : this.$t('MouldUpperBill.mouldAlreadyScanned'),
icon: 'none',
duration: 1500
});
@@ -515,7 +522,7 @@
};
this.listData.push(newRow);
uni.showToast({
- title: '鎵弿鎴愬姛',
+ title: this.$t('MouldUpperBill.scanSuccess') == 'MouldUpperBill.scanSuccess' ? '鎵弿鎴愬姛' : this.$t('MouldUpperBill.scanSuccess'),
icon: 'success',
duration: 1500
});
@@ -523,7 +530,7 @@
} else {
// 濡傛灉宸插瓨鍦紝鎻愮ず鐢ㄦ埛
uni.showToast({
- title: '璇ユā鍏峰凡鎵弿',
+ title: this.$t('MouldUpperBill.mouldAlreadyScanned') == 'MouldUpperBill.mouldAlreadyScanned' ? '璇ユā鍏峰凡鎵弿' : this.$t('MouldUpperBill.mouldAlreadyScanned'),
icon: 'none',
duration: 1500
});
@@ -556,7 +563,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('MouldUpperBill.requestFailed') == 'MouldUpperBill.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('MouldUpperBill.requestFailed'),
icon: 'none'
})
},
@@ -596,7 +603,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('MouldUpperBill.requestFailed') == 'MouldUpperBill.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('MouldUpperBill.requestFailed'),
icon: 'none'
})
},
@@ -642,7 +649,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('MouldUpperBill.requestFailed') == 'MouldUpperBill.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('MouldUpperBill.requestFailed'),
icon: 'none'
})
},
@@ -718,7 +725,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('MouldUpperBill.requestFailed') == 'MouldUpperBill.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('MouldUpperBill.requestFailed'),
icon: 'none'
})
},
@@ -811,7 +818,7 @@
} else {
// 鏍￠獙涓嶉�氳繃锛屾樉绀洪敊璇俊鎭�
uni.showToast({
- title: res.data.Message || '妯″叿妗ｆ鏍￠獙澶辫触',
+ title: res.data.Message || this.$t('MouldUpperBill.mouldCheckFailed') == 'MouldUpperBill.mouldCheckFailed' ? '妯″叿妗ｆ鏍￠獙澶辫触' : this.$t('MouldUpperBill.mouldCheckFailed'),
icon: 'none'
});
resolve(false);
@@ -820,7 +827,7 @@
fail: (res) => {
console.log('鑾峰彇妯″叿鏉＄爜澶辫触:', res);
uni.showToast({
- title: '鏍￠獙澶辫触锛岃妫�鏌ョ綉缁�',
+ title: this.$t('MouldUpperBill.checkNetworkFailed') == 'MouldUpperBill.checkNetworkFailed' ? '鏍￠獙澶辫触锛岃妫�鏌ョ綉缁�' : this.$t('MouldUpperBill.checkNetworkFailed'),
icon: 'none'
});
resolve(false);
@@ -852,7 +859,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('MouldUpperBill.requestFailed') == 'MouldUpperBill.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('MouldUpperBill.requestFailed'),
icon: 'none'
})
},
@@ -862,7 +869,7 @@
if (uni.getStorageSync('Organization') == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�") {
if (!this.hform.HSourceName) {
uni.showToast({
- title: '璇峰厛閫夋嫨鐢熶骇璧勬簮',
+ title: this.$t('MouldUpperBill.selectSourceFirst') == 'MouldUpperBill.selectSourceFirst' ? '璇峰厛閫夋嫨鐢熶骇璧勬簮' : this.$t('MouldUpperBill.selectSourceFirst'),
icon: 'none'
});
return;
@@ -870,7 +877,7 @@
}
if (this.listData.length === 0) {
uni.showToast({
- title: '璇疯嚦灏戞坊鍔犱竴涓ā鍏�',
+ title: this.$t('MouldUpperBill.addAtLeastOneMould') == 'MouldUpperBill.addAtLeastOneMould' ? '璇疯嚦灏戞坊鍔犱竴涓ā鍏�' : this.$t('MouldUpperBill.addAtLeastOneMould'),
icon: 'none'
})
}
@@ -885,9 +892,9 @@
if (zeroQtyItem) {
// 鎵惧埌绗竴涓暟閲忓紓甯搁」鐨勪綅缃紙绱㈠紩+1锛�
const index = this.listData.indexOf(zeroQtyItem) + 1;
- const code = zeroQtyItem.鍣ㄥ叿缂栫爜 || '鏈煡缂栫爜';
+ const code = zeroQtyItem.鍣ㄥ叿缂栫爜 || this.$t('MouldUpperBill.unknownCode') == 'MouldUpperBill.unknownCode' ? '鏈煡缂栫爜' : this.$t('MouldUpperBill.unknownCode');
uni.showToast({
- title: `绗�${index}琛屻��${code}銆戝櫒鍏锋暟閲忎负0锛岃妫�鏌,
+ title: this.$t('MouldUpperBill.qtyZeroError') == 'MouldUpperBill.qtyZeroError' ? '绗瑊index}琛屻�恵code}銆戝櫒鍏锋暟閲忎负0锛岃妫�鏌�' : this.$t('MouldUpperBill.qtyZeroError').replace('{index}', index).replace('{code}', code),
icon: 'none',
duration: 3000
});
@@ -896,22 +903,22 @@
}
if (!this.hform.HEmpName) {
uni.showToast({
- title: '璇烽�夋嫨鎿嶄綔鍛�',
+ title: this.$t('MouldUpperBill.selectOperator') == 'MouldUpperBill.selectOperator' ? '璇烽�夋嫨鎿嶄綔鍛�' : this.$t('MouldUpperBill.selectOperator'),
icon: 'none'
})
} else if (!this.hform.HMangerName) {
uni.showToast({
- title: '璇烽�夋嫨璐熻矗浜�',
+ title: this.$t('MouldUpperBill.selectManager') == 'MouldUpperBill.selectManager' ? '璇烽�夋嫨璐熻矗浜�' : this.$t('MouldUpperBill.selectManager'),
icon: 'none'
})
} else if (!this.hform.HDeptName) {
uni.showToast({
- title: '璇烽�夋嫨閮ㄩ棬',
+ title: this.$t('MouldUpperBill.selectDept') == 'MouldUpperBill.selectDept' ? '璇烽�夋嫨閮ㄩ棬' : this.$t('MouldUpperBill.selectDept'),
icon: 'none'
})
} else {
uni.showLoading({
- title: '璇风◢鍊�'
+ title: this.$t('MouldUpperBill.pleaseWait') == 'MouldUpperBill.pleaseWait' ? '璇风◢鍊�' : this.$t('MouldUpperBill.pleaseWait')
})
// ========== 绗竴姝ワ細鏋勫缓涓昏〃鏁版嵁 ==========
const mainData = {
@@ -987,8 +994,8 @@
let prePage = pages[pages.length - 2];
uni.showModal({
- title: "鎻愮ず",
- content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
+ title: this.$t('MouldUpperBill.confirmTitle') == 'MouldUpperBill.confirmTitle' ? '鎻愮ず' : this.$t('MouldUpperBill.confirmTitle'),
+ content: res.data.Message + (this.$t('MouldUpperBill.continueAdd') == 'MouldUpperBill.continueAdd' ? '銆傛槸鍚︾户缁柊澧烇紵' : this.$t('MouldUpperBill.continueAdd')),
success: (res) => {
if (res.confirm) {
console.log("鐢ㄦ埛鐐瑰嚮纭畾");
@@ -1012,7 +1019,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('MouldUpperBill.requestFailed') == 'MouldUpperBill.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('MouldUpperBill.requestFailed'),
icon: 'none'
})
},
@@ -1021,8 +1028,8 @@
},
goBack() {
uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+ title: this.$t('MouldUpperBill.confirmTitle') == 'MouldUpperBill.confirmTitle' ? '鎻愮ず' : this.$t('MouldUpperBill.confirmTitle'),
+ content: this.$t('MouldUpperBill.exitConfirm') == 'MouldUpperBill.exitConfirm' ? '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�' : this.$t('MouldUpperBill.exitConfirm'),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -1038,6 +1045,7 @@
</script>
<style lang="scss" scoped>
+ /* 鏍峰紡淇濇寔涓嶅彉 */
.form {
width: 668rpx;
margin: 20rpx auto;
@@ -1160,5 +1168,4 @@
border-bottom: 3px solid #3a78ff;
}
}
-
</style>
\ No newline at end of file
diff --git a/pages/MJGL/xiamodan/MouldLowerBill.vue b/pages/MJGL/xiamodan/MouldLowerBill.vue
index 0ba770a..89be571 100644
--- a/pages/MJGL/xiamodan/MouldLowerBill.vue
+++ b/pages/MJGL/xiamodan/MouldLowerBill.vue
@@ -2,104 +2,100 @@
<view>
<view class="form">
<view class="form-item">
- <view class="title"><text>*</text>鏉″舰鐮�:</view>
+ <view class="title"><text>*</text>{{ $t("MouldLowerBill.HBarCode") == "MouldLowerBill.HBarCode" ? "鏉″舰鐮�:" : $t("MouldLowerBill.HBarCode") }}</view>
<view class="right" style="width: 380rpx;">
- <input v-model="hform.HBarCode" placeholder="璇锋壂鎻忔潯鐮�" @blur="getHBarCodeData(hform.HBarCode)" />
+ <input v-model="hform.HBarCode" :placeholder="$t('MouldLowerBill.HBarCode_Placeholder') == 'MouldLowerBill.HBarCode_Placeholder' ? '璇锋壂鎻忔潯鐮�' : $t('MouldLowerBill.HBarCode_Placeholder')" @blur="getHBarCodeData(hform.HBarCode)" />
</view>
<uni-icons type="scan"
style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
size="20" @click="toScanCode"></uni-icons>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("Gy.HBillNo") == "Gy.HBillNo" ? "鍗曟嵁鍙�:" : $t("Gy.HBillNo") }}</view>
<view class="righton">
<input name="HBillNo" disabled v-model="hform.HBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁鏃ユ湡:</view>
+ <view class="title">{{ $t("Gy.HDate") == "Gy.HDate" ? "鍗曟嵁鏃ユ湡:" : $t("Gy.HDate") }}</view>
<view class="right">
<picker mode="date" v-model="hform.HDate" @change="HDateChange">
- <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+ <input disabled v-model="hform.HDate" :placeholder="$t('Gy.HDate_Placeholder') == 'Gy.HDate_Placeholder' ? '璇烽�夋嫨鏃ユ湡' : $t('Gy.HDate_Placeholder')" />
</picker>
</view>
</view>
<view class="form-item">
- <view class="title"><text>*</text>閮ㄩ棬:</view>
+ <view class="title"><text>*</text>{{ $t("Gy.HDeptName") == "Gy.HDeptName" ? "閮ㄩ棬:" : $t("Gy.HDeptName") }}</view>
<view class="right">
- <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
- @input="HDeptNameChange"></uni-combox>
+ <uni-combox :candidates="arrayHDeptName" :placeholder="$t('Gy.HDeptName_Placeholder') == 'Gy.HDeptName_Placeholder' ? '璇烽�夋嫨閮ㄩ棬' : $t('Gy.HDeptName_Placeholder')" v-model="hform.HDeptName" @input="HDeptNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title"><text>*</text>鎿嶄綔鍛�:</view>
+ <view class="title"><text>*</text>{{ $t("MouldLowerBill.HEmpName") == "MouldLowerBill.HEmpName" ? "鎿嶄綔鍛�:" : $t("MouldLowerBill.HEmpName") }}</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName"
- @input="HEmpNameChange"></uni-combox>
+ <uni-combox :candidates="arrayHEmpName" :placeholder="$t('MouldLowerBill.HEmpName_Placeholder') == 'MouldLowerBill.HEmpName_Placeholder' ? '璇烽�夋嫨鎿嶄綔鍛�' : $t('MouldLowerBill.HEmpName_Placeholder')" v-model="hform.HEmpName" @input="HEmpNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title"><text>*</text>璐熻矗浜�:</view>
+ <view class="title"><text>*</text>{{ $t("MouldLowerBill.HManagerName") == "MouldLowerBill.HManagerName" ? "璐熻矗浜�:" : $t("MouldLowerBill.HManagerName") }}</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨璐熻矗浜�" v-model="hform.HMangerName"
- @input="HManagerNameChange"></uni-combox>
+ <uni-combox :candidates="arrayHEmpName" :placeholder="$t('MouldLowerBill.HManagerName_Placeholder') == 'MouldLowerBill.HManagerName_Placeholder' ? '璇烽�夋嫨璐熻矗浜�' : $t('MouldLowerBill.HManagerName_Placeholder')" v-model="hform.HMangerName" @input="HManagerNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">鐢熶骇璧勬簮:</view>
+ <view class="title">{{ $t("MouldLowerBill.HSourceName") == "MouldLowerBill.HSourceName" ? "鐢熶骇璧勬簮:" : $t("MouldLowerBill.HSourceName") }}</view>
<view class="right">
- <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
- @input="HSourceNameChange"></uni-combox>
+ <uni-combox :candidates="arrayHSourceName" :placeholder="$t('MouldLowerBill.HSourceName_Placeholder') == 'MouldLowerBill.HSourceName_Placeholder' ? '璇烽�夋嫨鐢熶骇璧勬簮' : $t('MouldLowerBill.HSourceName_Placeholder')" v-model="hform.HSourceName" @input="HSourceNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">妯″叿缂栫爜:</view>
+ <view class="title">{{ $t("MouldLowerBill.HMouldNumber") == "MouldLowerBill.HMouldNumber" ? "妯″叿缂栫爜:" : $t("MouldLowerBill.HMouldNumber") }}</view>
<view class="righton">
- <input name="HMouldNumber" v-model="hform.HMouldNumber" disabled placeholder="璇疯緭鍏ュ櫒鍏风紪鐮�" />
+ <input name="HMouldNumber" v-model="hform.HMouldNumber" disabled :placeholder="$t('MouldLowerBill.HMouldNumber_Placeholder') == 'MouldLowerBill.HMouldNumber_Placeholder' ? '璇疯緭鍏ュ櫒鍏风紪鐮�' : $t('MouldLowerBill.HMouldNumber_Placeholder')" />
</view>
</view>
<view class="form-item">
- <view class="title">妯″叿鍚嶇О:</view>
+ <view class="title">{{ $t("MouldLowerBill.HMouldName") == "MouldLowerBill.HMouldName" ? "妯″叿鍚嶇О:" : $t("MouldLowerBill.HMouldName") }}</view>
<view class="righton">
- <input name="HMouldName" v-model="hform.HMouldName" disabled placeholder="璇疯緭鍏ュ櫒鍏峰悕绉�" />
+ <input name="HMouldName" v-model="hform.HMouldName" disabled :placeholder="$t('MouldLowerBill.HMouldName_Placeholder') == 'MouldLowerBill.HMouldName_Placeholder' ? '璇疯緭鍏ュ櫒鍏峰悕绉�' : $t('MouldLowerBill.HMouldName_Placeholder')" />
</view>
</view>
<view class="form-item">
- <view class="title">妯″叿鍨嬪彿:</view>
+ <view class="title">{{ $t("MouldLowerBill.HMouldModel") == "MouldLowerBill.HMouldModel" ? "妯″叿鍨嬪彿:" : $t("MouldLowerBill.HMouldModel") }}</view>
<view class="righton">
- <input name="HMouldModel" v-model="hform.HMouldModel" disabled placeholder="璇疯緭鍏ュ櫒鍏峰瀷鍙�" />
+ <input name="HMouldModel" v-model="hform.HMouldModel" disabled :placeholder="$t('MouldLowerBill.HMouldModel_Placeholder') == 'MouldLowerBill.HMouldModel_Placeholder' ? '璇疯緭鍏ュ櫒鍏峰瀷鍙�' : $t('MouldLowerBill.HMouldModel_Placeholder')" />
</view>
</view>
<view class="form-item">
- <view class="title">鏁伴噺:</view>
+ <view class="title">{{ $t("Gy.HQty") == "Gy.HQty" ? "鏁伴噺:" : $t("Gy.HQty") }}</view>
<view class="righton">
- <input name="HQty" v-model="hform.HQty" disabled placeholder="璇疯緭鍏ユ暟閲�" />
+ <input name="HQty" v-model="hform.HQty" disabled :placeholder="$t('Gy.HQty_Placeholder') == 'Gy.HQty_Placeholder' ? '璇疯緭鍏ユ暟閲�' : $t('Gy.HQty_Placeholder')" />
</view>
</view>
<view class="form-item">
- <view class="title">涓嬫ā鏃堕棿:</view>
+ <view class="title">{{ $t("MouldLowerBill.HScanDate") == "MouldLowerBill.HScanDate" ? "涓嬫ā鏃堕棿:" : $t("MouldLowerBill.HScanDate") }}</view>
<view class="righton">
- <input name="HScanDate" disabled v-model="hform.HScanDate" placeholder="璇烽�夋嫨" />
+ <input name="HScanDate" disabled v-model="hform.HScanDate" :placeholder="$t('Gy.HDate_Placeholder') == 'Gy.HDate_Placeholder' ? '璇烽�夋嫨' : $t('Gy.HDate_Placeholder')" />
</view>
</view>
<view class="form-item">
- <view class="title">鐢熶骇璁㈠崟:</view>
+ <view class="title">{{ $t("MouldLowerBill.HICMOBillNo") == "MouldLowerBill.HICMOBillNo" ? "鐢熶骇璁㈠崟:" : $t("MouldLowerBill.HICMOBillNo") }}</view>
<view class="righton">
<input name="HICMOBillNo" disabled v-model="hform.HICMOBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">娴佽浆鍗�:</view>
+ <view class="title">{{ $t("MouldLowerBill.HProcExchBillNo") == "MouldLowerBill.HProcExchBillNo" ? "娴佽浆鍗�:" : $t("MouldLowerBill.HProcExchBillNo") }}</view>
<view class="righton">
<input disabled v-model="hform.HProcExchBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">澶囨敞:</view>
+ <view class="title">{{ $t("Gy.HRemark") == "Gy.HRemark" ? "澶囨敞:" : $t("Gy.HRemark") }}</view>
<view class="right">
- <textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="璇疯緭鍏ュ娉�"></textarea>
+ <textarea name="HRemark" v-model="hform.HRemark" auto-height :placeholder="$t('Gy.HRemark_Placeholder') == 'Gy.HRemark_Placeholder' ? '璇疯緭鍏ュ娉�' : $t('Gy.HRemark_Placeholder')"></textarea>
</view>
</view>
@@ -107,39 +103,39 @@
<view v-if="showmore">
<view class="form-item">
- <view class="title">鍒跺崟浜�:</view>
+ <view class="title">{{ $t("Gy.HMaker") == "Gy.HMaker" ? "鍒跺崟浜�:" : $t("Gy.HMaker") }}</view>
<view class="righton">
<input v-model="hform.HMaker" disabled />
</view>
</view>
<view class="form-item">
- <view class="title">鍒跺崟鏃ユ湡:</view>
+ <view class="title">{{ $t("Gy.HMakeDate") == "Gy.HMakeDate" ? "鍒跺崟鏃ユ湡:" : $t("Gy.HMakeDate") }}</view>
<view class="righton">
<input v-if="hform.HMakeDate" v-model="hform.HMakeDate.substr(0,10)" disabled />
<input v-else v-model="hform.HMakeDate" disabled />
</view>
</view>
<view class="form-item">
- <view class="title">淇敼浜�:</view>
+ <view class="title">{{ $t("Gy.HUpDater") == "Gy.HUpDater" ? "淇敼浜�:" : $t("Gy.HUpDater") }}</view>
<view class="righton">
<input v-model="hform.HUpDater" disabled />
</view>
</view>
<view class="form-item">
- <view class="title">淇敼鏃ユ湡:</view>
+ <view class="title">{{ $t("Gy.HUpDateDate") == "Gy.HUpDateDate" ? "淇敼鏃ユ湡:" : $t("Gy.HUpDateDate") }}</view>
<view class="righton">
<input v-if="hform.HUpDateDate" v-model="hform.HUpDateDate.substr(0,10)" disabled />
<input v-else v-model="hform.HUpDateDate" disabled />
</view>
</view>
<view class="form-item">
- <view class="title">瀹℃牳浜�:</view>
+ <view class="title">{{ $t("Gy.HChecker") == "Gy.HChecker" ? "瀹℃牳浜�:" : $t("Gy.HChecker") }}</view>
<view class="righton">
<input v-model="hform.HChecker" disabled />
</view>
</view>
<view class="form-item">
- <view class="title">瀹℃牳鏃ユ湡:</view>
+ <view class="title">{{ $t("Gy.HCheckDate") == "Gy.HCheckDate" ? "瀹℃牳鏃ユ湡:" : $t("Gy.HCheckDate") }}</view>
<view class="righton">
<input v-if="hform.HCheckDate" v-model="hform.HCheckDate.substr(0,10)" disabled />
<input v-else v-model="hform.HCheckDate" disabled />
@@ -149,20 +145,20 @@
</view>
<view class="other">
<view v-if="!showmore" @tap="showmore = true">
- 灞曞紑鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
+ {{ $t("MouldLowerBill.expandInfo") == "MouldLowerBill.expandInfo" ? "灞曞紑鍏朵粬淇℃伅" : $t("MouldLowerBill.expandInfo") }}<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
</view>
<view v-if="showmore" @tap="showmore = false">
- 鎶樺彔鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
+ {{ $t("MouldLowerBill.collapseInfo") == "MouldLowerBill.collapseInfo" ? "鎶樺彔鍏朵粬淇℃伅" : $t("MouldLowerBill.collapseInfo") }}<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
</view>
</view>
<view class="tab_area"></view>
<view class="bottom-btn">
- <button v-if="btnType == 1 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
- <button v-if="btnType != 1 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button>
- <button v-if="btnType != 1 && isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
- <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ <button v-if="btnType == 1 && !isEdit" class="btn-a" size="mini" @tap="submit">{{ $t("MouldLowerBill.submit") == "MouldLowerBill.submit" ? "鎻愪氦" : $t("MouldLowerBill.submit") }}</button>
+ <button v-if="btnType != 1 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">{{ $t("MouldLowerBill.modify") == "MouldLowerBill.modify" ? "淇敼" : $t("MouldLowerBill.modify") }}</button>
+ <button v-if="btnType != 1 && isEdit" class="btn-a" size="mini" @tap="submit">{{ $t("MouldLowerBill.submit") == "MouldLowerBill.submit" ? "鎻愪氦" : $t("MouldLowerBill.submit") }}</button>
+ <button class="btn-c" size="mini" @tap="goBack">{{ $t("MouldLowerBill.goBack") == "MouldLowerBill.goBack" ? "閫�鍑�" : $t("MouldLowerBill.goBack") }}</button>
</view>
</view>
@@ -238,6 +234,9 @@
},
onLoad(e) {
+uni.setNavigationBarTitle({
+ title: this.$t("MouldLowerBill.title") == 'MouldLowerBill.title' ? '涓嬫ā鍗�' : this.$t("MouldLowerBill.title")
+ })
this.hform.HMaker = uni.getStorageSync('HUserName')
console.log(e, this.userInfo)
if (e.linterid) {
@@ -260,7 +259,7 @@
mpaasScanModule.mpaasScan({
'hideAlbum': true,
'timeoutInterval': '10', //瓒呮椂鏃堕棿
- 'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ 'timeoutText': this.$t('MouldLowerBill.scanTimeoutText') == 'MouldLowerBill.scanTimeoutText' ? '鏈瘑鍒埌浜岀淮鐮�' : this.$t('MouldLowerBill.scanTimeoutText') //瓒呮椂鎻愰啋
}, (ret) => {
console.log(ret.resp_result)
this.hform.HBarCode = ret.resp_result
@@ -314,7 +313,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('MouldLowerBill.requestFailed') == 'MouldLowerBill.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('MouldLowerBill.requestFailed'),
icon: 'none'
})
},
@@ -345,7 +344,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('MouldLowerBill.requestFailed') == 'MouldLowerBill.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('MouldLowerBill.requestFailed'),
icon: 'none'
})
},
@@ -385,7 +384,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('MouldLowerBill.requestFailed') == 'MouldLowerBill.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('MouldLowerBill.requestFailed'),
icon: 'none'
})
},
@@ -432,7 +431,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('MouldLowerBill.requestFailed') == 'MouldLowerBill.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('MouldLowerBill.requestFailed'),
icon: 'none'
})
},
@@ -511,7 +510,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('MouldLowerBill.requestFailed') == 'MouldLowerBill.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('MouldLowerBill.requestFailed'),
icon: 'none'
})
},
@@ -541,7 +540,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('MouldLowerBill.requestFailed') == 'MouldLowerBill.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('MouldLowerBill.requestFailed'),
icon: 'none'
})
},
@@ -550,32 +549,32 @@
submit() {
if (!this.hform.HBarCode) {
uni.showToast({
- title: '璇锋壂鎻忔ā鍏锋潯褰㈢爜',
+ title: this.$t('MouldLowerBill.scanMouldBarCode') == 'MouldLowerBill.scanMouldBarCode' ? '璇锋壂鎻忔ā鍏锋潯褰㈢爜' : this.$t('MouldLowerBill.scanMouldBarCode'),
icon: 'none'
})
} else if (!this.hform.HSourceName) {
uni.showToast({
- title: '璇烽�夋嫨鐢熶骇璧勬簮',
+ title: this.$t('MouldLowerBill.selectSource') == 'MouldLowerBill.selectSource' ? '璇烽�夋嫨鐢熶骇璧勬簮' : this.$t('MouldLowerBill.selectSource'),
icon: 'none'
})
} else if (!this.hform.HMouldName) {
uni.showToast({
- title: '妯″叿涓嶈兘涓虹┖',
+ title: this.$t('MouldLowerBill.mouldRequired') == 'MouldLowerBill.mouldRequired' ? '妯″叿涓嶈兘涓虹┖' : this.$t('MouldLowerBill.mouldRequired'),
icon: 'none'
})
} else if (!this.hform.HEmpName) {
uni.showToast({
- title: '璇烽�夋嫨鎿嶄綔鍛�',
+ title: this.$t('MouldLowerBill.selectOperator') == 'MouldLowerBill.selectOperator' ? '璇烽�夋嫨鎿嶄綔鍛�' : this.$t('MouldLowerBill.selectOperator'),
icon: 'none'
})
} else if (!this.hform.HMangerName) {
uni.showToast({
- title: '璇烽�夋嫨璐熻矗浜�',
+ title: this.$t('MouldLowerBill.selectManager') == 'MouldLowerBill.selectManager' ? '璇烽�夋嫨璐熻矗浜�' : this.$t('MouldLowerBill.selectManager'),
icon: 'none'
})
} else {
uni.showLoading({
- title: '璇风◢鍊�'
+ title: this.$t('MouldLowerBill.pleaseWait') == 'MouldLowerBill.pleaseWait' ? '璇风◢鍊�' : this.$t('MouldLowerBill.pleaseWait')
})
var sMainStr = JSON.stringify(this.hform);
var sMainSub = sMainStr + ";" + uni.getStorageSync('HUserName') + ";" + this.btnType;
@@ -593,8 +592,8 @@
if (res.data.count == 1) {
uni.showModal({
- title: "鎻愮ず",
- content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
+ title: this.$t('MouldLowerBill.confirmTitle') == 'MouldLowerBill.confirmTitle' ? '鎻愮ず' : this.$t('MouldLowerBill.confirmTitle'),
+ content: res.data.Message + (this.$t('MouldLowerBill.continueAdd') == 'MouldLowerBill.continueAdd' ? '銆傛槸鍚︾户缁柊澧烇紵' : this.$t('MouldLowerBill.continueAdd')),
success: (res) => {
if (res.confirm) {
console.log("鐢ㄦ埛鐐瑰嚮纭畾");
@@ -620,7 +619,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('MouldLowerBill.requestFailed') == 'MouldLowerBill.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('MouldLowerBill.requestFailed'),
icon: 'none'
})
},
@@ -629,8 +628,8 @@
},
goBack() {
uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+ title: this.$t('MouldLowerBill.confirmTitle') == 'MouldLowerBill.confirmTitle' ? '鎻愮ず' : this.$t('MouldLowerBill.confirmTitle'),
+ content: this.$t('MouldLowerBill.exitConfirm') == 'MouldLowerBill.exitConfirm' ? '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�' : this.$t('MouldLowerBill.exitConfirm'),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -646,6 +645,7 @@
</script>
<style lang="scss" scoped>
+ /* 鏍峰紡淇濇寔涓嶅彉 */
.form {
width: 668rpx;
margin: 20rpx auto;
diff --git a/pages/ZLGL/QCNoPassProdRequestBillMain/QCNoPassProdRequestBillMain.vue b/pages/ZLGL/QCNoPassProdRequestBillMain/QCNoPassProdRequestBillMain.vue
new file mode 100644
index 0000000..e046ed2
--- /dev/null
+++ b/pages/ZLGL/QCNoPassProdRequestBillMain/QCNoPassProdRequestBillMain.vue
@@ -0,0 +1,1368 @@
+<template>
+ <view>
+ <!-- 涓昏〃鍖哄煙 -->
+ <view class="bill-main-area">
+ <!-- 涓昏〃椤电 -->
+ <view class="bill-main-tabs">
+ <view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">鍩烘湰淇℃伅</view>
+ <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍏朵粬淇℃伅</view>
+ <view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">鍒跺崟淇℃伅</view>
+ </view>
+ <!-- 涓昏〃鍐呭 -->
+ <view class="bill-main-contents">
+ <!-- 鍩烘湰淇℃伅 -->
+ <view class="bill-main-content" v-if="mainTabSelected == 1">
+ <view class="form-item">
+ <view class="left">鍗曟嵁鍙�</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HBillNo" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鏃ユ湡</view>
+ <view class="right">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HDate">
+ <view>{{ hform.HDate }}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鍙戠敓鏃ユ湡</view>
+ <view class="right">
+ <uni-datetime-picker type="datetime" :clear-icon="false" v-model="hform.HHappendDate">
+ <view>{{ hform.HHappendDate }}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鐢熶骇璁㈠崟</view>
+ <view class="right">
+ <input type="text" v-model="hform.HICMOBillNos" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">浜у搧缂栫爜</view>
+ <view class="right">
+ <input type="text" v-model="hform.HMaterNumbers" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">浜у搧鍚嶇О</view>
+ <view class="right">
+ <input type="text" v-model="hform.HMaterNames"/>
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">瑙勬牸鍨嬪彿</view>
+ <view class="right">
+ <input type="text" v-model="hform.HMaterModels"/>
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">璁￠噺鍗曚綅</view>
+ <view class="right">
+ <input type="text" v-model="hform.HUnitNames"/>
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">浜у搧绫诲瀷</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HMaterTypes" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">涓嶈壇鏁伴噺</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HUnRightQtys" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">杞﹂棿</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HDeptNames" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">鍙戠敓宸ュ簭</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HProcNames" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">涓嶈壇鐜拌薄</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HBadPhenomenaNames" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">涓嶈壇鍝丼N鐮�</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HBarCodes" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">閿�鍞鍗�</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HSeOrderBillNos" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">闂鐜拌薄绠�杩�</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HReasonNotes" disabled />
+ </view>
+ </view>
+
+ <!-- 绱ф�ョ▼搴� - 鏄剧ず鏂囨湰 -->
+ <view class="form-item">
+ <view class="left">绱ф�ョ▼搴�</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HLevs" disabled />
+ </view>
+ </view>
+
+ <!-- 鏄惁鍋滅嚎 - 鏄剧ず鏂囨湰 -->
+ <view class="form-item">
+ <view class="left">鏄惁鍋滅嚎</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HIsStops" disabled />
+ </view>
+ </view>
+
+ <!-- 鏄惁鎵归噺闂 - 鏄剧ず鏂囨湰 -->
+ <view class="form-item">
+ <view class="left">鏄惁鎵归噺闂</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HIsBatchUnRights" disabled />
+ </view>
+ </view>
+
+ <!-- 澶勭悊閮ㄩ棬 -->
+ <view class="form-item">
+ <view class="left">澶勭悊閮ㄩ棬</view>
+ <view class="right">
+ <uni-combox :candidates="DeptNameList" placeholder="璇烽�夋嫨澶勭悊閮ㄩ棬" v-model="hform.HDisposeDeptName"
+ @input="HDisposeDeptChange"></uni-combox>
+ </view>
+ </view>
+
+ <!-- 鍙戣捣浜� -->
+ <view class="form-item">
+ <view class="left">鍙戣捣浜�</view>
+ <view class="right">
+ <uni-combox :candidates="GyEmpNameList" placeholder="璇烽�夋嫨鍙戣捣浜�"
+ v-model="hform.HSendMan" @input="HSendManChange"></uni-combox>
+ </view>
+ </view>
+
+ <!-- 鎺ユ敹浜� -->
+ <view class="form-item">
+ <view class="left">鎺ユ敹浜�</view>
+ <view class="right">
+ <uni-combox :candidates="GyEmpNameList" placeholder="璇烽�夋嫨鎺ユ敹浜�"
+ v-model="hform.HReceiveMan" @input="HReceiveManChange"></uni-combox>
+ </view>
+ </view>
+
+ <!-- 鎶勯�佷汉 - 鏀逛负涓嬫媺妗� -->
+ <view class="form-item">
+ <view class="left">鎶勯�佷汉</view>
+ <view class="right">
+ <uni-combox :candidates="GyEmpNameList" placeholder="璇烽�夋嫨鎶勯�佷汉"
+ v-model="hform.HCopyMan" @input="HCopyManChange"></uni-combox>
+ </view>
+ </view>
+
+ <!-- 婧愬崟绫诲瀷 - 淇鐗� -->
+ <view class="form-item">
+ <view class="left">婧愬崟绫诲瀷</view>
+ <view class="right" v-show="showHMainSourceBillType">
+ <picker :range="arrayHMainSourceBillType" @change="HMainSourceBillTypeChange" mode="selector">
+ <view class="picker-value">{{ HMainSourceBillTypeDisplay || '璇烽�夋嫨婧愬崟绫诲瀷' }}</view>
+ </picker>
+ </view>
+ <view class="right disabled" v-show="!showHMainSourceBillType">
+ <view class="picker-value">{{ HMainSourceBillTypeDisplay }}</view>
+ </view>
+ </view>
+
+ <!-- 婧愬崟鍗曞彿 -->
+ <view class="form-item">
+ <view class="left">婧愬崟鍙�</view>
+ <view class="right">
+ <input type="text" v-model="hform.HMainSourceBillNo" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�"
+ @confirm="GetMessageByHSourceBillNo" />
+ </view>
+ <view class="icon-wrapper" @click="openSourceBillSelector">
+ <uni-icons type="search" size="20"></uni-icons>
+ </view>
+ <view class="icon-wrapper" @click="scanSourceBill">
+ <uni-icons type="scan" size="20"></uni-icons>
+ </view>
+ </view>
+
+ <!-- 澶勭悊宸ュ簭 -->
+ <view class="form-item">
+ <view class="left">澶勭悊宸ュ簭</view>
+ <view class="right disabled">
+ <input type="text" disabled v-model="hform.HDisposeProcName" />
+ </view>
+ <view class="icon-wrapper-big">
+ <uni-icons type="search" size="20" :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+ :disabled="hasSourceBill"
+ @click="showSelectorModule(8)"></uni-icons>
+ </view>
+ </view>
+
+ <!-- 涓嶈壇绫诲瀷 -->
+ <view class="form-item">
+ <view class="left">涓嶈壇绫诲瀷</view>
+ <view class="right disabled">
+ <input type="text" disabled v-model="hform.HBadTypeName" />
+ </view>
+ <view class="icon-wrapper-big">
+ <uni-icons type="search" size="20" :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+ :disabled="hasSourceBill"
+ @click="showSelectorModule(7)"></uni-icons>
+ </view>
+ </view>
+
+ <!-- 涓嶈壇鍘熷洜 -->
+ <view class="form-item">
+ <view class="left">涓嶈壇鍘熷洜</view>
+ <view class="right disabled">
+ <input type="text" disabled v-model="hform.HBadReasonName" />
+ </view>
+ <view class="icon-wrapper-big">
+ <uni-icons type="search" size="20" :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+ :disabled="hasSourceBill"
+ @click="showSelectorModule(2)"></uni-icons>
+ </view>
+ </view>
+
+ <!-- 澶勭悊缁撹璇︽儏 -->
+ <view class="form-item">
+ <view class="left">澶勭悊缁撹璇︽儏</view>
+ <view class="right">
+ <input type="text" v-model="hform.HDisposeNote" />
+ </view>
+ </view>
+
+ <!-- 绾犳鍙婇闃叉帾鏂� -->
+ <view class="form-item">
+ <view class="left">绾犳鍙婇闃叉帾鏂�</view>
+ <view class="right">
+ <input type="text" v-model="hform.HNote" />
+ </view>
+ </view>
+
+ <!-- 澶勭悊缁撹 -->
+ <view class="form-item">
+ <view class="left">澶勭悊缁撹</view>
+ <view class="right select-border">
+ <uni-data-select
+ v-model="hform.HCheckerResult"
+ :localdata="conclusionList"
+ :clear="false"
+ placeholder="璇烽�夋嫨澶勭悊缁撹"
+ :disabled="hasSourceBill"
+ class="no-border-select"
+ ></uni-data-select>
+ </view>
+ </view>
+ </view>
+ <view class="bill-main-content" v-if="mainTabSelected == 2">
+ <view class="form-item">
+ <view class="left">宸ュ簭娴佽浆鍗�</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HProcExchBillNos" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">浜у搧缂栫爜</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HMaterNumbers" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">浜у搧鍚嶇О</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HMaterNames" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">瑙勬牸鍨嬪彿</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HMaterModels" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">璁￠噺鍗曚綅</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HUnitNames" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">浜у搧绫诲瀷</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HMaterTypes" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">涓嶈壇鏁伴噺</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HUnRightQtys" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">杞﹂棿</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HDeptNames" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">鍙戠敓宸ュ簭</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HProcNames" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">涓嶈壇鐜拌薄</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HBadPhenomenaNames" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">涓嶈壇鍝丼N鐮�</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HBarCodes" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">閿�鍞鍗�</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HSeOrderBillNos" disabled />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">闂鐜拌薄绠�杩�</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HReasonNotes" disabled />
+ </view>
+ </view>
+
+ <!-- 绱ф�ョ▼搴� - 鏄剧ず鏂囨湰 -->
+ <view class="form-item">
+ <view class="left">绱ф�ョ▼搴�</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HLevs" disabled />
+ </view>
+ </view>
+
+ <!-- 鏄惁鍋滅嚎 - 鏄剧ず鏂囨湰 -->
+ <view class="form-item">
+ <view class="left">鏄惁鍋滅嚎</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HIsStops" disabled />
+ </view>
+ </view>
+
+ <!-- 鏄惁鎵归噺闂 - 鏄剧ず鏂囨湰 -->
+ <view class="form-item">
+ <view class="left">鏄惁鎵归噺闂</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HIsBatchUnRights" disabled />
+ </view>
+ </view>
+
+ <!-- 鍘熸湁鐨勫娉ㄥ拰缁勭粐瀛楁 -->
+ <view class="form-item">
+ <view class="left">澶囨敞</view>
+ <view class="right">
+ <input type="text" v-model="hform.HRemark" />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">缁勭粐</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.Organization" disabled />
+ </view>
+ </view>
+ </view>
+
+ <!-- 鍒跺崟淇℃伅 -->
+ <view class="bill-main-content" v-if="mainTabSelected == 3">
+ <view class="form-item">
+ <view class="left">鍒跺崟浜�</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HMaker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鍒跺崟鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HMakeDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">淇敼浜�</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HUpDater" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">淇敼鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HUpDateDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">瀹℃牳浜�</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HChecker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">瀹℃牳鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HCheckDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鍏抽棴浜�</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HCloseMan" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鍏抽棴鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HCloseDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">浣滃簾浜�</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HDeleteMan" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">浣滃簾鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.HDeleteDate" disabled />
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ <view style="height: 120rpx"></view>
+
+ <!-- 搴曢儴鎸夐挳 -->
+ <view class="bottom-btn">
+ <button class="btn-a" size="mini" @tap="submit">淇濆瓨</button>
+ <view style="flex: 1"></view>
+ <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+ <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ </view>
+
+ <!-- 寮圭獥缁勪欢 -->
+ <GyBadReasonPopup ref="GyBadReasonPopup" @update="CheckItemComplete" :bindKey="currentChechItemIDCache">
+ </GyBadReasonPopup>
+ <ProcessPopupVue ref="processPopup" @update="HProcComplete" :bindKey="0"></ProcessPopupVue>
+ <GyBadTypePopupVue ref="GyBadTypePopupVue" @update="HQCSchemeComplete" :bindKey="0"></GyBadTypePopupVue>
+ <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
+ :HStockOrgID="hform.HStockOrgID" @BillSelectComplete="handleSourceBill"></BillListPopupVue>
+ </view>
+</template>
+
+<script>
+ import dayjs from "dayjs";
+ import {
+ CommonUtils
+ } from "../../../utils/common";
+ import GyBadReasonPopup from "../../../components/ZLGL/GyBadReasonPopup.vue";
+ import ProcessPopupVue from "../../../components/ZLGL/ProcessPopup.vue";
+ import GyBadTypePopupVue from "../../../components/ZLGL/GyBadTypePopup.vue";
+ import BillListPopupVue from "@/components/BillListPopup/BillListPopup.vue";
+ import {
+ getUserInfo
+ } from "../../../utils/auth";
+
+ export default {
+ components: {
+ GyBadReasonPopup,
+ ProcessPopupVue,
+ GyBadTypePopupVue,
+ BillListPopupVue,
+ },
+ data() {
+ return {
+ operationType: 1,
+ mainTabSelected: 1,
+ hasSourceBill: false,
+
+ enablePopupModule: "",
+ PopupModuleNameList: [
+ "", "", "GyBadReasonPopup", "", "", "", "", "GyBadTypePopupVue", "ProcessPopupVue"
+ ],
+ conclusionList: [
+ { value: '澶勭悊瀹屾垚', text: '澶勭悊瀹屾垚' },
+ { value: '鏃犳硶澶勭悊', text: '鏃犳硶澶勭悊' },
+ { value: '澶勭悊澶辫触', text: '澶勭悊澶辫触' }
+ ],
+ emergencyList: [
+ { value: '鏅��', text: '鏅��' },
+ { value: '绱ф��', text: '绱ф��' }
+ ],
+ yesNoList: [
+ { value: '鍚�', text: '鍚�' },
+ { value: '鏄�', text: '鏄�' }
+ ],
+ currentChechItemIDCache: -1,
+ GyEmpList: [],
+ GyEmpNameList: [],
+ DeptNameList: [],
+ DeptList: [],
+
+ HMainSourceBillTypeDisplay: "", // 鐢ㄤ簬鏄剧ず鐨勬簮鍗曠被鍨�
+ arrayHMainSourceBillType: ["涓嶈壇鍝佽瘎瀹＄敵璇峰崟", "宸ュ簭鍑虹珯姹囨姤鍗�"],
+ arrayHMainSourceBillTypeID: ["7512", "3791"],
+ showHMainSourceBillType: true,
+
+ hform: {
+ // 鍗曟嵁淇℃伅
+ HInterID: "0",
+ HEntryID: "0",
+ HBillNo: "",
+ HDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HHappendDate:dayjs(new Date()).format("YYYY-MM-DD HH:MM"),
+ HBillType: '7514',
+
+ // 鐢宠淇℃伅
+ HBillNos: "",
+ HDates: "",
+ HHappendDates: "",
+
+ // 鐢熶骇璁㈠崟
+ HICMOBillNos: "",
+ HICMOInterIDs: "0",
+ HICMOEntryIDs: "0",
+
+ // 浜у搧淇℃伅
+ HMaterNumbers: "",
+ HMaterNames: "",
+ HMaterModels: "",
+ HMaterIDs: "0",
+ HUnitNames: "",
+ HUnitIDs: "0",
+ HMaterTypes: "",
+
+ // 宸ュ簭娴佽浆鍗�
+ HProcExchBillNos: "",
+ HProcExchInterIDs: "0",
+ HProcExchEntryIDs: "0",
+
+ // 涓嶈壇淇℃伅
+ HUnRightQtys: "",
+ HLevs: "鏅��",
+ HIsStops: "鍚�",
+ HIsBatchUnRights: "鍚�",
+ HBarCodes: "",
+ HBadPhenomenaNames: "",
+ HBadPhenomenaIDs: "0",
+ HReasonNotes: "",
+
+ // 閮ㄩ棬宸ュ簭
+ HDeptNames: "",
+ HDeptIDs: "0",
+ HProcNames: "",
+ HProcIDs: "0",
+
+ // 閿�鍞鍗�
+ HSeOrderBillNos: "",
+
+ // 婧愬崟淇℃伅
+ HMainSourceBillType: "",
+ HMainSourceBillNo: "",
+ HMainSourceInterID: "0",
+ HMainSourceEntryID: "0",
+
+ HSendMan: "",
+ HCopyMan: "",
+
+ HDisposeDeptName: "",
+ HDisposeDeptID: "0",
+ HDisposeProcName: "",
+ HDisposeProcID: "0",
+ HDisposeEmpName: "",
+ HSendManID: "0",
+ HReceiveManID: "0",
+ HDisposeEmpID: "0",
+ HCheckerResult: "澶勭悊瀹屾垚",
+ HDisposeNote: "",
+
+ // 涓嶈壇鍘熷洜绫诲瀷
+ HBadTypeName: "",
+ HBadTypeID: "0",
+ HBadReasonName: "",
+ HBadReasonID: "0",
+
+ // 澶囨敞
+ HNote: "",
+ HRemark: "",
+
+ // 缁勭粐淇℃伅
+ Organization: getUserInfo()["Organization"] || "",
+ HStockOrgID: uni.getStorageSync('OrganizationID') || "0",
+
+ // 鍒跺崟淇℃伅
+ HMaker: getUserInfo()["Czymc"] || "",
+ HMakeDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HUpDater: "",
+ HUpDateDate: "",
+ HChecker: "",
+ HCheckDate: "",
+ HCloseMan: "",
+ HCloseDate: "",
+ HDeleteMan: "",
+ HDeleteDate: "",
+ },
+ };
+ },
+ methods: {
+ // 鏄剧ず閫夋嫨鍣ㄥ脊绐�
+ async showSelectorModule(index) {
+ if (this.hasSourceBill) {
+ uni.showToast({ title: '宸叉湁婧愬崟锛屼笉鑳戒慨鏀�', icon: 'none' });
+ return;
+ }
+
+ this.currentChechItemIDCache = 0;
+ this.enablePopupModule = this.PopupModuleNameList[index];
+
+ await this.$nextTick();
+
+ let popupRef = null;
+ if (index === 2) popupRef = this.$refs.GyBadReasonPopup;
+ else if (index === 7) popupRef = this.$refs.GyBadTypePopupVue;
+ else if (index === 8) popupRef = this.$refs.processPopup;
+
+ if (popupRef) {
+ popupRef.showPopup();
+ }
+ },
+ // 鍒濆鍖栬亴鍛樻暟鎹殑鏂规硶锛堜豢鐓� InitHEmp锛�
+ async InitGyEmp() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Gy_Employee/list",
+ data: {
+ sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''`,
+ user: getUserInfo()["Czymc"],
+ Organization: uni.getStorageSync("Organization"),
+ },
+ });
+
+ let { data, Message, count } = res.data;
+
+ if (count == 1) {
+ this.GyEmpList = data;
+ this.GyEmpNameList = Array.from(data).map((e) => e["鑱屽憳鍚嶇О"]);
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栬亴鍛樺け璐�: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栬亴鍛樺け璐�: ${err}`,
+ });
+ }
+ },
+ // 涓嶈壇鍘熷洜閫夋嫨瀹屾垚
+ // 鏂板锛氭壂鐮佽幏鍙栨簮鍗曞彿
+ scanSourceBill() {
+ // 璋冪敤寰俊鎵爜鍔熻兘
+ uni.scanCode({
+ scanType: ['barCode', 'qrCode'],
+ success: (res) => {
+ // 灏嗘壂鐮佺粨鏋滆祴鍊肩粰婧愬崟鍙�
+ this.hform.HMainSourceBillNo = res.result;
+ // 鑷姩瑙﹀彂鏌ヨ
+ this.GetMessageByHSourceBillNo();
+ },
+ fail: (err) => {
+ console.error('鎵爜澶辫触:', err);
+ uni.showToast({
+ title: '鎵爜澶辫触',
+ icon: 'none'
+ });
+ }
+ });
+ },
+ CheckItemComplete(e) {
+ if (e && e.retVal) {
+ let data = Object.values(e.retVal)[0];
+ this.hform.HBadReasonID = String(data.HItemID || 0);
+ this.hform.HBadReasonName = data.涓嶈壇鍘熷洜鍚嶇О || "";
+ }
+ this.$refs.GyBadReasonPopup?.exit();
+ this.enablePopupModule = "";
+ },
+
+ // 涓嶈壇绫诲瀷閫夋嫨瀹屾垚
+ HQCSchemeComplete(e) {
+ if (e && e.retVal) {
+ let data = Object.values(e.retVal)[0];
+ this.hform.HBadTypeID = String(data.HItemID || 0);
+ this.hform.HBadTypeName = data.涓嶈壇绫诲瀷鍚嶇О || "";
+ }
+ this.$refs.GyBadTypePopupVue?.exit();
+ this.enablePopupModule = "";
+ },
+
+ // 宸ュ簭閫夋嫨瀹屾垚
+ HProcComplete(e) {
+ if (e && e.retVal) {
+ let data = Object.values(e.retVal)[0];
+ this.hform.HDisposeProcID = String(data.HItemID || 0);
+ this.hform.HDisposeProcName = data.宸ュ簭鍚嶇О || "";
+ }
+ this.$refs.processPopup?.exit();
+ this.enablePopupModule = "";
+ },
+
+ // 鍒濆鍖栭儴闂�
+ async InitDept() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/PublicPageMethod/DeptList',
+ data: { sWhere: 'where 1=1' }
+ });
+ if (res.data.count == 1) {
+ this.DeptList = res.data.data;
+ this.DeptNameList = res.data.data.map(e => e['HName']);
+ }
+ } catch (err) {
+ console.error('鍒濆鍖栭儴闂ㄩ敊璇�:', err);
+ }
+ },
+
+ // 鍒濆鍖栬亴鍛�
+ async InitHEmp() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Gy_Employee/list",
+ data: {
+ sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''`,
+ },
+ });
+
+ if (res.data.count == 1) {
+ this.GyEmpList = res.data.data;
+ this.GyEmpNameList = res.data.data.map(e => e["鑱屽憳鍚嶇О"]);
+ }
+ } catch (err) {
+ console.error('鍒濆鍖栬亴鍛樺け璐�:', err);
+ }
+ },
+
+ // 鎵撳紑婧愬崟閫夋嫨鍣�
+ openSourceBillSelector() {
+ if (!this.hform.HMainSourceBillType) {
+ uni.showToast({ title: '璇峰厛閫夋嫨婧愬崟绫诲瀷', icon: 'none' });
+ return;
+ }
+ this.$refs.billList.showPopup();
+ },
+
+ // 鎺ユ敹婧愬崟
+ handleSourceBill(e) {
+ this.hform.HMainSourceBillNo = e.HBillNo;
+
+ this.GetMessageByHSourceBillNo();
+ this.$refs.billList?.exit();
+
+ },
+
+ // 鑾峰彇婧愬崟鏁版嵁
+ async GetMessageByHSourceBillNo() {
+ if (!this.hform.HMainSourceBillType) {
+ uni.showToast({ title: '璇烽�夋嫨婧愬崟绫诲瀷', icon: 'none' });
+ return;
+ }
+ if (!this.hform.HMainSourceBillNo ) {
+ uni.showToast({ title: '璇疯緭鍏ユ垨鑰呮壂鐮佹簮鍗曞彿', icon: 'none' });
+ return;
+ }
+
+ try {
+ let res;
+ let user = getUserInfo()["Czymc"] || "";
+ let Organization = uni.getStorageSync('OrganizationID') || "";
+
+ // 鏍规嵁婧愬崟绫诲瀷璋冪敤涓嶅悓鐨勬帴鍙�
+ if (this.hform.HMainSourceBillType === "7512") {
+
+ res = await CommonUtils.doRequest2Async({
+ url: "/Sc_ProcessMangement/Get_QC_NoPassProdRequestBillList",
+ type: "GET",
+ data: {
+ "sWhere": ` and 鍗曟嵁鍙� = '${this.hform.HMainSourceBillNo}'`,
+ "user": user
+ }
+ });
+ } else if (this.hform.HMainSourceBillType === "3791") {
+
+ res = await CommonUtils.doRequest2Async({
+ url: "/Cj_StationOutBill/get_Display_byPage",
+ type: "GET",
+ data: {
+ "sWhere": `and 鍗曟嵁鍙� = ''${this.hform.HMainSourceBillNo}''`,
+ "user": user,
+ "Organization": Organization,
+ "page": 1,
+ "size": 1,
+ "HBillSubType": "3791"
+ }
+ });
+ }
+
+ uni.hideLoading();
+
+ // 鑾峰彇绗竴鏉℃暟鎹�
+ let data = null;
+ if (res.data) {
+ if (Array.isArray(res.data) && res.data.length > 0) {
+ data = res.data[0];
+ } else if (res.data.data && res.data.data.length > 0) {
+ data = res.data.data[0];
+ } else if (res.data.rows && res.data.rows.length > 0) {
+ data = res.data.rows[0];
+ } else if (res.data.list && res.data.list.length > 0) {
+ data = res.data.list[0];
+ }
+ }
+
+ if (data) {
+ // 鏍规嵁婧愬崟绫诲瀷澶勭悊鏁版嵁
+ if (this.hform.HMainSourceBillType === "7512") {
+ // 澶勭悊涓嶈壇鍝佽瘎瀹＄敵璇峰崟鏁版嵁锛堢涓�缁勬暟鎹級
+ this.hform.HBillNos = data.鍗曟嵁鍙� || "";
+ this.hform.HDates = data.鏃ユ湡 ? data.鏃ユ湡.split('T')[0] : "";
+ this.hform.HHappendDates = data.鍙戠敓鏃堕棿 ? data.鍙戠敓鏃堕棿.replace('T', ' ') : "";
+ this.hform.HICMOBillNos = data.浠诲姟鍗曞彿 || "";
+ this.hform.HProcExchBillNos = data.宸ュ簭娴佽浆鍗″彿 || "";
+ this.hform.HMaterNumbers = data.浜у搧浠ｇ爜 || "";
+ this.hform.HMaterNames = data.浜у搧鍚嶇О || "";
+ this.hform.HMaterModels = data.瑙勬牸鍨嬪彿 || "";
+ this.hform.HUnitNames = data.璁￠噺鍗曚綅鍚嶇О || "";
+ this.hform.HMaterTypes = data.浜у搧绫诲瀷 === "1" ? "浜ф垚鍝�" : data.浜у搧绫诲瀷 || "";
+ this.hform.HUnRightQtys = data.涓嶈壇鏁伴噺 || "0";
+ this.hform.HDeptNames = data.杞﹂棿鍚嶇О || "";
+ this.hform.HProcNames = data.宸ュ簭 || "";
+ this.hform.HBadPhenomenaNames = data.涓嶈壇鐜拌薄 || "";
+ this.hform.HBarCodes = data.涓嶈壇鍝丼N鐮� || "";
+ this.hform.HSeOrderBillNos = data.閿�鍞鍗� || "";
+ this.hform.HReasonNotes = data.闂鐜拌薄绠�杩� || "";
+ this.hform.HLevs = data.绱ф�ョ▼搴� || "鏅��";
+ this.hform.HIsStops = data.鏄惁鍋滅嚎 || "鍚�";
+ this.hform.HIsBatchUnRights = data.鏄惁鎵归噺闂 || "鍚�";
+
+ // 婧愬崟ID淇℃伅
+ this.hform.HMainSourceInterID = data.hmainid || "0";
+ this.hform.HMainSourceEntryID = data.浠诲姟鍗曞瓙鍐呯爜 || "0";
+
+ } else if (this.hform.HMainSourceBillType === "3791") {
+ // 澶勭悊宸ュ簭鍑虹珯姹囨姤鍗曟暟鎹紙绗簩缁勬暟鎹級
+ this.hform.HBillNos = data.鍗曟嵁鍙� || "";
+ this.hform.HDates = data.鏃ユ湡 ? data.鏃ユ湡.split('T')[0] : "";
+ this.hform.HHappendDates = data.鍑虹珯鏃堕棿 ? data.鍑虹珯鏃堕棿.replace('T', ' ') : "";
+ this.hform.HICMOBillNos = data.浠诲姟鍗� || "";
+ this.hform.HProcExchBillNos = data.宸ュ簭娴佽浆鍗″彿 || "";
+ this.hform.HMaterNumbers = data.浜у搧浠ｇ爜 || "";
+ this.hform.HMaterNames = data.浜у搧鍚嶇О || "";
+ this.hform.HMaterModels = data.瑙勬牸鍨嬪彿 || "";
+ this.hform.HUnitNames = data.璁￠噺鍗曚綅 || "";
+ this.hform.HMaterTypes = data.浜у搧绫诲瀷 || "";
+
+ // 涓嶈壇鏁伴噺 - 绗簩缁勬暟鎹腑鍙兘鏄笉鑹暟閲忓瓧娈�
+ this.hform.HUnRightQtys = data.涓嶈壇鏁伴噺 || data.鎶ュ簾鏁伴噺 || "0";
+ this.hform.HDeptNames = data.杞﹂棿 || data.閮ㄩ棬 || "";
+ this.hform.HProcNames = data.褰撳墠宸ュ簭 || "";
+
+ // 涓嶈壇鐜拌薄 - 绗簩缁勬暟鎹彲鑳芥病鏈夎繖涓瓧娈�
+ this.hform.HBadPhenomenaNames = data.涓嶈壇鐜拌薄 || "";
+
+ // 鍏朵粬瀛楁
+ this.hform.HBarCodes = data.鎵规鍙� || data.涓嶈壇鍝丼N鐮� || "";
+ this.hform.HSeOrderBillNos = data.閿�鍞鍗� || "";
+ this.hform.HReasonNotes = data.闂鐜拌薄绠�杩� || "";
+ this.hform.HLevs = data.绱ф�ョ▼搴� || "鏅��";
+ this.hform.HIsStops = data.鏄惁鍋滅嚎 || "鍚�";
+ this.hform.HIsBatchUnRights = data.鏄惁鎵归噺闂 || "鍚�";
+
+ // 婧愬崟ID淇℃伅
+ this.hform.HMainSourceInterID = data.hmainid || data.HProcExchInterID || "0";
+ this.hform.HMainSourceEntryID = data.HProcExchEntryID || "1";
+ }
+
+ // 璁剧疆婧愬崟绫诲瀷鏄剧ず
+ let index = this.arrayHMainSourceBillTypeID.findIndex(id => id == this.hform.HMainSourceBillType);
+ if (index != -1) {
+ this.HMainSourceBillTypeDisplay = this.arrayHMainSourceBillType[index];
+ }
+
+ this.hasSourceBill = false;
+ uni.showToast({ title: '鍔犺浇鎴愬姛', icon: 'success' });
+
+ // 寮哄埗鏇存柊瑙嗗浘
+ this.$forceUpdate();
+
+ } else {
+ uni.showToast({ title: '鏈壘鍒版簮鍗�', icon: 'none' });
+ }
+ } catch (err) {
+ uni.hideLoading();
+ console.error('鑾峰彇澶辫触:', err);
+
+ // 鏄剧ず鏇磋缁嗙殑閿欒淇℃伅
+ if (err.response && err.response.data) {
+ console.error('閿欒璇︽儏:', err.response.data);
+ uni.showToast({ title: err.response.data.Message || '鑾峰彇澶辫触', icon: 'none' });
+ } else {
+ uni.showToast({ title: '鑾峰彇澶辫触', icon: 'none' });
+ }
+ }
+ },
+
+ // 澶勭悊閮ㄩ棬閫夋嫨
+ HDisposeDeptChange(val) {
+ let index = this.DeptNameList.findIndex(e => e == val);
+ if (index == -1) {
+ this.hform.HDisposeDeptName = '';
+ this.hform.HDisposeDeptID = '0';
+ return;
+ }
+ this.hform.HDisposeDeptName = this.DeptList[index]['HName'];
+ this.hform.HDisposeDeptID = String(this.DeptList[index]['HItemID']);
+ },
+
+ // 鍙戣捣浜洪�夋嫨
+ HSendManChange(val) {
+ let index = this.GyEmpList.findIndex(e => e["鑱屽憳鍚嶇О"] == val);
+ if (index == -1) {
+ this.hform.HSendMan = "";
+ return;
+ }
+ this.hform.HSendMan = this.GyEmpList[index]["鑱屽憳鍚嶇О"];
+ },
+
+ // 鎺ユ敹浜洪�夋嫨
+ HReceiveManChange(val) {
+ let index = this.GyEmpList.findIndex(e => e["鑱屽憳鍚嶇О"] == val);
+ if (index == -1) {
+ this.hform.HReceiveMan = "";
+ return;
+ }
+ this.hform.HReceiveMan = this.GyEmpList[index]["鑱屽憳鍚嶇О"];
+ },
+
+ // 鎶勯�佷汉閫夋嫨 -
+ HCopyManChange(val) {
+ let index = this.GyEmpList.findIndex(e => e["鑱屽憳鍚嶇О"] == val);
+ if (index == -1) {
+ this.hform.HCopyMan = "";
+ return;
+ }
+ this.hform.HCopyMan = this.GyEmpList[index]["鑱屽憳鍚嶇О"];
+ },
+
+ // 婧愬崟绫诲瀷閫夋嫨
+ HMainSourceBillTypeChange(e) {
+ let index = e.detail.value;
+ this.HMainSourceBillTypeDisplay = this.arrayHMainSourceBillType[index];
+ this.hform.HMainSourceBillType = this.arrayHMainSourceBillTypeID[index];
+ },
+
+ // 鑾峰彇鍗曟嵁鍙�
+ async getMaxBillNo() {
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Web/GetMAXNum",
+ data: { HBillType: "7512" },
+ });
+
+ if (res?.data?.count == 1) {
+ this.hform.HInterID = res.data.data[0].HInterID;
+ this.hform.HBillNo = res.data.data[0].HBillNo;
+ }
+ } catch (err) {
+ console.error('鑾峰彇鍗曟嵁鍙峰紓甯�:', err);
+ }
+ },
+
+ // 楠岃瘉
+ checkSubmitValidate() {
+ if (!this.hform.HBillNo) {
+ uni.showToast({ title: '鍗曟嵁鍙蜂笉鑳戒负绌�', icon: 'none' });
+ return false;
+ }
+ if (!this.hform.HSendMan) {
+ uni.showToast({ title: '鍙戣捣浜轰笉鑳戒负绌�', icon: 'none' });
+ return false;
+ }
+ if (!this.hform.HReceiveMan) {
+ uni.showToast({ title: '鎺ユ敹浜轰笉鑳戒负绌�', icon: 'none' });
+ return false;
+ }
+ return true;
+ },
+
+ async getEditData(HInterID) {
+ if (!HInterID || HInterID === "0") return;
+
+ uni.showLoading({ title: '鍔犺浇涓�...' });
+
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Sc_ProcessMangement/Edit_QC_NoPassProdDisposeBill",
+ type: "GET",
+ data: { "HID": HInterID }
+ });
+
+ if (res.data && res.data.data && res.data.data.length > 0) {
+ let data = res.data.data[0];
+
+ this.hform = {
+ ...this.hform, // 淇濈暀鍘熸湁鐨勯粯璁ゅ��
+
+ HInterID: data.hmainid || "0",
+ HEntryID: data.HEntryID || "0",
+ HBillNo: data.鍗曟嵁鍙� || "",
+ HDate: data.鏃ユ湡 ? data.鏃ユ湡.split('T')[0] : dayjs().format("YYYY-MM-DD"),
+ HBillType: data.HBillType || '7513',
+
+
+ HBillNos: data.婧愬崟鍙� || "", // 杩欐槸婧愬崟鍙�
+ HDates: data.鏃ユ湡 ? data.鏃ユ湡.split('T')[0] : "", // 婧愬崟鏃ユ湡
+ HHappendDates: data.鍙戠敓鏃堕棿 ? data.鍙戠敓鏃堕棿.replace('T', ' ') : "",
+
+
+ HICMOBillNos: data.鐢熶骇璁㈠崟|| "",
+ HICMOInterIDs: data.HICMOInterIDs || "0",
+ HICMOEntryIDs: data.HICMOEntryIDs || "0",
+
+
+ HMaterNumbers: data.浜у搧浠ｇ爜 || "",
+ HMaterNames: data.浜у搧鍚嶇О || "",
+ HMaterModels: data.瑙勬牸鍨嬪彿 || "",
+ HMaterIDs: data.HMaterID || "0",
+ HUnitNames: data.璁￠噺鍗曚綅鍚嶇О || "",
+ HUnitIDs: data.HUnitID || "0",
+ HMaterTypes: data.浜у搧绫诲瀷 === "1" ? "浜у搧绫诲瀷" : data.浜у搧绫诲瀷 || "",
+
+
+ HProcExchBillNos: data.宸ュ簭娴佽浆鍗″彿 || "",
+ HProcExchInterIDs: data.HProcExchInterIDs || "0",
+ HProcExchEntryIDs: data.HProcExchEntryIDs || "0",
+
+ HDisposeEmpName:data.澶勭悊浜� ,
+ HUnRightQtys: data.涓嶈壇鏁伴噺 || "0",
+ HLevs: data.绱ф�ョ▼搴� || "鏅��",
+ HIsStops: data.鏄惁鍋滅嚎 || "鍚�",
+ HIsBatchUnRights: data.鏄惁鎵归噺闂 || "鍚�",
+ HBarCodes: data.涓嶈壇鍝丼N鐮� || "",
+ HBadPhenomenaNames: data.涓嶈壇鐜拌薄 || "",
+ HBadPhenomenaIDs: data.HBadPhenomenaID || "0",
+ HReasonNotes: data.闂鐜拌薄绠�杩� || "",
+ HNote:data.绾犳鍙婇闃叉帾鏂�,
+ HDeptNames: data.杞﹂棿鍚嶇О || "",
+ HDeptIDs: data.HDeptID || "0",
+ HProcNames: data.宸ュ簭 || "",
+ HProcIDs: data.HProcID || "0",
+
+
+ HSeOrderBillNos: data.閿�鍞鍗� || "",
+ HMainSourceBillType: data.婧愬崟绫诲瀷 || "",
+ HMainSourceBillNo: data.婧愬崟鍙� || "",
+ HMainSourceInterID: data.婧愬崟ID || data.hmainid || "0",
+ HMainSourceEntryID: data.婧愬崟瀛怚D || data.浠诲姟鍗曞瓙鍐呯爜 || "0",
+ HSendMan: data.鍙戦�佷汉 || "",
+ HReceiveMan: data.鎺ユ敹浜� || "",
+ HCopyMan: data.鎶勯�� || "",
+ HDisposeDeptName: data.澶勭悊閮ㄩ棬 || "",
+ HDisposeDeptID: data.HDisposeDeptID || "0",
+ HDisposeProcID:data.HDisposeProcID || "0",
+ HDisposeProcName: data.澶勭悊宸ュ簭 || "",
+ HDisposeEmpID: data.HDisposeEmpID || "0",
+ HCheckerResult: data.澶勭悊缁撹 || "",
+ HDisposeNote: data.澶勭悊缁撹璇︽儏 || "",
+ HBadTypeName: data.涓嶈壇绫诲瀷 || "",
+ HBadTypeID: data.HBadTypeID || "0",
+ HBadReasonName: data.涓嶈壇鍘熷洜 || "",
+ HBadReasonID: data.HBadReasonID || "0",
+ HRemark: data.琛ㄥご澶囨敞 || "",
+
+
+ Organization: data.Organization || getUserInfo()["Organization"] || "",
+ HStockOrgID: data.HStockOrgID || uni.getStorageSync('OrganizationID') || "0",
+ HMaker: data.鍒跺崟浜� || "",
+ HMakeDate: data.鍒跺崟鏃ユ湡 ? data.鍒跺崟鏃ユ湡.replace('T', ' ') : "",
+ HUpDater: data.淇敼浜� || "",
+ HUpDateDate: data.淇敼鏃ユ湡 ? data.淇敼鏃ユ湡.replace('T', ' ') : "",
+ HChecker: data.瀹℃牳浜� || "",
+ HCheckDate: data.瀹℃牳鏃ユ湡 ? data.瀹℃牳鏃ユ湡.replace('T', ' ') : "",
+ HCloseMan: data.鍏抽棴浜� || "",
+ HCloseDate: data.鍏抽棴鏃ユ湡 ? data.鍏抽棴鏃ユ湡.replace('T', ' ') : "",
+ HDeleteMan: data.浣滃簾浜� || "",
+ HDeleteDate: data.浣滃簾鏃ユ湡 ? data.浣滃簾鏃ユ湡.replace('T', ' ') : "",
+ };
+
+
+ if (data.婧愬崟绫诲瀷) {
+ let index = this.arrayHMainSourceBillTypeID.findIndex(id => id == data.婧愬崟绫诲瀷);
+ if (index != -1) {
+ this.HMainSourceBillTypeDisplay = this.arrayHMainSourceBillType[index];
+ }
+ }
+
+
+ this.hasSourceBill = false;
+
+
+ this.$forceUpdate();
+
+ console.log('璧嬪�煎悗鐨刪form:', this.hform);
+ }
+ } catch (err) {
+ console.error('鑾峰彇鏁版嵁澶辫触:', err);
+ uni.showToast({ title: '鑾峰彇鏁版嵁澶辫触', icon: 'none' });
+ } finally {
+ uni.hideLoading();
+ }
+ },
+
+ // 淇濆瓨
+ async submit() {
+ if (!this.checkSubmitValidate()) return;
+
+ let operation = this.operationType == 1 ? "Add" : "Update";
+
+ // 缂栬緫鏃惰缃慨鏀逛汉鍜屼慨鏀规椂闂�
+ if (this.operationType == 3) {
+ this.hform.HUpDater = getUserInfo()["Czymc"];
+ this.hform.HUpDateDate = dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss");
+ }
+
+ try {
+ let sMainStr = JSON.stringify(this.hform);
+ let sMainSub = sMainStr + ';' + operation + ';' + getUserInfo()["Czymc"];
+
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sc_ProcessMangement/SaveQC_NoPassProdDisposeBill",
+ data: { "msg": sMainSub },
+ method: "POST",
+ });
+
+ if (res?.data?.count == 1) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '淇濆瓨鎴愬姛锛屾槸鍚︾户缁柊澧烇紵',
+ success: (r) => {
+ if (r.confirm) {
+ uni.redirectTo({
+ url: "/pages/ZLGL/QCNoPassProdDisposeBillMainList/QCNoPassProdDisposeBillMain?operationType=1",
+ });
+ } else {
+ uni.navigateBack();
+ }
+ }
+ });
+ } else {
+ uni.showToast({ title: res?.data?.Message || '淇濆瓨澶辫触', icon: 'none' });
+ }
+ } catch (err) {
+ console.error('淇濆瓨澶辫触:', err);
+ uni.showToast({ title: '淇濆瓨澶辫触', icon: 'none' });
+ }
+ },
+
+ // 鏂板
+ addNew() {
+ uni.redirectTo({
+ url: "/pages/ZLGL/QCNoPassProdDisposeBillMainList/QCNoPassProdDisposeBillMain?operationType=1",
+ });
+ },
+
+ // 杩斿洖
+ goBack() {
+ uni.navigateBack();
+ },
+ },
+
+ async onLoad(e) {
+ this.operationType = parseInt(e.operationType) || 1;
+ this.hform.HInterID = e.HInterID || "0";
+
+ const organization = uni.getStorageSync('Organization');
+ this.hform.Organization = organization || '';
+
+
+ await this.InitGyEmp();
+ await this.InitDept();
+
+ if (this.operationType == 1) {
+ await this.getMaxBillNo();
+ this.hform.HSendMan = getUserInfo()["Czymc"] || "";
+ } else if (this.operationType == 3) {
+ await this.getEditData(e.HInterID);
+ }
+ }
+ };
+</script>
+
+<style lang="scss" scoped>
+ /* 鏍峰紡淇濇寔涓嶅彉 */
+ input { width: inherit; font-size: 26rpx; }
+ .uni-input { padding: 0; }
+
+ .bill-main-tabs {
+ box-sizing: border-box;
+ width: 730rpx;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: nowrap;
+ gap: 20rpx;
+ border-bottom: 1px solid #ddd;
+ padding: 20rpx 10rpx;
+
+ view {
+ width: auto;
+ font-size: 26rpx;
+ color: #555;
+ text-align: center;
+ padding: 16rpx 0;
+ }
+
+ .selected {
+ color: #3a78ff;
+ font-weight: bold;
+ border-bottom: 3px solid #3a78ff;
+ }
+ }
+
+ .bill-main-content {
+ box-sizing: border-box;
+ padding: 0 30rpx;
+ display: flex;
+ flex-direction: column;
+
+ .form-item {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ font-size: 26rpx;
+ padding: 6rpx 0;
+
+ .left { width: 208rpx; }
+ .right {
+ padding: 8rpx 20rpx;
+ font-size: 26rpx;
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+
+ .uni-combox { padding: 0; height: auto; }
+ .uni-combox::v-deep input { height: inherit; font-size: 26rpx; }
+
+ input {
+ width: 100%;
+ border: none;
+ outline: none;
+ background: transparent;
+ }
+ }
+ .disabled { border: 1px solid #e4e4e4; background-color: #f5f5f5; }
+ }
+ }
+
+ .bottom-btn {
+ box-sizing: border-box;
+ width: 100%;
+ height: 120rpx;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ background-color: #fff;
+ box-shadow: 0 2rpx 10rpx 2rpx rgba(0,0,0,0.4);
+ padding: 30rpx 40rpx;
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+ .btn-a { background-color: #3a78ff; color: #fff; }
+ .btn-c { background-color: #acacac; color: #fff; }
+ }
+
+ .select-border {
+ border: 1px solid #acacac !important;
+ border-radius: 22rpx !important;
+ }
+
+ .no-border-select ::v-deep .uni-select {
+ border: none !important;
+ }
+
+ .icon-wrapper, .icon-wrapper-big {
+ background-color: #3a78ff;
+ border-radius: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-shrink: 0;
+ margin-left: 20rpx;
+ .uni-icons { color: #fff !important; }
+ }
+
+ .icon-wrapper { width: 40rpx; height: 40rpx; }
+ .icon-wrapper-big { width: 50rpx; height: 50rpx; }
+
+ .enable-icon-button { background-color: #3a78ff; }
+ .disable-icon-button { background-color: lightgray; pointer-events: none; }
+
+
+</style>
\ No newline at end of file
diff --git a/pages/ZLGL/QCNoPassProdRequestBillMain/QCNoPassProdRequestBillMainList.vue b/pages/ZLGL/QCNoPassProdRequestBillMain/QCNoPassProdRequestBillMainList.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/pages/ZLGL/QCNoPassProdRequestBillMain/QCNoPassProdRequestBillMainList.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue b/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
index 219a397..125c2a5 100644
--- a/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
+++ b/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
@@ -2,150 +2,145 @@
<view>
<scroll-view scroll-y id="scroll-content" class="scroll-content" :style="{height: scrollContentHeight + 'px'}">
<view class="form-item">
- <view class="title">鏉″舰鐮�:</view>
+ <view class="title">{{ $t("QC_TakeSampleCheckBill.HBarCode") == "QC_TakeSampleCheckBill.HBarCode" ? "鏉″舰鐮�:" : $t("QC_TakeSampleCheckBill.HBarCode") }}</view>
<view class="right">
- <input type="text" name="HBarCode" id="HBarCode" v-model="HBarCode" @confirm="getCode(HBarCode)" />
+ <input type="text" name="HBarCode" id="HBarCode" v-model="HBarCode" @confirm="getCode(HBarCode)" :placeholder="$t('QC_TakeSampleCheckBill.HBarCode_Placeholder') == 'QC_TakeSampleCheckBill.HBarCode_Placeholder' ? '璇锋壂鎻忔潯鐮�' : $t('QC_TakeSampleCheckBill.HBarCode_Placeholder')" />
</view>
<view class="right-icon" @click="toScanCode">
<uni-icons color="#fff" type="scan" size="24"></uni-icons>
</view>
</view>
<view class="form-item">
- <view class="title required">宸ュ簭:</view>
+ <view class="title required">{{ $t("QC_TakeSampleCheckBill.HProcName") == "QC_TakeSampleCheckBill.HProcName" ? "宸ュ簭:" : $t("QC_TakeSampleCheckBill.HProcName") }}</view>
<view class="right">
- <uni-combox :candidates="HProcNameArray" name="HProcName" id="HProcName" placeholder="璇烽�夋嫨宸ュ簭鍙�"
- v-model="hform.HProcName" @input="onHProcNameChangeHandler"></uni-combox>
+ <uni-combox :candidates="HProcNameArray" name="HProcName" id="HProcName" :placeholder="$t('QC_TakeSampleCheckBill.HProcName_Placeholder') == 'QC_TakeSampleCheckBill.HProcName_Placeholder' ? '璇烽�夋嫨宸ュ簭鍙�' : $t('QC_TakeSampleCheckBill.HProcName_Placeholder')" v-model="hform.HProcName" @input="onHProcNameChangeHandler"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title required">鍙栨牱鏁伴噺:</view>
+ <view class="title required">{{ $t("Gy.HQty") == "Gy.HQty" ? "鍙栨牱鏁伴噺:" : $t("Gy.HQty") }}</view>
<view class="right">
- <input type="number" name="HQty" id="HQty" v-model="hform.HQty" />
+ <input type="number" name="HQty" id="HQty" v-model="hform.HQty" :placeholder="$t('Gy.HQty_Placeholder') == 'Gy.HQty_Placeholder' ? '璇疯緭鍏ユ暟閲�' : $t('Gy.HQty_Placeholder')" />
</view>
</view>
<view class="form-item">
- <view class="title">鐮村潖鎬у疄楠屾暟閲�:</view>
+ <view class="title">{{ $t("QC_TakeSampleCheckBill.HSampleDamageQty") == "QC_TakeSampleCheckBill.HSampleDamageQty" ? "鐮村潖鎬у疄楠屾暟閲�:" : $t("QC_TakeSampleCheckBill.HSampleDamageQty") }}</view>
<view class="right">
<input type="number" name="HSampleDamageQty" id="HSampleDamageQty"
- v-model="hform.HSampleDamageQty" />
+ v-model="hform.HSampleDamageQty" :placeholder="$t('QC_TakeSampleCheckBill.HSampleDamageQty_Placeholder') == 'QC_TakeSampleCheckBill.HSampleDamageQty_Placeholder' ? '璇疯緭鍏ユ暟閲�' : $t('QC_TakeSampleCheckBill.HSampleDamageQty_Placeholder')" />
</view>
</view>
<view class="form-item">
- <view class="title required">閫佹祴绫诲瀷:</view>
+ <view class="title required">{{ $t("QC_TakeSampleCheckBill.TestType") == "QC_TakeSampleCheckBill.TestType" ? "閫佹祴绫诲瀷:" : $t("QC_TakeSampleCheckBill.TestType") }}</view>
<view class="right">
<uni-combox :candidates="TestTypeArray" v-model="hform.TestType"
@input="TestTypeChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">閫佹祴鍐呭:</view>
+ <view class="title">{{ $t("QC_TakeSampleCheckBill.HBadNote") == "QC_TakeSampleCheckBill.HBadNote" ? "閫佹祴鍐呭:" : $t("QC_TakeSampleCheckBill.HBadNote") }}</view>
<view class="right">
- <input type="text" name="HBadNote" id="HBadNote" v-model="hform.HBadNote" />
+ <input type="text" name="HBadNote" id="HBadNote" v-model="hform.HBadNote" :placeholder="$t('QC_TakeSampleCheckBill.HBadNote_Placeholder') == 'QC_TakeSampleCheckBill.HBadNote_Placeholder' ? '璇疯緭鍏ラ�佹祴鍐呭' : $t('QC_TakeSampleCheckBill.HBadNote_Placeholder')" />
</view>
</view>
<view class="form-item">
- <view class="title">閮ㄩ棬:</view>
+ <view class="title">{{ $t("Gy.HDeptName") == "Gy.HDeptName" ? "閮ㄩ棬:" : $t("Gy.HDeptName") }}</view>
<view class="right">
- <uni-combox :candidates="HDeptNameArray" name="HDeptName" id="HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬"
- v-model="hform.HDeptName" @input="HDeptNameChangeHandler"></uni-combox>
+ <uni-combox :candidates="HDeptNameArray" name="HDeptName" id="HDeptName" :placeholder="$t('Gy.HDeptName_Placeholder') == 'Gy.HDeptName_Placeholder' ? '璇烽�夋嫨閮ㄩ棬' : $t('Gy.HDeptName_Placeholder')" v-model="hform.HDeptName" @input="HDeptNameChangeHandler"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title required">鐢熶骇鐝:</view>
+ <view class="title required">{{ $t("QC_TakeSampleCheckBill.HShiftsName") == "QC_TakeSampleCheckBill.HShiftsName" ? "鐢熶骇鐝:" : $t("QC_TakeSampleCheckBill.HShiftsName") }}</view>
<view class="right">
- <uni-combox :candidates="HShiftsNameArray" name="HShiftsName" id="HShiftsName" placeholder="璇烽�夋嫨鐢熶骇鐝"
- v-model="hform.HShiftsName" @input="HShiftsNameChangeHandler"></uni-combox>
+ <uni-combox :candidates="HShiftsNameArray" name="HShiftsName" id="HShiftsName" :placeholder="$t('QC_TakeSampleCheckBill.HShiftsName_Placeholder') == 'QC_TakeSampleCheckBill.HShiftsName_Placeholder' ? '璇烽�夋嫨鐢熶骇鐝' : $t('QC_TakeSampleCheckBill.HShiftsName_Placeholder')" v-model="hform.HShiftsName" @input="HShiftsNameChangeHandler"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title required">鐢熶骇鐝粍:</view>
+ <view class="title required">{{ $t("QC_TakeSampleCheckBill.HGroupName") == "QC_TakeSampleCheckBill.HGroupName" ? "鐢熶骇鐝粍:" : $t("QC_TakeSampleCheckBill.HGroupName") }}</view>
<view class="right">
- <uni-combox :candidates="HGroupNameArray" name="HGroupName" id="HGroupName" placeholder="璇烽�夋嫨鐢熶骇鐝粍"
- v-model="hform.HGroupName" @input="HGroupNameChangeHandler"></uni-combox>
+ <uni-combox :candidates="HGroupNameArray" name="HGroupName" id="HGroupName" :placeholder="$t('QC_TakeSampleCheckBill.HGroupName_Placeholder') == 'QC_TakeSampleCheckBill.HGroupName_Placeholder' ? '璇烽�夋嫨鐢熶骇鐝粍' : $t('QC_TakeSampleCheckBill.HGroupName_Placeholder')" v-model="hform.HGroupName" @input="HGroupNameChangeHandler"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">鍙栨牱鍛�:</view>
+ <view class="title">{{ $t("QC_TakeSampleCheckBill.HCheckEmpName") == "QC_TakeSampleCheckBill.HCheckEmpName" ? "鍙栨牱鍛�:" : $t("QC_TakeSampleCheckBill.HCheckEmpName") }}</view>
<view class="right">
<uni-combox :candidates="HCheckEmpNameArray" name="HCheckEmpName" id="HCheckEmpName"
- placeholder="璇烽�夋嫨鍙栨牱鍛�" v-model="hform.HCheckEmpName"
+ :placeholder="$t('QC_TakeSampleCheckBill.HCheckEmpName_Placeholder') == 'QC_TakeSampleCheckBill.HCheckEmpName_Placeholder' ? '璇烽�夋嫨鍙栨牱鍛�' : $t('QC_TakeSampleCheckBill.HCheckEmpName_Placeholder')" v-model="hform.HCheckEmpName"
@input="HCheckEmpNameChangeHandler"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">鐢熶骇璧勬簮:</view>
+ <view class="title">{{ $t("QC_TakeSampleCheckBill.HSourceName") == "QC_TakeSampleCheckBill.HSourceName" ? "鐢熶骇璧勬簮:" : $t("QC_TakeSampleCheckBill.HSourceName") }}</view>
<view class="right">
- <uni-combox :candidates="HSourceNameArray" name="HSourceName" id="HSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬枡"
- v-model="hform.HSourceName" @input="HSourceNameChangeHandler"></uni-combox>
+ <uni-combox :candidates="HSourceNameArray" name="HSourceName" id="HSourceName" :placeholder="$t('QC_TakeSampleCheckBill.HSourceName_Placeholder') == 'QC_TakeSampleCheckBill.HSourceName_Placeholder' ? '璇烽�夋嫨鐢熶骇璧勬枡' : $t('QC_TakeSampleCheckBill.HSourceName_Placeholder')" v-model="hform.HSourceName" @input="HSourceNameChangeHandler"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁鏃ユ湡:</view>
+ <view class="title">{{ $t("Gy.HDate") == "Gy.HDate" ? "鍗曟嵁鏃ユ湡:" : $t("Gy.HDate") }}</view>
<view class="right disabled">
<input disabled type="text" name="HDate" id="HDate" v-model="hform.HDate" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("Gy.HBillNo") == "Gy.HBillNo" ? "鍗曟嵁鍙�:" : $t("Gy.HBillNo") }}</view>
<view class="right disabled">
<input disabled type="text" name="HBillNo" id="HBillNo" v-model="hform.HBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">鐢熶骇璁㈠崟:</view>
+ <view class="title">{{ $t("QC_TakeSampleCheckBill.HICMOBillNo") == "QC_TakeSampleCheckBill.HICMOBillNo" ? "鐢熶骇璁㈠崟:" : $t("QC_TakeSampleCheckBill.HICMOBillNo") }}</view>
<view class="right disabled">
<input disabled type="text" v-model="hform.HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">娴佽浆鍗�:</view>
+ <view class="title">{{ $t("QC_TakeSampleCheckBill.HProcExchBillNo") == "QC_TakeSampleCheckBill.HProcExchBillNo" ? "娴佽浆鍗�:" : $t("QC_TakeSampleCheckBill.HProcExchBillNo") }}</view>
<view class="right disabled">
<input disabled type="text" v-model="hform.HProcExchBillNo" name="HProcExchBillNo"
id="HProcExchBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">鐗╂枡浠ｇ爜:</view>
+ <view class="title">{{ $t("Gy.HMaterCode") == "Gy.HMaterCode" ? "鐗╂枡浠ｇ爜:" : $t("Gy.HMaterCode") }}</view>
<view class="right disabled">
<input disabled type="text" v-model="hform.HMaterCode" name="HMaterCode" id="HMaterCode" />
</view>
</view>
<view class="form-item">
- <view class="title">鐗╂枡鍚嶇О:</view>
+ <view class="title">{{ $t("Gy.HMaterName") == "Gy.HMaterName" ? "鐗╂枡鍚嶇О:" : $t("Gy.HMaterName") }}</view>
<view class="right disabled">
<input disabled type="text" v-model="hform.HMaterName" name="HMaterName" id="HMaterName" />
</view>
</view>
<view class="form-item">
- <view class="title">瑙勬牸鍨嬪彿:</view>
+ <view class="title">{{ $t("Gy.HMaterSpec") == "Gy.HMaterSpec" ? "瑙勬牸鍨嬪彿:" : $t("Gy.HMaterSpec") }}</view>
<view class="right disabled">
<input disabled type="text" v-model="hform.HMaterSpec" name="HMaterSpec" id="HMaterSpec" />
</view>
</view>
<view class="form-item">
- <view class="title">璁￠噺鍗曚綅:</view>
+ <view class="title">{{ $t("Gy.HUnitName") == "Gy.HUnitName" ? "璁￠噺鍗曚綅:" : $t("Gy.HUnitName") }}</view>
<view class="right disabled">
<input disabled type="text" v-model="hform.HUnitName" name="HUnitName" id="HUnitName" />
</view>
</view>
<view class="form-item">
- <view class="title">娴佽浆鍗℃壒鍙�:</view>
+ <view class="title">{{ $t("QC_TakeSampleCheckBill.HBatchNo") == "QC_TakeSampleCheckBill.HBatchNo" ? "娴佽浆鍗℃壒鍙�:" : $t("QC_TakeSampleCheckBill.HBatchNo") }}</view>
<view class="right disabled">
<input disabled type="text" v-model="hform.HBatchNo" name="HBatchNo" id="HBatchNo" />
</view>
</view>
<view class="form-item">
- <view class="title">娴佽浆鍗℃暟閲�:</view>
+ <view class="title">{{ $t("QC_TakeSampleCheckBill.HProcExchQty") == "QC_TakeSampleCheckBill.HProcExchQty" ? "娴佽浆鍗℃暟閲�:" : $t("QC_TakeSampleCheckBill.HProcExchQty") }}</view>
<view class="right disabled">
<input disabled type="text" v-model="hform.HProcExchQty" name="HProcExchQty" id="HProcExchQty" />
</view>
</view>
</scroll-view>
<view class="bottom-btn" id="bottom-btn">
- <view><button class="btn-a" size="mini" @tap="submit">鎻愪氦</button></view>
- <view><button class="btn-b" size="mini" @tap="onAddNewHandler">鏂板</button></view>
+ <view><button class="btn-a" size="mini" @tap="submit">{{ $t("QC_TakeSampleCheckBill.submit") == "QC_TakeSampleCheckBill.submit" ? "鎻愪氦" : $t("QC_TakeSampleCheckBill.submit") }}</button></view>
+ <view><button class="btn-b" size="mini" @tap="onAddNewHandler">{{ $t("QC_TakeSampleCheckBill.addNew") == "QC_TakeSampleCheckBill.addNew" ? "鏂板" : $t("QC_TakeSampleCheckBill.addNew") }}</button></view>
<view class="placeholder__view"></view>
- <view><button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button></view>
+ <view><button class="btn-c" size="mini" @tap="goBack">{{ $t("QC_TakeSampleCheckBill.goBack") == "QC_TakeSampleCheckBill.goBack" ? "閫�鍑�" : $t("QC_TakeSampleCheckBill.goBack") }}</button></view>
</view>
</view>
</template>
@@ -169,7 +164,6 @@
},
refSav: 'Add',
showMask: true,
- TestTypeArray: ["棣栨", "宸℃", "鏈", "瀹為獙"],
HBillType: '7521',
HProcNameArray: [],
@@ -197,7 +191,7 @@
HProcID: 0,
HQty: '',
HSampleDamageQty: 0,
- TestType: '棣栨',
+ TestType: 'first',
HBadNote: '',
HDeptName: getUserInfo().HDeptName,
HDeptID: getUserInfo().HDeptID,
@@ -247,6 +241,14 @@
get() {
return this.pageMeta.bottomBtnTop - this.pageMeta.scrollContentTop
}
+ },
+ TestTypeArray() {
+ return [
+ this.$t('QC_TakeSampleCheckBill.testTypeFirst') == 'QC_TakeSampleCheckBill.testTypeFirst' ? '棣栨' : this.$t('QC_TakeSampleCheckBill.testTypeFirst'),
+ this.$t('QC_TakeSampleCheckBill.testTypeInspection') == 'QC_TakeSampleCheckBill.testTypeInspection' ? '宸℃' : this.$t('QC_TakeSampleCheckBill.testTypeInspection'),
+ this.$t('QC_TakeSampleCheckBill.testTypeNot') == 'QC_TakeSampleCheckBill.testTypeNot' ? '鏈' : this.$t('QC_TakeSampleCheckBill.testTypeNot'),
+ this.$t('QC_TakeSampleCheckBill.testTypeExperiment') == 'QC_TakeSampleCheckBill.testTypeExperiment' ? '瀹為獙' : this.$t('QC_TakeSampleCheckBill.testTypeExperiment')
+ ];
}
},
onReady() {
@@ -265,6 +267,9 @@
},
async onLoad(e) {
+ uni.setNavigationBarTitle({
+ title: this.$t("QC_TakeSampleCheckBill.title") == 'QC_TakeSampleCheckBill.title' ? '鍙栨牱鍗�' : this.$t("QC_TakeSampleCheckBill.title")
+ })
let {
operationType
} = e
@@ -284,7 +289,7 @@
this.get_HWorkShift()
},
methods: {
- HDeptNameChangeHandler() {
+ HDeptNameChangeHandler(e) {
let index = this.HDeptNameArray.findIndex(item => item == e)
if (index != -1) {
@@ -348,7 +353,7 @@
} else {
uni.showToast({
icon: 'none',
- title: Message
+ title: msg
})
}
}
@@ -575,7 +580,7 @@
mpaasScanModule.mpaasScan({
'hideAlbum': true,
'timeoutInterval': '10', //瓒呮椂鏃堕棿
- 'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ 'timeoutText': this.$t('QC_TakeSampleCheckBill.scanTimeoutText') == 'QC_TakeSampleCheckBill.scanTimeoutText' ? '鏈瘑鍒埌浜岀淮鐮�' : this.$t('QC_TakeSampleCheckBill.scanTimeoutText') //瓒呮椂鎻愰啋
}, (ret) => {
console.log(ret.resp_result)
if (this.hform.HBarCode == '*') {
@@ -592,7 +597,7 @@
if (!HBarCode) {
return uni.showToast({
icon: 'none',
- title: '鏉″舰鐮佷笉鑳戒负绌�'
+ title: this.$t('QC_TakeSampleCheckBill.barCodeEmpty') == 'QC_TakeSampleCheckBill.barCodeEmpty' ? '鏉″舰鐮佷笉鑳戒负绌�' : this.$t('QC_TakeSampleCheckBill.barCodeEmpty')
})
}
CommonUtils.doRequest2({
@@ -662,55 +667,55 @@
if (this.hform.HProcID == 0) {
return uni.showToast({
icon: 'none',
- title: '宸ュ簭娌℃湁閫夋嫨'
+ title: this.$t('QC_TakeSampleCheckBill.noProcess') == 'QC_TakeSampleCheckBill.noProcess' ? '宸ュ簭娌℃湁閫夋嫨' : this.$t('QC_TakeSampleCheckBill.noProcess')
})
}
if (this.hform.HQty == '') {
return uni.showToast({
icon: 'none',
- title: '鍙栨牱鏁伴噺涓嶈兘涓虹┖'
+ title: this.$t('QC_TakeSampleCheckBill.sampleQtyEmpty') == 'QC_TakeSampleCheckBill.sampleQtyEmpty' ? '鍙栨牱鏁伴噺涓嶈兘涓虹┖' : this.$t('QC_TakeSampleCheckBill.sampleQtyEmpty')
})
}
if (this.hform.HSampleDamageQty == '') {
return uni.showToast({
icon: 'none',
- title: '鐮村潖鎬у疄楠屾暟閲忎笉鑳戒负绌�'
+ title: this.$t('QC_TakeSampleCheckBill.damageQtyEmpty') == 'QC_TakeSampleCheckBill.damageQtyEmpty' ? '鐮村潖鎬у疄楠屾暟閲忎笉鑳戒负绌�' : this.$t('QC_TakeSampleCheckBill.damageQtyEmpty')
})
}
if (this.hform.HProcID == 0) {
return uni.showToast({
icon: 'none',
- title: '宸ュ簭娌℃湁閫夋嫨'
+ title: this.$t('QC_TakeSampleCheckBill.noProcess') == 'QC_TakeSampleCheckBill.noProcess' ? '宸ュ簭娌℃湁閫夋嫨' : this.$t('QC_TakeSampleCheckBill.noProcess')
})
}
if (this.hform.HDeptID == 0) {
return uni.showToast({
icon: 'none',
- title: '閮ㄩ棬娌℃湁閫夋嫨'
+ title: this.$t('QC_TakeSampleCheckBill.noDept') == 'QC_TakeSampleCheckBill.noDept' ? '閮ㄩ棬娌℃湁閫夋嫨' : this.$t('QC_TakeSampleCheckBill.noDept')
})
}
if (this.hform.HShiftsID == 0) {
return uni.showToast({
icon: 'none',
- title: '鐝鏈�夋嫨'
+ title: this.$t('QC_TakeSampleCheckBill.noShift') == 'QC_TakeSampleCheckBill.noShift' ? '鐝鏈�夋嫨' : this.$t('QC_TakeSampleCheckBill.noShift')
})
}
if (this.hform.HGroupID == 0) {
return uni.showToast({
icon: 'none',
- title: '鐢熶骇鐝粍鏈�夋嫨'
+ title: this.$t('QC_TakeSampleCheckBill.noGroup') == 'QC_TakeSampleCheckBill.noGroup' ? '鐢熶骇鐝粍鏈�夋嫨' : this.$t('QC_TakeSampleCheckBill.noGroup')
})
}
if (this.hform.HCheckEmp == 0) {
return uni.showToast({
icon: 'none',
- title: '鍙栨牱鍛樻湭閫夋嫨'
+ title: this.$t('QC_TakeSampleCheckBill.noChecker') == 'QC_TakeSampleCheckBill.noChecker' ? '鍙栨牱鍛樻湭閫夋嫨' : this.$t('QC_TakeSampleCheckBill.noChecker')
})
}
if (this.hform.HSourceID == 0) {
return uni.showToast({
icon: 'none',
- title: '鐢熶骇璧勬簮鏈�夋嫨'
+ title: this.$t('QC_TakeSampleCheckBill.noSource') == 'QC_TakeSampleCheckBill.noSource' ? '鐢熶骇璧勬簮鏈�夋嫨' : this.$t('QC_TakeSampleCheckBill.noSource')
})
}
@@ -731,8 +736,8 @@
} = res.data
if (count == 1) {
uni.showModal({
- title: '鎻愮ず',
- content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵',
+ title: this.$t('QC_TakeSampleCheckBill.confirmTitle') == 'QC_TakeSampleCheckBill.confirmTitle' ? '鎻愮ず' : this.$t('QC_TakeSampleCheckBill.confirmTitle'),
+ content: res.data.Message + (this.$t('QC_TakeSampleCheckBill.continueAdd') == 'QC_TakeSampleCheckBill.continueAdd' ? '銆傛槸鍚︾户缁柊澧烇紵' : this.$t('QC_TakeSampleCheckBill.continueAdd')),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -769,6 +774,7 @@
</script>
<style lang="scss" scoped>
+ /* 鏍峰紡淇濇寔涓嶅彉 */
.scroll-content {
box-sizing: border-box;
padding: 20rpx;
diff --git a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
index 02f0833..9f94805 100644
--- a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
+++ b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
@@ -41,7 +41,8 @@
</view>
<view class="card-item-wrapper">
<view v-for="(item, index) in materialManifest" :key="index">
- <uni-card :title="item.HSourceBillNo" @tap="toDetail(item, index)">
+ <uni-card :title="item.HSourceBillNo" :extra="item.F_WPVT_Text_tzk ? '璁㈠崟鍙凤細' + item.F_WPVT_Text_tzk : ''"
+ @tap="toDetail(item, index)">
<view class="card-detail">
<view class="detail">
<text>鐗╂枡浠ｇ爜锛�</text>{{item.HMaterNumber}}
@@ -328,6 +329,7 @@
detailManifestItem: {
"HMaterNumber": "",
"HMaterID": "",
+ "F_WPVT_Text_tzk": "",
"HMaterName": "",
"HMaterModel": "",
"HUnitName": "",
@@ -547,6 +549,7 @@
HSPID: data[0].HSPID,
HSupID: data[0].HSupID,
HMaterID: data[0].HMaterID,
+ F_WPVT_Text_tzk: data[0].F_WPVT_Text_tzk,
HSourceBillType: data[0].HSourceBillType,
HSLInterID: data[0].HSLInterID,
HSLEntryID: data[0].HSLEntryID,
@@ -642,6 +645,7 @@
"HSupID": this.detailManifestItem.HSupID || 0,
"HKeeperID": this.detailManifestItem.HKeeperID || 0,
"HMaterID": this.detailManifestItem.HMaterID,
+ "F_WPVT_Text_tzk": this.detailManifestItem.F_WPVT_Text_tzk,
"HSourceBillType": this.detailManifestItem.HSourceBillType,
"HSLInterID": this.detailManifestItem.HSLInterID,
"HSLEntryID": this.detailManifestItem.HSLEntryID,
@@ -659,7 +663,7 @@
} = res.data
if (count == 1) {
CommonUtils.showTips({
- message: `涓婁紶鎴愬姛`
+ message: '涓婁紶鎴愬姛'
})
this.attachmentInfo = []
// 鍒锋柊鍗曟嵁鍙凤紝闃叉鍗曟嵁鍙烽噸澶�
@@ -667,7 +671,7 @@
} else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
- message: `涓婁紶澶辫触: ${Message}`
+ message: '涓婁紶澶辫触: ${Message}'
})
}
diff --git a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue
index c9dbf23..1f4ac04 100644
--- a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue
+++ b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue
@@ -50,7 +50,7 @@
</view>
<view class="card-item-wrapper">
<view v-for="(item, index) in materialManifest" :key="index">
- <uni-card :class="item.selected?'card-selected':''" :title="item.HSourceBillNo"
+ <uni-card :class="item.selected?'card-selected':''" :title="item.HSourceBillNo" :extra="item.F_WPVT_Text_tzk ? '璁㈠崟鍙凤細' + item.F_WPVT_Text_tzk : ''"
@tap="selectMater(item, index)">
<view class="card-detail">
<view class="detail">
@@ -244,6 +244,7 @@
detailManifest: [],
detailManifestItem: {
"HMaterNumber": "",
+ "F_WPVT_Text_tzk": "",
"HMaterID": "",
"HMaterName": "",
"HMaterModel": "",
@@ -475,6 +476,7 @@
HSPID: data[0].HSPID,
HSupID: data[0].HSupID,
HMaterID: data[0].HMaterID,
+ F_WPVT_Text_tzk: data[0].F_WPVT_Text_tzk,
HSourceBillType: data[0].HSourceBillType,
HSLInterID: data[0].HSLInterID,
HSLEntryID: data[0].HSLEntryID,
diff --git a/pages/gongxuOut/Cj_StationOutBill_Standard.vue b/pages/gongxuOut/Cj_StationOutBill_Standard.vue
index e309252..b206c3d 100644
--- a/pages/gongxuOut/Cj_StationOutBill_Standard.vue
+++ b/pages/gongxuOut/Cj_StationOutBill_Standard.vue
@@ -484,6 +484,7 @@
</view> -->
<view class="bottom-btn">
+ <button v-if="hform.HIsTimeFlag==0" class="btn-a" size="mini" @tap="beginWork()">寮�宸�</button>
<button v-if="btnType == 0 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
<button v-if="btnType != 0 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button>
<button v-if="btnType != 0 && isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
@@ -706,12 +707,7 @@
}) {
console.log(detail.value[0])
this.hform.HIsTimeFlag = detail.value[0] || 0
- if(detail.value[0]){
- this.getNewHRelBeginDate()
- this.hform.HRelEndTime = getDateTime.dateTimeStr('y-m-d h:i');
- }else{
- this.hform.HWorkTimes = 0;
- }
+
},
//閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
getDefValByUser() {
@@ -1210,6 +1206,10 @@
}else{
//璁剧疆涓诲簭鍒�
this.setMainHSEQ();
+ //璁剧疆榛樿宸ュ簭鍙�
+ if(this.hform.HProcNo!=""&&this.hform.HProcNo!=null){
+ this.getHProcNoData2(this.hform.HBarCode,this.hform.HProcNo,this.hform.HSEQNumber)
+ }
}
} else {
uni.showToast({
@@ -1334,9 +1334,9 @@
if(CommonUtils.isEmpty(this.hform.HQty) == true){
return {pass: false, message: '鎻愪氦澶辫触: 鎶ュ簾鏁伴噺涓虹┖'}
}
- if(this.hform.HIsTimeFlag == 1 && CommonUtils.isEmpty(this.hform.HWorkTimes, true, true)) {
- return {pass: false, message: '鎻愪氦澶辫触: 寮�鍚鏃讹紝浣嗗伐鏃朵负0鎴栫┖'}
- }
+ // if(this.hform.HIsTimeFlag == 1 && CommonUtils.isEmpty(this.hform.HWorkTimes, true, true)) {
+ // return {pass: false, message: '鎻愪氦澶辫触: 寮�鍚鏃讹紝浣嗗伐鏃朵负0鎴栫┖'}
+ // }
return {pass: true, message: ''}
},
//缂栬緫
@@ -1479,7 +1479,10 @@
} else if (barNo1 == 'GXLX' && data.宸ュ簭鍙�) {
this.hform.HProcNo = data.宸ュ簭鍙�
}
- }
+ //瑙嗗浘鑾峰彇褰撳墠鏈�鏂扮殑宸ュ簭鍙�
+ }else if(data.宸ュ簭姹囨姤褰撳墠宸ュ簭鍙�!=null && data.宸ュ簭姹囨姤褰撳墠宸ュ簭鍙�!=""){
+ this.hform.HProcNo = data.宸ュ簭姹囨姤褰撳墠宸ュ簭鍙�
+ }
this.hform.HICMOInterID = data.hicmointerid
this.hform.HICMOBillNo = data.浠诲姟鍗曞彿
this.hform.HMaterID = data.HMaterID
@@ -1588,10 +1591,7 @@
this.hform.HNotReportQty = data['鏈姤宸ユ暟閲�']
this.hform.HProcNumber = data['宸ュ簭浠ｇ爜']
this.hform.HIsTimeFlag = data['鏄惁璁℃椂'] ? 1 : 0
- if(data['鏄惁璁℃椂']){
- this.hform.HRelEndTime = getDateTime.dateTimeStr('y-m-d h:i');
- this.getNewHRelBeginDate();
- }
+
this.hform.HSEQName = data.搴忓垪鍚嶇О
// this.hform.HStyleNumber = data['娆惧彿']
// this.hform.HQty = data.鍚堟牸鏁伴噺
@@ -1618,59 +1618,59 @@
});
},
//鑾峰彇鏈�鏂扮殑鎶ュ伐鏃ユ湡
- getNewHRelBeginDate(){
- uni.request({
- url: this.serverUrl + '/Cj_StationOutBill/get_Display',
- data:{
- sWhere: ` and HEmpID = N'${this.hform.HEmpID}'`,
- user: uni.getStorageSync('HUserName'),
- HBillSubType:'',
- },
- success: (res) => {
- if(res.data.count == 1){
- //鑾峰彇鍒楄〃鏁版嵁
- const listData = res.data.data
- // 鑾峰彇褰撳墠鏃ユ湡锛堝幓鎺夋椂闂撮儴鍒嗭級
- const today = new Date();
- today.setHours(0, 0, 0, 0);
- if(listData.length==0){
- this.hform.HRelBeginTime = getDateTime.dateTimeSetHoureStr(7, 40, 0, 0,'y-m-d h:i');
- this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime);
- }else{
- // 浠庡璞℃暟缁勪腑鎻愬彇鎵�鏈夋棩鏈熷瓧娈靛苟鎵惧埌鏈�澶у��
- const maxDate = listData.reduce((max, obj) => {
- const date = new Date(obj.鍑虹珯鏃堕棿);
- return date > max ? date : max;
- }, new Date(0)); // 鍒濆鍊间负鏈�灏忔棩鏈�
- // 姣旇緝鏈�澶ф棩鏈熷拰浠婂ぉ鐨勬棩鏈熼儴鍒嗭紙涓嶆瘮杈冩椂闂达級
- const maxDateDateOnly = new Date(maxDate);
- maxDateDateOnly.setHours(0, 0, 0, 0);
- // 姣旇緝鏈�澶ф棩鏈熷拰浠婂ぉ
- if (maxDateDateOnly.getTime() !== today.getTime()) {
- // 濡傛灉涓嶆槸浠婂ぉ锛岃繑鍥炲綋鍓嶆棩鏈�
- this.hform.HRelBeginTime = getDateTime.dateTimeSetHoureStr(7, 40, 0, 0,'y-m-d h:i');
- this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime);
- }else{
- this.hform.HRelBeginTime = getDateTime.formatDate(maxDate);
- this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime);
- }
- }
- }else{
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- },
+ // getNewHRelBeginDate(){
+ // uni.request({
+ // url: this.serverUrl + '/Cj_StationOutBill/get_Display',
+ // data:{
+ // sWhere: ` and HEmpID = N'${this.hform.HEmpID}'`,
+ // user: uni.getStorageSync('HUserName'),
+ // HBillSubType:'',
+ // },
+ // success: (res) => {
+ // if(res.data.count == 1){
+ // //鑾峰彇鍒楄〃鏁版嵁
+ // const listData = res.data.data
+ // // 鑾峰彇褰撳墠鏃ユ湡锛堝幓鎺夋椂闂撮儴鍒嗭級
+ // const today = new Date();
+ // today.setHours(0, 0, 0, 0);
+ // if(listData.length==0){
+ // this.hform.HRelBeginTime = getDateTime.dateTimeSetHoureStr(7, 40, 0, 0,'y-m-d h:i');
+ // this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime);
+ // }else{
+ // // 浠庡璞℃暟缁勪腑鎻愬彇鎵�鏈夋棩鏈熷瓧娈靛苟鎵惧埌鏈�澶у��
+ // const maxDate = listData.reduce((max, obj) => {
+ // const date = new Date(obj.鍑虹珯鏃堕棿);
+ // return date > max ? date : max;
+ // }, new Date(0)); // 鍒濆鍊间负鏈�灏忔棩鏈�
+ // // 姣旇緝鏈�澶ф棩鏈熷拰浠婂ぉ鐨勬棩鏈熼儴鍒嗭紙涓嶆瘮杈冩椂闂达級
+ // const maxDateDateOnly = new Date(maxDate);
+ // maxDateDateOnly.setHours(0, 0, 0, 0);
+ // // 姣旇緝鏈�澶ф棩鏈熷拰浠婂ぉ
+ // if (maxDateDateOnly.getTime() !== today.getTime()) {
+ // // 濡傛灉涓嶆槸浠婂ぉ锛岃繑鍥炲綋鍓嶆棩鏈�
+ // this.hform.HRelBeginTime = getDateTime.dateTimeSetHoureStr(7, 40, 0, 0,'y-m-d h:i');
+ // this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime);
+ // }else{
+ // this.hform.HRelBeginTime = getDateTime.formatDate(maxDate);
+ // this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime);
+ // }
+ // }
+ // }else{
+ // uni.showToast({
+ // title:res.data.Message,
+ // icon:'none'
+ // })
+ // }
+ // },
+ // fail: (res) => {
+ // console.log(res);
+ // uni.showToast({
+ // title:'鎺ュ彛璇锋眰澶辫触',
+ // icon:'none'
+ // })
+ // },
+ // });
+ // },
//鏂板
getNewData() {
@@ -1933,6 +1933,44 @@
}
});
},
+ //寮�宸ユ寜閽�
+ beginWork(){
+ if(this.hform.lngBillKey==''||this.hform.lngBillKey==0||this.hform.lngBillSubKey==''||this.hform.lngBillSubKey==0){
+
+ CommonUtils.showTips({
+ title: "寮�宸ュけ璐�",
+ message: `寮�宸ュけ璐ヨ鎵弿娴佽浆鍗″苟閫夋嫨宸ュ簭`,
+ });
+ return ;
+ }
+ uni.request({
+ url: this.serverUrl + '/Cj_StationOutBill/startTranslating',
+ method: 'GET',
+ data: {
+ HProcExchInterID: this.hform.lngBillKey,
+ HProcExchEntryID:this.hform.lngBillSubKey,
+ HOrgID:this.hform.HPRDOrgID,
+ HProcNo:this.hform.HProcNo,
+ user:uni.getStorageSync('HUserName')
+ },
+ success: (res) => {
+ uni.hideLoading();
+ if (res.data.count == 1) {
+ uni.showToast({ title: '寮�宸ユ垚鍔�', icon: 'none' });
+
+ } else {
+ CommonUtils.showTips({
+ title: "寮�宸ュけ璐�",
+ message: `${res.data.Message}`,
+ });
+ }
+ },
+ fail: () => {
+ uni.hideLoading();
+ uni.showToast({ title: '鎺ュ彛璇锋眰澶辫触', icon: 'none' });
+ },
+ });
+ }
}
}
</script>
diff --git a/pages/index/login.vue b/pages/index/login.vue
index ed44f07..be55746 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -114,7 +114,7 @@
"闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.88.82:81/API/',
"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
"浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
- "鏉ㄦ潈閼湰鍦版祴璇�": 'http://172.20.10.2:8082/API/',
+ "鏉ㄦ潈閼湰鍦版祴璇�": 'http://192.168.0.81:8082/API/',
"鐜嬩华鏈湴娴嬭瘯": 'http://192.168.0.74:8080/API/',
// 灏忓崼鍐呭缃�
"鑻忓窞鍗櫤绉戞妧-澶栫綉": 'http://221.224.60.42:8082/API_WW/',
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index 1422ebc..cdb1e12 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -630,6 +630,13 @@
"id": 55,
"hidden": false
},
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "涓嶈壇鍝佽瘎瀹＄敵璇峰崟鍒楄〃",
+ "url": "/pages/ZLGL/QCNoPassProdRequestBillMain/QCNoPassProdRequestBillMainList",
+ "id": 55,
+ "hidden": false
+ },
]
}
},
diff --git a/pages/index/tab4.vue b/pages/index/tab4.vue
index c15459d..4ca9ae6 100644
--- a/pages/index/tab4.vue
+++ b/pages/index/tab4.vue
@@ -212,6 +212,13 @@
"id": 55,
"hidden": false
},
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "涓嶈壇鍝佽瘎瀹＄敵璇峰崟",
+ "url": "/pages/ZLGL/QCNoPassProdRequestBillMain/QCNoPassProdRequestBillMain",
+ "id": 55,
+ "hidden": false
+ },
{
"img": "../../static/icon/icon15.png",
"text": "鎶曟枡闃查敊",
diff --git a/pages/tiaomamingxi/tiaomamingxi.vue b/pages/tiaomamingxi/tiaomamingxi.vue
new file mode 100644
index 0000000..b77fd2b
--- /dev/null
+++ b/pages/tiaomamingxi/tiaomamingxi.vue
@@ -0,0 +1,509 @@
+<template>
+ <view class="page" id="pageContent">
+<!-- <view class="search-condition-zone">
+ <view class="form-item">
+ <view class="left">
+ 鏉＄爜:
+ </view>
+ <view class="right general">
+ <input type="text" v-model="hform.HBarCode" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">
+ 鏁伴噺:
+ </view>
+ <view class="right general">
+ <input type="text" v-model="hform.iQty" />
+ </view>
+ </view>
+ </view> -->
+<!-- <view class="button-zone">
+ <button type="default" class="btn-a" size="mini" @tap="cmdChange">璋冩暣</button>
+ <button type="default" class="btn-c" size="mini" @tap="exit">閫�鍑�</button>
+ </view> -->
+ <view class="info-list-zone" id="scroll-content" :style="{height: scrollContentHeight + 'px'}">
+ <view class="list" v-for="(item, index) in Materlist" :key="index">
+ <uni-card :title="item.HBarCode" style="margin: 10px;" @tap="delMater(item)">
+ <view class="card-detail">
+ <view class="detail">
+ <text>{{ $t("Kf_ProductInBill_PDA.table_SourceBillNo") == "Kf_ProductInBill_PDA.table_SourceBillNo" ? "鎵规" : $t("Kf_ProductInBill_PDA.table_SourceBillNo") }}锛�</text>{{ item.HBatchNo }}
+ </view>
+ <view class="detail">
+ <text>{{ $t("Kf_ProductInBill_PDA.table_SourceBillNo") == "Kf_ProductInBill_PDA.table_SourceBillNo" ? "鏁伴噺" : $t("Kf_ProductInBill_PDA.table_SourceBillNo") }}锛�</text>{{ item.HQty }}
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ </view>
+ <view class="pagination-zone" id="pagination-zone">
+ <uni-pagination show-icon :page-size="paginationMeta.pageSize" :total="paginationMeta.total"
+ :current="paginationMeta.current" @change="onPaginationChangeHandler"></uni-pagination>
+ </view>
+ </view>
+</template>
+
+<script>
+ import {
+ CommonUtils
+ } from '../../utils/common'
+ import {
+ getUserInfo
+ } from '../../utils/auth'
+ export default {
+ data() {
+ return {
+ navHeight: 0,
+ HWHNameList: [],
+ arrayHWHName: [],
+ HStockPlaceNameList: [],
+ arrayHStockPlaceName: [],
+ Materlist: [],
+ HMaterID: 0,
+ HBillType: 0,
+ HInterID: 0,
+ HIsStockMgr: false,
+ scrollTop: 0,
+
+ HInterID_check: 0,
+ HBillType_check: '',
+ sBatchNo_check: '',
+ sBarCode_check: '',
+ sSCWhID_check: 0,
+ sSCSPID_check: 0,
+ sAuxPropID_check: 0,
+ sMTONo_check: '',
+ HMaterID_check: 0,
+ sWhID_check: 0,
+ sSPID_check: 0,
+ HSourceInterID_check: 0,
+ HSourceEntryID_check: 0,
+ EndQty_check: 0,
+ HInterID_check_check: 0,
+ hform: {
+ HBarCode: '',
+ HWHName: '',
+ HWHID: 0,
+ HStockPlaceName: '',
+ HStockPlaceID: 0,
+ iQty: 0,
+ },
+
+ paginationMeta: {
+ current: 1,
+ total: 0,
+ pageSize: 30,
+ },
+
+ pageMeta: {
+ scrollContentTop: 0,
+ bottomBtnTop: 0,
+ },
+
+ listData: [],
+ listDataShow: [],
+ }
+ },
+ computed: {
+ scrollContentHeight: {
+ get() {
+ return this.pageMeta.bottomBtnTop - this.pageMeta.scrollContentTop
+ }
+ }
+ },
+ methods: {
+ exit() {
+ uni.navigateBack()
+ },
+ onArrayHWHNameChangeHandler(e) {
+ let index = this.HWHNameList.findIndex(p => p.HName == e)
+ if (index != -1) {
+ this.hform.HWHID = this.HWHNameList[index].HItemID
+ this.HIsStockMgr = this.HWHNameList[index].HIsStockMgr
+ }
+ },
+ getWHInfo() {
+ CommonUtils.doRequest(
+ "/Web/GetWarehouseList_Json_New", {
+ Warehouse: "",
+ HOrgID: uni.getStorageSync('OrganizationID')
+ },
+ (res) => {
+ let res1 = res.data
+ let {
+ data,
+ count
+ } = res1
+ if (count == 1) {
+ this.HWHNameList = data
+ for (var i = 0; i < data.length; i++) {
+ this.arrayHWHName[i] = data[i]["HName"]
+ }
+ } else {
+ uni.showToast({
+ title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ )
+ },
+ delMater(item){
+ console.log(this.HBillType, this.HInterID, item.HBarCode);
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄� "' + item.HBarCode + '" 鍚楋紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+ success: (res) => {
+ if (res.confirm) {
+ try {
+ CommonUtils.doRequest2({
+ url: '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
+ data: {
+ HInterID: this.HInterID,
+ HBillType: this.HBillType,
+ HBarCode: item.HBarCode
+ },
+ resFunction: () => {
+ console.log("鍒犻櫎鎴愬姛锛屽紑濮嬪埛鏂�")
+ uni.$emit('refreshList')
+ this.GetMater();
+ uni.showToast({
+ title: '鍒犻櫎鎴愬姛',
+ icon: 'success'
+ })
+ }
+ });
+ } catch (e) {
+ console.log("鍒犻櫎寮傚父", e);
+ }
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鍙栨秷鍒犻櫎');
+ }
+ }
+ });
+ },
+ GetMater(){
+ CommonUtils.doRequest2({
+ url: '/Kf_BarCodeEditDlg/Kf_BarCodeEditDlg_Json',
+ data: {
+ swhere: ' and HInterID= ' + this.HInterID + ' and HMaterID= '+ this.HMaterID + ''
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count > 0) {
+ this.Materlist = data
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ });
+ },
+ onArrayHStockPlaceNameChangeHandler() {
+ let index = this.HStockPlaceNameList.findIndex(p => p.HName == e)
+ if (index != -1) {
+ this.hform.HStockPlaceID = this.HStockPlaceNameList[index].HItemID
+ }
+ },
+ getStockPlaceInfo() {
+ CommonUtils.doRequest(
+ "/WEBSController/GetStockPlaceList_Json", {
+ StockPlace: '',
+ HWhID: this.hform.HWHID,
+ HStockOrgID: uni.getStorageSync('OrganizationID')
+ },
+ (res) => {
+ let res1 = res.data
+ console.log(res1)
+ let {
+ data,
+ count
+ } = res1
+ if (count == 1) {
+ this.HStockPlaceNameList = data
+ for (var i = 0; i < data.length; i++) {
+ this.arrayHStockPlaceName[i] = data[i]["HWhName"]
+ }
+ } else {
+ uni.showToast({
+ title: '浠撲綅鏁版嵁璇锋眰澶辫触'+res.Message,
+ icon: 'none'
+ })
+ }
+ },
+ )
+ },
+ cmdChange() {
+ CommonUtils.doRequest2({
+ url: '/Kf_BarCodeEditDlg/Kf_BarCodeEditDlg_Json',
+ data: {
+ swhere: ' and HInterID= ' + this.HInterID + ' and HMaterID= '+ this.HMaterID + " and HBarCode= '" + this.hform.HBarCode + "'"
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count > 0) {
+ console.log(data)
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佷慨鏀� "' + data[0].HBarCode + '" 鍚楋紵',
+ success: (res) => {
+ if (res.confirm) {
+ try {
+ CommonUtils.doRequest2({
+ url: '/Kf_BarCodeEditDlg/GetCheckQtyByBarCodeBill',
+ data: {
+ HInterID: data[0].HInterID,
+ HBillType: data[0].HBillType,
+ sBatchNo: data[0].HBatchNo,
+ sBarCode: data[0].HBarCode,
+ sSCSPID: data[0].HOutStockPlaceID,
+ sSCWhID: data[0].HSCWHID,
+ sAuxPropID: data[0].HAuxPropID,
+ sMTONo: data[0].HMTONo,
+ iQty: this.hform.iQty,
+ HMaterID: data[0].HMaterID,
+ sWhID: data[0].HWhID,
+ sSPID: data[0].HStockPlaceID,
+ HSourceInterID: data[0].HSourceInterID,
+ HSourceEntryID: data[0].HSourceEntryID,
+ EndQty: this.hform.iQty - data[0].HQty,
+ sQty: data[0].HQty
+ },
+ resFunction: () => {
+ console.log("淇敼鎴愬姛锛屽紑濮嬪埛鏂�")
+ uni.$emit('refreshList')
+ this.GetMater();
+ uni.showToast({
+ title: '淇敼鎴愬姛',
+ icon: 'success'
+ })
+ try {
+ CommonUtils.doRequest2({
+ url: '/Kf_BarCodeEditDlg/GetCheckQtyByBarCodeBill',
+ data: {
+ HInterID: data[0].HInterID,
+ HBillType: data[0].HBillType,
+ sBatchNo: data[0].HBatchNo,
+ sBarCode: data[0].HBarCode,
+ sSCSPID: data[0].HOutStockPlaceID,
+ sSCWhID: data[0].HSCWHID,
+ sAuxPropID: data[0].HAuxPropID,
+ sMTONo: data[0].HMTONo,
+ iQty: this.hform.iQty,
+ HMaterID: data[0].HMaterID,
+ sWhID: data[0].HWhID,
+ sSPID: data[0].HStockPlaceID,
+ HSourceInterID: data[0].HSourceInterID,
+ HSourceEntryID: data[0].HSourceEntryID,
+ EndQty: this.hform.iQty - data[0].HQty,
+ sQty: data[0].HQty
+ },
+ resFunction: () => {
+ console.log("淇敼鎴愬姛锛屽紑濮嬪埛鏂�")
+ uni.$emit('refreshList')
+ this.GetMater();
+ uni.showToast({
+ title: '淇敼鎴愬姛',
+ icon: 'success'
+ })
+ }
+ });
+ } catch (e) {
+ console.log("淇敼寮傚父", e);
+ }
+ }
+ });
+ } catch (e) {
+ console.log("淇敼寮傚父", e);
+ }
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鍙栨秷淇敼');
+ }
+ }
+ });
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ });
+ },
+ async onPaginationChangeHandler({current}) {
+ this.listDataShow =this.listData.slice((current - 1) * this.paginationMeta.pageSize,current * this.paginationMeta.pageSize)
+ }
+ },
+ async onLoad(options) {
+ this.hform.HBarCode = options.HMaterNumber || '';
+ this.getWHInfo()
+ this.getStockPlaceInfo()
+ this.HMaterID = options.HMaterID
+ this.HBillType = options.HBillType
+ this.HInterID = options.HInterID
+ console.log("璧嬪�煎悗锛�", this.HInterID, this.HMaterID, this.HBillType);
+ await this.$nextTick();
+ this.GetMater()
+ this.$nextTick(() => {
+ this.cmdSearch()
+ })
+ },
+ onReady() {
+ let query = uni.createSelectorQuery().in(this)
+ query.select("#scroll-content").boundingClientRect((data) => {
+ this.pageMeta.scrollContentTop = data.top
+ console.log("this.pageMeta.scrollContentTop: ", this.pageMeta.scrollContentTop)
+ }).exec()
+ query.select("#pagination-zone").boundingClientRect((data) => {
+ this.pageMeta.bottomBtnTop = data.top
+ console.log('this.pageMeta.bottomBtnTop: ',this.pageMeta.bottomBtnTop);
+ }).exec()
+ },
+ }
+</script>
+
+<style lang="scss" scoped>
+ .page {
+ box-sizing: border-box;
+ display: flex;
+ flex-direction: column;
+ gap: 10rpx;
+ padding: 20rpx 0;
+ position: relative;
+
+ .button-zone {
+ height: auto;
+ box-sizing: border-box;
+ padding-top: 20rpx;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ flex-wrap: wrap;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+
+ .btn-a {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #ff5722;
+ color: #fff;
+ }
+ }
+
+ .search-condition-zone {
+ height: auto;
+ box-sizing: border-box;
+ padding: 0 60rpx;
+ display: flex;
+ flex-direction: column;
+ gap: 20rpx;
+
+ .form-item {
+ display: flex;
+ flex-direction: row;
+ gap: 20rpx;
+ align-items: center;
+ font-size: 28rpx;
+
+ .left {
+ width: 4rem;
+ }
+
+ .right {
+ flex: 1;
+ padding: 8rpx 16rpx;
+
+ .search {
+ width: 28rpx;
+ height: 28rpx;
+ }
+
+ input {
+ font-size: 28rpx;
+ }
+
+ .uni-combox {
+ padding: 0;
+ margin: 0;
+
+ ::v-deep .uni-combox__input {
+ font-size: 28rpx;
+ height: auto;
+ }
+ }
+ }
+
+ .general {
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ }
+
+ .disabled {
+ border-radius: 22rpx;
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+ }
+ }
+
+ .info-list-zone {
+ overflow-y: auto;
+
+ .card-item {
+ .card-detail {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ line-height: 120%;
+
+ .detail {
+ // width: 50%;
+ font-size: 26rpx;
+ margin-bottom: 12rpx;
+ color: #555;
+ margin-right: 20rpx;
+
+ text {
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
+ }
+ }
+ }
+
+ .pagination-zone {
+ position: fixed;
+ bottom: 0;
+ box-sizing: border-box;
+ background-color: #fff;
+ box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+ padding: 30rpx 40rpx 40rpx 40rpx;
+ display: flex;
+ flex-direction: column;
+ gap: 20rpx;
+ justify-content: space-between;
+ width: 100%;
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/pages/weiwaigxIn/Cj_StationEntrustInBill.vue b/pages/weiwaigxIn/Cj_StationEntrustInBill.vue
index 21948c6..0736810 100644
--- a/pages/weiwaigxIn/Cj_StationEntrustInBill.vue
+++ b/pages/weiwaigxIn/Cj_StationEntrustInBill.vue
@@ -18,7 +18,7 @@
<view class="form-item">
<view class="title"><text>*</text>娴佹按鍙�:</view>
<view class="right" style="width: 380rpx;">
- <input v-model="hform.HProcNo" placeholder="璇疯緭鍏�(鎴栨壂鎻�)娴佹按鍙�" @blur="getHProcNoData2(hform.HBarCode,hform.HProcNo,hform.HSEQNumber)"/>
+ <input v-model="hform.HProcNo" placeholder="璇疯緭鍏�(鎴栨壂鎻�)娴佹按鍙�" @confirm="getHProcNoData2(hform.HBarCode,hform.HProcNo,hform.HSEQNumber)"/>
</view>
<view class="icon-wrapper" >
<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
@@ -724,6 +724,7 @@
this.arrayHSEQName[i] = res.data.data[i].HSEQName
}
this.$forceUpdate();
+ console.log(this.hform.HProcNo)
//娌℃湁搴忓垪鍙烽粯璁や富搴忓垪
if(e==1){
//璁剧疆涓诲簭鍒�
@@ -734,6 +735,10 @@
}else{
//璁剧疆涓诲簭鍒�
this.setMainHSEQ();
+ //璁剧疆榛樿宸ュ簭鍙�
+ if(this.hform.HProcNo!=""&&this.hform.HProcNo!=null){
+ this.getHProcNoData2(this.hform.HBarCode,this.hform.HProcNo,this.hform.HSEQNumber)
+ }
}
} else {
uni.showToast({
@@ -880,6 +885,9 @@
console.log(2,res.data);
if(res.data.code == 1){
var data = res.data.data[0]
+ if(data.濮斿鍙戝嚭褰撳墠宸ュ簭鍙�!=null && data.濮斿鍙戝嚭褰撳墠宸ュ簭鍙�!=""){
+ this.hform.HProcNo = data.濮斿鍙戝嚭褰撳墠宸ュ簭鍙�
+ }
this.hform.HICMOBillNo= data.浠诲姟鍗曞彿
this.hform.HProcExchBillNo= data.鍗曟嵁鍙�
this.hform.HICMOInterID= data.hicmointerid
diff --git a/pages/weiwaigxOut/Cj_StationEntrustOutBill.vue b/pages/weiwaigxOut/Cj_StationEntrustOutBill.vue
index 5567433..5f2bf47 100644
--- a/pages/weiwaigxOut/Cj_StationEntrustOutBill.vue
+++ b/pages/weiwaigxOut/Cj_StationEntrustOutBill.vue
@@ -907,6 +907,10 @@
}else{
//璁剧疆涓诲簭鍒�
this.setMainHSEQ();
+ //璁剧疆榛樿宸ュ簭鍙�
+ if(this.hform.HProcNo!=""&&this.hform.HProcNo!=null){
+ this.getHProcNoData2(this.hform.HBarCode,this.hform.HProcNo,this.hform.HSEQNumber)
+ }
}
this.$forceUpdate();
} else {
@@ -1057,6 +1061,9 @@
console.log(2, res.data);
if (res.data.code == 1) {
var data = res.data.data[0]
+ if(data.濮斿鎺ユ敹褰撳墠宸ュ簭鍙�!=null && data.濮斿鎺ユ敹褰撳墠宸ュ簭鍙�!=""){
+ this.hform.HProcNo = data.濮斿鎺ユ敹褰撳墠宸ュ簭鍙�
+ }
this.hform.HICMOBillNo = data.浠诲姟鍗曞彿
this.hform.HICMOInterID = data.hicmointerid
this.hform.HMaterID = data.HMaterID
--
Gitblit v1.9.1