From f1f7ab81a834bde5fa6d9c848b9cf443b7de65fb Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 13 三月 2026 09:54:38 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/xiaoshouchukujiaoyan/SellOutCheckBillList.vue | 92
pages/tiaomachaima/tiaomachaima.vue | 82
pages/huanyangdan/BackSampleCheckBill.vue | 817 +++
pages/index/tab1.vue | 50
pages/caigouruku/POStockInBill.vue | 190
pages/quyangdan/TakeSampleCheckBillList.vue | 594 ++
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue | 27
pages/weixiujilu/mouldRepairRecordBill.vue | 1348 ++++++
pages/caigoutuiliao/POStockInBackBill.vue | 186
pages/xiaoshouchuku/SellOutBillList.vue | 79
pages/quyangdan/TakeSampleCheckBill.vue | 830 +++
pages/weixiujilu/mouldRepairRecordBillList.vue | 587 ++
main.js | 2
pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue | 13
pages/index/login.vue | 254
pages/ZLGL/shoujianjianyan/firstCheckBill.vue | 34
pages/index/index.vue | 10
pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList.vue | 19
pages/shengchantuiliao/MateOutBackBill.vue | 137
pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue | 2
pages/baogong/OA_ErrMsgBackBill.vue | 2295 +++++-----
pages/zhijiediaobo/MoveStockBillList.vue | 91
pages/xiaoshouchuku/SellOutBill.vue | 212
pages/qitaruku_v2/OtherInBill.vue | 18
utils/i18n.js | 25
components/ZWDB/Hfooter.vue | 13
pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue | 5
pages/shengchanrukushengdan/Kf_ProductInBill.vue | 13
pages/huanyangdan/BackSampleCheckBillList.vue | 584 ++
pages/caigoutuiliao/POStockInBackBillList.vue | 81
pages/shengchantuiliao/MateOutBackBillList.vue | 85
pages/MJGL/Sc_OEEStatusReport/Sc_OEEStatusReport.vue | 4
pages/qijvguzhangdengji/mouldMistake.vue | 595 ++
pages/ziwodaiban/todoMain.vue | 6
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue | 20
pages/index/tab3.vue | 20
pages/zhijiediaobo/MoveStockBill.vue | 201
pages/baogong/DayPlanBillList.vue | 112
pages/qitachuku_v2/OtherOutBill.vue | 213
pages/tiaomachaima/tiaomachaima2.vue | 154
pages/qijvguzhangdengji/mouldMistakeBill.vue | 1129 +++++
pages/MJGL/xiamodan/MouldLowerBill.vue | 1382 +++---
pages/xiaoshoutuihuo/ICStockBillMainList.vue | 100
43 files changed, 9,945 insertions(+), 2,766 deletions(-)
diff --git a/components/ZWDB/Hfooter.vue b/components/ZWDB/Hfooter.vue
index 1070682..1037170 100644
--- a/components/ZWDB/Hfooter.vue
+++ b/components/ZWDB/Hfooter.vue
@@ -33,10 +33,15 @@
methods: {
clearAllobj()
{
- if(confirm("纭畾瑕佹竻闄ゅ凡瀹屾垚鐨勪簨椤瑰悧锛�"))
- {
- this.$emit("clearAll");
- }
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭畾瑕佹竻闄ゅ凡瀹屾垚鐨勪簨椤瑰悧锛�',
+ success: (res) => {
+ if (res.confirm) {
+ this.$emit("clearAll");
+ }
+ }
+ });
}
}
}
diff --git a/main.js b/main.js
index eaccbc7..d5b866c 100644
--- a/main.js
+++ b/main.js
@@ -54,7 +54,7 @@
// 璋冪敤鍘熷 $t 鎵ц缈昏瘧
const translated = originalT.call(this, key, args);
- // console.log(i18n.getLocaleMessage(i18n.locale))
+
if (translated == key) {
// 缈昏瘧鍚庣殑鏂囨湰涓庝紶鍏ョ殑key鐩稿悓锛屽垯琛ㄧず缈昏瘧鏂囨湰缂哄け 璁板綍缂哄け鐨勭炕璇戞枃鏈�
let [moduleName, fieldCode] = key.split(".")
diff --git a/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue b/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
index 39ec9a8..8cf5531 100644
--- a/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
+++ b/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
@@ -108,6 +108,12 @@
<input v-model="hform.HEquipName" disabled />
</view>
</view>
+ <view class="form-item">
+ <view class="title">妯″叿:</view>
+ <view class="righton">
+ <input v-model="hform.HMouldName" disabled />
+ </view>
+ </view>
</view>
</template>
<!-- 鍏朵粬淇℃伅 -->
@@ -412,7 +418,9 @@
"HUpDater": "",
"HDeleteMan": "",
"HUpDateDate": "",
- "HDeleteDate": ""
+ "HDeleteDate": "",
+ "HMouldName": "",
+ "HMouldID": 0,
}
};
},
@@ -1003,6 +1011,9 @@
"HMainSourceEntryID": data[0].HEntryID,
"HMainSourceBillNo": data[0].鍗曟嵁鍙�,
"HMainSourceBillType": data[0].鍗曟嵁绫诲瀷,
+
+ "HMouldName": data[0].妯″叿鍚嶇О,
+ "HMouldID": data[0].HMouldID
})
this.HTechParams = data.map(item => {
diff --git a/pages/MJGL/Sc_OEEStatusReport/Sc_OEEStatusReport.vue b/pages/MJGL/Sc_OEEStatusReport/Sc_OEEStatusReport.vue
index a1703ba..2a16342 100644
--- a/pages/MJGL/Sc_OEEStatusReport/Sc_OEEStatusReport.vue
+++ b/pages/MJGL/Sc_OEEStatusReport/Sc_OEEStatusReport.vue
@@ -1,8 +1,8 @@
<template>
<view>
<view class="tabs" id="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">寰呯淮淇�</view>
- <view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">宸茬淮淇�</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">缂撳瓨</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">鎶ヨ〃</view>
<!-- <view :class="tabs == 2 ? 'on':''" @tap="switchTab(2)">鍏ㄩ儴浠诲姟</view> -->
</view>
diff --git a/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue
index 7ca551e..77e289d 100644
--- a/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue
+++ b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue
@@ -560,7 +560,7 @@
this.hform.HMouldMaintainRuleInterNo = data.鍗曟嵁鍙�;
this.hform.HMouldMaintainRuleInterID = data.hmainid;
this.hform.HPlanNo = data.淇濆吇璁″垝鍙� == null ? "" : data.淇濆吇璁″垝鍙�;
- this.hform.HPlanInterID = data.淇濆吇璁″垝id == null ? 0 : ata.淇濆吇璁″垝id,
+ this.hform.HPlanInterID = data.淇濆吇璁″垝id == null ? 0 : data.淇濆吇璁″垝id,
this.hform.HMouldMaintainPlanInterID = data.淇濆吇璁″垝id == null ? 0 :
data.淇濆吇璁″垝id;
this.hform.HMouldMaintainPlanEntryID = data.淇濆吇璁″垝瀛恑d == null ? 0 : data
diff --git a/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList.vue b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList.vue
index 1b2d665..1826255 100644
--- a/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList.vue
+++ b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList.vue
@@ -50,12 +50,27 @@
<view class="list" v-for="(item,index) in listData" :key="index">
<uni-card :title="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
- <view class="detail" v-if="item.鐐规鍛ㄦ湡">
- <text>鐐规鍛ㄦ湡锛�</text>{{item.鐐规鍛ㄦ湡}}
+ <view class="detail" v-if="item.淇濆吇璁″垝鍙�">
+ <text>淇濆吇璁″垝鍙凤細</text>{{item.淇濆吇璁″垝鍙穧}
+ </view>
+ <view class="detail" v-if="item.淇濆吇璁″垝id" v-show="false">
+ <text>淇濆吇璁″垝id锛�</text>{{item.淇濆吇璁″垝id}}
+ </view>
+ <view class="detail" v-if="item.淇濆吇璁″垝瀛恑d" v-show="false">
+ <text>淇濆吇璁″垝瀛恑d锛�</text>{{item.淇濆吇璁″垝瀛恑d}}
+ </view>
+ <view class="detail" v-if="item.淇濆吇鍛ㄦ湡">
+ <text>淇濆吇鍛ㄦ湡锛�</text>{{item.淇濆吇鍛ㄦ湡}}
</view>
<view class="detail" v-if="item.鍛ㄦ湡鍗曚綅">
<text>鍛ㄦ湡鍗曚綅锛�</text>{{item.鍛ㄦ湡鍗曚綅}}
</view>
+ <view class="detail" v-if="item.淇濆吇寮�濮嬫棩鏈�">
+ <text>淇濆吇寮�濮嬫棩鏈燂細</text>{{item.淇濆吇寮�濮嬫棩鏈�.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.淇濆吇缁撴潫鏃ユ湡">
+ <text>淇濆吇缁撴潫鏃ユ湡锛�</text>{{item.淇濆吇缁撴潫鏃ユ湡.substr(0,10)}}
+ </view>
<view class="detail" v-if="item.鎽樿">
<text>鎽樿锛�</text>{{item.鎽樿}}
</view>
diff --git a/pages/MJGL/xiamodan/MouldLowerBill.vue b/pages/MJGL/xiamodan/MouldLowerBill.vue
index c945ca7..0ba770a 100644
--- a/pages/MJGL/xiamodan/MouldLowerBill.vue
+++ b/pages/MJGL/xiamodan/MouldLowerBill.vue
@@ -1,576 +1,597 @@
<template>
- <view>
- <view class="form">
- <view class="form-item">
- <view class="title"><text>*</text>鏉″舰鐮�:</view>
- <view class="right" style="width: 380rpx;">
- <input v-model="hform.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="righton">
- <input name="HBillNo" disabled v-model="hform.HBillNo" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁鏃ユ湡:</view>
- <view class="right">
- <picker mode="date" v-model="hform.HDate" @change="HDateChange">
- <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
- </picker>
- </view>
- </view>
- <view class="form-item">
- <view class="title"><text>*</text>閮ㄩ棬:</view>
- <view class="right">
- <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName" @input="HDeptNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title"><text>*</text>鎿嶄綔鍛�:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName" @input="HEmpNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title"><text>*</text>璐熻矗浜�:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨璐熻矗浜�" v-model="hform.HMangerName" @input="HManagerNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐢熶骇璧勬簮:</view>
- <view class="right">
- <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName" @input="HSourceNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">妯″叿缂栫爜:</view>
- <view class="righton">
- <input name="HMouldNumber" v-model="hform.HMouldNumber" disabled placeholder="璇疯緭鍏ュ櫒鍏风紪鐮�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">妯″叿鍚嶇О:</view>
- <view class="righton">
- <input name="HMouldName" v-model="hform.HMouldName" disabled placeholder="璇疯緭鍏ュ櫒鍏峰悕绉�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">妯″叿鍨嬪彿:</view>
- <view class="righton">
- <input name="HMouldModel" v-model="hform.HMouldModel" disabled placeholder="璇疯緭鍏ュ櫒鍏峰瀷鍙�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鏁伴噺:</view>
- <view class="righton">
- <input name="HQty" v-model="hform.HQty" disabled placeholder="璇疯緭鍏ユ暟閲�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">涓嬫ā鏃堕棿:</view>
- <view class="righton">
- <input name="HScanDate" disabled v-model="hform.HScanDate" placeholder="璇烽�夋嫨" />
- </view>
- </view>
-
- <view class="form-item">
- <view class="title">鐢熶骇璁㈠崟:</view>
- <view class="righton">
- <input name="HICMOBillNo" disabled v-model="hform.HICMOBillNo" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">娴佽浆鍗�:</view>
- <view class="righton">
- <input disabled v-model="hform.HProcExchBillNo" />
- </view>
- </view>
-
- <view class="form-item">
- <view class="title">澶囨敞:</view>
- <view class="right">
- <textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="璇疯緭鍏ュ娉�"></textarea>
- </view>
- </view>
-
- <view class="tab_area"></view>
-
- <view v-if="showmore">
- <view class="form-item">
- <view class="title">鍒跺崟浜�:</view>
- <view class="righton">
- <input v-model="hform.HMaker" disabled/>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍒跺崟鏃ユ湡:</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="righton">
- <input v-model="hform.HUpDater" disabled/>
- </view>
- </view>
- <view class="form-item">
- <view class="title">淇敼鏃ユ湡:</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="righton">
- <input v-model="hform.HChecker" disabled/>
- </view>
- </view>
- <view class="form-item">
- <view class="title">瀹℃牳鏃ユ湡:</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/>
- </view>
- </view>
-
- </view>
- <view class="other">
- <view v-if="!showmore" @tap="showmore = true">
- 灞曞紑鍏朵粬淇℃伅<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>
- </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>
- </view>
- </view>
-
- </view>
+ <view>
+ <view class="form">
+ <view class="form-item">
+ <view class="title"><text>*</text>鏉″舰鐮�:</view>
+ <view class="right" style="width: 380rpx;">
+ <input v-model="hform.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="righton">
+ <input name="HBillNo" disabled v-model="hform.HBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鏃ユ湡:</view>
+ <view class="right">
+ <picker mode="date" v-model="hform.HDate" @change="HDateChange">
+ <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+ </picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title"><text>*</text>閮ㄩ棬:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+ @input="HDeptNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title"><text>*</text>鎿嶄綔鍛�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName"
+ @input="HEmpNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title"><text>*</text>璐熻矗浜�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨璐熻矗浜�" v-model="hform.HMangerName"
+ @input="HManagerNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇璧勬簮:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
+ @input="HSourceNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">妯″叿缂栫爜:</view>
+ <view class="righton">
+ <input name="HMouldNumber" v-model="hform.HMouldNumber" disabled placeholder="璇疯緭鍏ュ櫒鍏风紪鐮�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">妯″叿鍚嶇О:</view>
+ <view class="righton">
+ <input name="HMouldName" v-model="hform.HMouldName" disabled placeholder="璇疯緭鍏ュ櫒鍏峰悕绉�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">妯″叿鍨嬪彿:</view>
+ <view class="righton">
+ <input name="HMouldModel" v-model="hform.HMouldModel" disabled placeholder="璇疯緭鍏ュ櫒鍏峰瀷鍙�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鏁伴噺:</view>
+ <view class="righton">
+ <input name="HQty" v-model="hform.HQty" disabled placeholder="璇疯緭鍏ユ暟閲�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">涓嬫ā鏃堕棿:</view>
+ <view class="righton">
+ <input name="HScanDate" disabled v-model="hform.HScanDate" placeholder="璇烽�夋嫨" />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="title">鐢熶骇璁㈠崟:</view>
+ <view class="righton">
+ <input name="HICMOBillNo" disabled v-model="hform.HICMOBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">娴佽浆鍗�:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HProcExchBillNo" />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="title">澶囨敞:</view>
+ <view class="right">
+ <textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="璇疯緭鍏ュ娉�"></textarea>
+ </view>
+ </view>
+
+ <view class="tab_area"></view>
+
+ <view v-if="showmore">
+ <view class="form-item">
+ <view class="title">鍒跺崟浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HMaker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍒跺崟鏃ユ湡:</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="righton">
+ <input v-model="hform.HUpDater" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼鏃ユ湡:</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="righton">
+ <input v-model="hform.HChecker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳鏃ユ湡:</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 />
+ </view>
+ </view>
+
+ </view>
+ <view class="other">
+ <view v-if="!showmore" @tap="showmore = true">
+ 灞曞紑鍏朵粬淇℃伅<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>
+ </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>
+ </view>
+ </view>
+
+ </view>
</template>
<script>
- import getDateTime from '@/utils/getdateTime.js';
- import { getUserInfo } from "@/utils/auth.js";
+ import getDateTime from '@/utils/getdateTime.js';
+ import {
+ getUserInfo
+ } from "@/utils/auth.js";
export default {
data() {
return {
- userInfo:getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
- linterid:'',
- HBillNo:'',
- btnType:1,//1鏂板锛�3淇敼
- showmore: false,
-
- arrayHDeptName:[],//閮ㄩ棬
- HDeptNameList:[],
- arrayHEmpName:[],//鍙戠幇浜�/璐熻矗浜�
- HEmpNameList:[],
- arrayHSourceName:[],//鐢熶骇璧勬簮
- HSourceNameList:[],
-
-
- isEdit: false,
- hform:{
- HInterID:'',
- HBillNo:'',
- HDate:getDateTime.dateTimeStr('y-m-d'),
- HBarCode:'',
- HDeptName: uni.getStorageSync('HDeptName'),
- HDeptID: uni.getStorageSync('HDeptID'),
- HEmpName: uni.getStorageSync('HEmpName'),
- HEmpID: uni.getStorageSync('HEmpID'),
- HMangerName: uni.getStorageSync('HMangerName'),
- HMangerID: uni.getStorageSync('HMangerID'),
-
-
- HSourceName:'',
- HSourceID:'',
- HMouldNumber:'',
- HMouldID:'',
- HMouldName:'',
- HMouldModel:'',
- HQty:'',
- HScanDate:getDateTime.dateTimeStr('y-m-d h:i:s'),
- HICMOBillNo:'',
- HICMOInterID:'',
- HICMOEntryID:'',
- HProcExchBillNo:'',
- HProcExchInterID:'',
- HProcExchEntryID:'',
- HOrgID:uni.getStorageSync('OrganizationID'),
-
- HMaker:'',
- HMakeDate:'',
- HUpDater:'',
- HUpDateDate:'',
- HChecker:'',
- HCheckDate:'',
- HCloseMan:'',
- HCloseDate:'',
- HDeleteMan:'',
- HDeleteDate:'',
-
- eventType:'Add'
- }
+ userInfo: getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ linterid: '',
+ HBillNo: '',
+ btnType: 1, //1鏂板锛�3淇敼
+ showmore: false,
+
+ arrayHDeptName: [], //閮ㄩ棬
+ HDeptNameList: [],
+ arrayHEmpName: [], //鍙戠幇浜�/璐熻矗浜�
+ HEmpNameList: [],
+ arrayHSourceName: [], //鐢熶骇璧勬簮
+ HSourceNameList: [],
+
+
+ isEdit: false,
+ hform: {
+ HInterID: '',
+ HBillNo: '',
+ HDate: getDateTime.dateTimeStr('y-m-d'),
+ HBarCode: '',
+ HDeptName: uni.getStorageSync('HDeptName'),
+ HDeptID: uni.getStorageSync('HDeptID'),
+ HEmpName: uni.getStorageSync('HEmpName'),
+ HEmpID: uni.getStorageSync('HEmpID'),
+ HMangerName: uni.getStorageSync('HMangerName'),
+ HMangerID: uni.getStorageSync('HMangerID'),
+
+
+ HSourceName: '',
+ HSourceID: '',
+ HMouldNumber: '',
+ HMouldID: '',
+ HMouldName: '',
+ HMouldModel: '',
+ HQty: '',
+ HScanDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+ HICMOBillNo: '',
+ HICMOInterID: '',
+ HICMOEntryID: '',
+ HProcExchBillNo: '',
+ HProcExchInterID: '',
+ HProcExchEntryID: '',
+ HOrgID: uni.getStorageSync('OrganizationID'),
+
+ HMaker: '',
+ HMakeDate: '',
+ HUpDater: '',
+ HUpDateDate: '',
+ HChecker: '',
+ HCheckDate: '',
+ HCloseMan: '',
+ HCloseDate: '',
+ HDeleteMan: '',
+ HDeleteDate: '',
+
+ eventType: 'Add'
+ }
}
},
- onLoad(e) {
-
- this.hform.HMaker = uni.getStorageSync('HUserName')
- console.log(e,this.userInfo)
- if(e.linterid){
- this.btnType = 3
- this.linterid = e.linterid
- this.HBillNo = e.HBillNo
- this.getEditData(e.linterid, e.HBillNo)
- }else{
- this.getNewData()
- }
-
- this.getHDeptList()
- this.getHEmpList()
- this.getHSourceList()
- },
+ onLoad(e) {
+
+ this.hform.HMaker = uni.getStorageSync('HUserName')
+ console.log(e, this.userInfo)
+ if (e.linterid) {
+ this.btnType = 3
+ this.linterid = e.linterid
+ this.HBillNo = e.HBillNo
+ this.getEditData(e.linterid, e.HBillNo)
+ } else {
+ this.getNewData()
+ }
+
+ this.getHDeptList()
+ this.getHEmpList()
+ this.getHSourceList()
+ },
methods: {
- //鎵爜
- toScanCode(){
- var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
- mpaasScanModule.mpaasScan({
- 'hideAlbum': true,
- 'timeoutInterval':'10', //瓒呮椂鏃堕棿
- 'timeoutText':'鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
- },(ret) => {
- console.log(ret.resp_result)
- this.hform.HBarCode = ret.resp_result
- this.getHBarCodeData(ret.resp_result)
- })
- },
- //鏃ユ湡
- HDateChange(e){
- console.log(e.detail.value)
- this.hform.HDate = e.detail.value
- },
- getHBarCodeData(HBarCode) {
- var sWhere = " and 鏉″舰鐮�='" + this.hform.HBarCode +"' order by 鍒跺崟鏃ユ湡 desc"
- uni.request({
- url: this.serverUrl + '/Sc_MouldLowerBill/Sc_MouldUpperBillList',
- data: {
- sWhere: sWhere
- },
- success: (res) => {
- console.log(2, res.data);
- if (res.data.code == 1) {
- var data = res.data.data[0];
- console.log(3, data);
- this.hform.HProcExchBillNo = data.HProcExchBillNo;
- this.hform.HProcExchInterID = data.HProcExchInterID;
- this.hform.HProcExchEntryID = data.HProcExchEntryID;
- this.hform.HICMOBillNo = data.HICMOBillNo;
- this.hform.HICMOInterID = data.HICMOInterID;
- this.hform.HICMOEntryID = data.HICMOEntryID;
- this.hform.HSourceID = data.HSourceID;
- this.hform.HSourceName = data.鐢熶骇璧勬簮;
- this.hform.HMouldID = data.HMouldID;
- this.hform.HMouldNumber = data.妯″叿缂栫爜;
- this.hform.HMouldName = data.妯″叿鍚嶇О;
- this.hform.HMouldModel = data.妯″叿瑙勬牸;
- this.hform.HQty = 1;
-
- if(data['璐熻矗浜�']) {
+ //鎵爜
+ toScanCode() {
+ var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+ mpaasScanModule.mpaasScan({
+ 'hideAlbum': true,
+ 'timeoutInterval': '10', //瓒呮椂鏃堕棿
+ 'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ }, (ret) => {
+ console.log(ret.resp_result)
+ this.hform.HBarCode = ret.resp_result
+ this.getHBarCodeData(ret.resp_result)
+ })
+ },
+ //鏃ユ湡
+ HDateChange(e) {
+ console.log(e.detail.value)
+ this.hform.HDate = e.detail.value
+ },
+ getHBarCodeData(HBarCode) {
+ var sWhere = " and 鏉″舰鐮�='" + this.hform.HBarCode + "' order by 鍒跺崟鏃ユ湡 desc"
+ uni.request({
+ url: this.serverUrl + '/Sc_MouldLowerBill/Sc_MouldUpperBillList',
+ data: {
+ sWhere: sWhere
+ },
+ success: (res) => {
+ console.log(2, res.data);
+ if (res.data.code == 1) {
+ var data = res.data.data[0];
+ console.log(3, data);
+ this.hform.HProcExchBillNo = data.HProcExchBillNo;
+ this.hform.HProcExchInterID = data.HProcExchInterID;
+ this.hform.HProcExchEntryID = data.HProcExchEntryID;
+ this.hform.HICMOBillNo = data.HICMOBillNo;
+ this.hform.HICMOInterID = data.HICMOInterID;
+ this.hform.HICMOEntryID = data.HICMOEntryID;
+ this.hform.HSourceID = data.HSourceID;
+ this.hform.HSourceName = data.鐢熶骇璧勬簮;
+ this.hform.HMouldID = data.HMouldID;
+ this.hform.HMouldNumber = data.妯″叿缂栫爜;
+ this.hform.HMouldName = data.妯″叿鍚嶇О;
+ this.hform.HMouldModel = data.妯″叿瑙勬牸;
+ this.hform.HQty = 1;
+
+ if (data['璐熻矗浜�']) {
this.hform.HEmpName = data['璐熻矗浜�']
this.HEmpNameChange(data['璐熻矗浜�'])
// let index = this.arrayHEmpName.findIndex(item => item == data['璐熻矗浜�'])
-
+
}
- } else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- });
- },
- //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
- getHDeptList(){
- uni.request({
- url: this.serverUrl + '/PublicPageMethod/DeptList',
- data: { sWhere: "where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + uni.getStorageSync('OrganizationID') + "" },
- success: (res) => {
- if(res.data.count == 1){
- this.HDeptNameList = res.data.data
- for(var i=0;i<res.data.data.length;i++){
- this.arrayHDeptName[i] = res.data.data[i].HName
- }
- this.$forceUpdate();
- }else{
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- },
- //閫夋嫨浣跨敤閮ㄩ棬
- HDeptNameChange(e){
- for(var i=0;i<this.HDeptNameList.length;i++){
- if(this.HDeptNameList[i].HName == e){
- this.hform.HDeptID = this.HDeptNameList[i].HItemID
- }
- }
- },
- //鎿嶄綔鍛樸�佽礋璐ｄ汉
- getHEmpList(){
- uni.request({
- url: this.serverUrl + '/Web/GetEmployeeList_Json',
- data: { Employee: '',HGroupID:0, HDeptID: getUserInfo()["HDeptID"] || -1},
- success: (res) => {
- if(res.data.count == 1){
- this.HEmpNameList = res.data.data
- for(var i=0;i<res.data.data.length;i++){
- this.arrayHEmpName[i] = res.data.data[i].HName
- }
- this.$forceUpdate();
- }else{
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- },
- //閫夋嫨鎿嶄綔鍛�
- HEmpNameChange(e){
- console.log('e: ',e);
- for(var i=0;i<this.HEmpNameList.length;i++){
- if(this.HEmpNameList[i].HName == e){
- this.hform.HEmpID = this.HEmpNameList[i].HItemID
- }
- }
- },
- //閫夋嫨璐熻矗浜�
- HManagerNameChange(e){
- for(var i=0;i<this.HEmpNameList.length;i++){
- if(this.HEmpNameList[i].HName == e){
- this.hform.HMangerID = this.HEmpNameList[i].HItemID
- }
- }
- },
- //鐢熶骇璧勬簮
- getHSourceList(){
- uni.request({
- url: this.serverUrl + '/api/newBill/getSourceList',
- data: { sWhere: '' },
- success: (res) => {
- if(res.data.code == 1){
- this.HSourceNameList = res.data.data.Gy_Source
- for(var i=0;i<res.data.data.Gy_Source.length;i++){
- this.arrayHSourceName[i] = res.data.data.Gy_Source[i].鐢熶骇璧勬簮
- }
- this.$forceUpdate();
- }else{
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- },
- //閫夋嫨鐢熶骇璧勬簮
- HSourceNameChange(e){
- for(var i=0;i<this.HSourceNameList.length;i++){
- if(this.HSourceNameList[i].鐢熶骇璧勬簮 == e){
- this.hform.HSourceID = this.HSourceNameList[i].HItemID
- }
- }
- },
- ifEdit(){
- this.isEdit = true
- this.hform.eventType = 'Modify'
- },
- //缂栬緫鍥炴樉
- getEditData(linterid,HBillNo){
- //涓昏〃
- var sWhere = " and hmainid='" + linterid + "'";
- uni.request({
- url: this.serverUrl + '/Sc_MouldUpperBill/Sc_MouldLowerBillList',
- data: { sWhere: sWhere,user: uni.getStorageSync('HUserName') },
- success: (res) => {
- console.log(1,res.data.data[0]);
- if(res.data.code == 1){
- var data = res.data.data[0]
- this.btnType=3
- this.hform.HInterID= data.hmainid
- this.hform.HBillNo= data.鍗曟嵁鍙�
- this.hform.HBarCode= data.鏉″舰鐮�
- this.hform.HDeptID= data.HDeptID
- this.hform.HDeptName= data.閮ㄩ棬
- this.hform.HEmpID= data.HEmpID
- this.hform.HEmpName= data.鎿嶄綔鍛�
- this.hform.HMangerID= data.HMangerID
- this.hform.HMangerName= data.璐熻矗浜�
- this.hform.HRemark= data.琛ㄥご澶囨敞
- this.hform.HDate = data.鏃ユ湡.substr(0,10)
-
- this.hform.HSourceID=data.HSourceID,
- this.hform.HSourceName=data.鐢熶骇璧勬簮,
- this.hform.HMouldID=data.HMouldID,
- this.hform.HMouldNumber=data.妯″叿缂栫爜,
- this.hform.HMouldName=data.妯″叿鍚嶇О,
- this.hform.HMouldModel=data.妯″叿瑙勬牸,
- this.hform.HQty=data.鏁伴噺,
- this.hform.HScanDate=data.涓嬫ā鎵爜鏃堕棿,
- this.hform.HICMOBillNo=data.HICMOBillNo,
- this.hform.HICMOInterID=data.HICMOInterID,
- this.hform.HICMOEntryID=data.HICMOEntryID,
- this.hform.HProcExchBillNo=data.HProcExchBillNo,
- this.hform.HProcExchInterID=data.HProcExchInterID,
- this.hform.HProcExchEntryID=data.HProcExchEntryID,
- this.hform.HOrgID=data.HOrgID,
-
- this.hform.HMaker= data.鍒跺崟浜�
- this.hform.HMakeDate= data.鍒跺崟鏃ユ湡
- this.hform.HUpDater= data.淇敼浜�
- this.hform.HUpDateDate= data.淇敼鏃ユ湡
- this.hform.HChecker= data.瀹℃牳浜�
- this.hform.HCheckDate= data.瀹℃牳鏃ユ湡
- this.hform.HDeleteMan= data.浣滃簾浜�
- this.hform.HDeleteDate= data.浣滃簾鏃ユ湡
- }else{
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- },
- //鏂板
- getNewData(){
- uni.request({
- url: this.serverUrl + '/Web/GetMAXNum',
- data: { HBillType: '3847' },
- success: (res) => {
- console.log(res.data)
- if(res.data.count == 1){
- this.hform.HInterID = res.data.data[0].HInterID
- this.hform.HBillNo = res.data.data[0].HBillNo
- this.hform.HMakeDate = getDateTime.dateTimeStr('y-m-d')
- this.btnType=1
- }else{
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- },
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+ getHDeptList() {
+ uni.request({
+ url: this.serverUrl + '/PublicPageMethod/DeptList',
+ data: {
+ sWhere: "where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + uni.getStorageSync(
+ 'OrganizationID') + ""
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.HDeptNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHDeptName[i] = res.data.data[i].HName
+ }
+ this.$forceUpdate();
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //閫夋嫨浣跨敤閮ㄩ棬
+ HDeptNameChange(e) {
+ for (var i = 0; i < this.HDeptNameList.length; i++) {
+ if (this.HDeptNameList[i].HName == e) {
+ this.hform.HDeptID = this.HDeptNameList[i].HItemID
+ }
+ }
+ },
+ //鎿嶄綔鍛樸�佽礋璐ｄ汉
+ getHEmpList() {
+ uni.request({
+ url: this.serverUrl + '/Web/GetEmployeeList_Json',
+ data: {
+ Employee: '',
+ HGroupID: 0,
+ HDeptID: getUserInfo()["HDeptID"] || -1
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.HEmpNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHEmpName[i] = res.data.data[i].HName
+ }
+ this.$forceUpdate();
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //閫夋嫨鎿嶄綔鍛�
+ HEmpNameChange(e) {
+ console.log('e: ', e);
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+ this.hform.HEmpID = this.HEmpNameList[i].HItemID
+ }
+ }
+ },
+ //閫夋嫨璐熻矗浜�
+ HManagerNameChange(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+ this.hform.HMangerID = this.HEmpNameList[i].HItemID
+ }
+ }
+ },
+ //鐢熶骇璧勬簮
+ getHSourceList() {
+ uni.request({
+ url: this.serverUrl + '/api/newBill/getSourceList',
+ data: {
+ sWhere: ''
+ },
+ success: (res) => {
+ if (res.data.code == 1) {
+ this.HSourceNameList = res.data.data.Gy_Source
+ for (var i = 0; i < res.data.data.Gy_Source.length; i++) {
+ this.arrayHSourceName[i] = res.data.data.Gy_Source[i].鐢熶骇璧勬簮
+ }
+ this.$forceUpdate();
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //閫夋嫨鐢熶骇璧勬簮
+ HSourceNameChange(e) {
+ for (var i = 0; i < this.HSourceNameList.length; i++) {
+ if (this.HSourceNameList[i].鐢熶骇璧勬簮 == e) {
+ this.hform.HSourceID = this.HSourceNameList[i].HItemID
+ }
+ }
+ },
+ ifEdit() {
+ this.isEdit = true
+ this.hform.eventType = 'Modify'
+ },
+ //缂栬緫鍥炴樉
+ getEditData(linterid, HBillNo) {
+ //涓昏〃
+ var sWhere = " and hmainid='" + linterid + "'";
+ uni.request({
+ url: this.serverUrl + '/Sc_MouldUpperBill/Sc_MouldLowerBillList',
+ data: {
+ sWhere: sWhere,
+ user: uni.getStorageSync('HUserName')
+ },
+ success: (res) => {
+ console.log(1, res.data.data[0]);
+ if (res.data.code == 1) {
+ var data = res.data.data[0]
+ this.btnType = 3
+ this.hform.HInterID = data.hmainid
+ this.hform.HBillNo = data.鍗曟嵁鍙�
+ this.hform.HBarCode = data.鏉″舰鐮�
+ this.hform.HDeptID = data.HDeptID
+ this.hform.HDeptName = data.閮ㄩ棬
+ this.hform.HEmpID = data.HEmpID
+ this.hform.HEmpName = data.鎿嶄綔鍛�
+ this.hform.HMangerID = data.HMangerID
+ this.hform.HMangerName = data.璐熻矗浜�
+ this.hform.HRemark = data.琛ㄥご澶囨敞
+ this.hform.HDate = data.鏃ユ湡.substr(0, 10)
+
+ this.hform.HSourceID = data.HSourceID,
+ this.hform.HSourceName = data.鐢熶骇璧勬簮,
+ this.hform.HMouldID = data.HMouldID,
+ this.hform.HMouldNumber = data.妯″叿缂栫爜,
+ this.hform.HMouldName = data.妯″叿鍚嶇О,
+ this.hform.HMouldModel = data.妯″叿瑙勬牸,
+ this.hform.HQty = data.鏁伴噺,
+ this.hform.HScanDate = data.涓嬫ā鎵爜鏃堕棿,
+ this.hform.HICMOBillNo = data.HICMOBillNo,
+ this.hform.HICMOInterID = data.HICMOInterID,
+ this.hform.HICMOEntryID = data.HICMOEntryID,
+ this.hform.HProcExchBillNo = data.HProcExchBillNo,
+ this.hform.HProcExchInterID = data.HProcExchInterID,
+ this.hform.HProcExchEntryID = data.HProcExchEntryID,
+ this.hform.HOrgID = data.HOrgID,
+
+ this.hform.HMaker = data.鍒跺崟浜�
+ this.hform.HMakeDate = data.鍒跺崟鏃ユ湡
+ this.hform.HUpDater = data.淇敼浜�
+ this.hform.HUpDateDate = data.淇敼鏃ユ湡
+ this.hform.HChecker = data.瀹℃牳浜�
+ this.hform.HCheckDate = data.瀹℃牳鏃ユ湡
+ this.hform.HDeleteMan = data.浣滃簾浜�
+ this.hform.HDeleteDate = data.浣滃簾鏃ユ湡
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //鏂板
+ getNewData() {
+ uni.request({
+ url: this.serverUrl + '/Web/GetMAXNum',
+ data: {
+ HBillType: '3847'
+ },
+ success: (res) => {
+ console.log(res.data)
+ if (res.data.count == 1) {
+ this.hform.HInterID = res.data.data[0].HInterID
+ this.hform.HBillNo = res.data.data[0].HBillNo
+ this.hform.HMakeDate = getDateTime.dateTimeStr('y-m-d')
+ this.btnType = 1
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
submit() {
- if(!this.hform.HBarCode){
- uni.showToast({
- title:'璇锋壂鎻忔ā鍏锋潯褰㈢爜',
- icon:'none'
- })
- }else if(!this.hform.HSourceName){
- uni.showToast({
- title:'璇烽�夋嫨鐢熶骇璧勬簮',
- icon:'none'
- })
- }else if(!this.hform.HMouldName){
- uni.showToast({
- title:'妯″叿涓嶈兘涓虹┖',
- icon:'none'
- })
- }else if(!this.hform.HEmpName){
- uni.showToast({
- title:'璇烽�夋嫨鎿嶄綔鍛�',
- icon:'none'
- })
- }else if(!this.hform.HMangerName){
- uni.showToast({
- title:'璇烽�夋嫨璐熻矗浜�',
- icon:'none'
- })
- }else{
- uni.showLoading({
- title:'璇风◢鍊�'
- })
- var sMainStr = JSON.stringify(this.hform);
- var sMainSub = sMainStr + ";" + uni.getStorageSync('HUserName')+";"+this.btnType;
- console.log(sMainSub);
- uni.request({
- url: this.serverUrl + '/Sc_MouldUpperBill/AddSc_MouldLowerBill_PDA',
- method:'POST',
- dataType:"json",
- data:{ oMain: sMainSub },
- success: (res) => {
- console.log(1,res);
- uni.hideLoading()
- if(res.data.count == 1){
- let pages = getCurrentPages();
- let prePage = pages[pages.length - 2];
- prePage.$vm.getList()
-
+ if (!this.hform.HBarCode) {
+ uni.showToast({
+ title: '璇锋壂鎻忔ā鍏锋潯褰㈢爜',
+ icon: 'none'
+ })
+ } else if (!this.hform.HSourceName) {
+ uni.showToast({
+ title: '璇烽�夋嫨鐢熶骇璧勬簮',
+ icon: 'none'
+ })
+ } else if (!this.hform.HMouldName) {
+ uni.showToast({
+ title: '妯″叿涓嶈兘涓虹┖',
+ icon: 'none'
+ })
+ } else if (!this.hform.HEmpName) {
+ uni.showToast({
+ title: '璇烽�夋嫨鎿嶄綔鍛�',
+ icon: 'none'
+ })
+ } else if (!this.hform.HMangerName) {
+ uni.showToast({
+ title: '璇烽�夋嫨璐熻矗浜�',
+ icon: 'none'
+ })
+ } else {
+ uni.showLoading({
+ title: '璇风◢鍊�'
+ })
+ var sMainStr = JSON.stringify(this.hform);
+ var sMainSub = sMainStr + ";" + uni.getStorageSync('HUserName') + ";" + this.btnType;
+ console.log(sMainSub);
+ uni.request({
+ url: this.serverUrl + '/Sc_MouldUpperBill/AddSc_MouldLowerBill_PDA',
+ method: 'POST',
+ dataType: "json",
+ data: {
+ oMain: sMainSub
+ },
+ success: (res) => {
+ console.log(1, res);
+ uni.hideLoading()
+ if (res.data.count == 1) {
+
uni.showModal({
title: "鎻愮ず",
content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
@@ -588,125 +609,142 @@
}
},
});
- }
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- }
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ }
},
- goBack(){
- uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.navigateBack()
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- }
- }
- });
+ goBack() {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.navigateBack()
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
+ });
}
}
}
</script>
<style lang="scss" scoped>
- .form{
- width: 668rpx;
- margin: 20rpx auto;
- padding-bottom: 240rpx;
- }
- .tab_area{
- width: 100%;
- height: 50rpx;
- }
- .other{
- margin-top: 8rpx;
- text-align: center;
- font-size: 28rpx;
- padding: 4rpx 18rpx;
- color: #1890FF;
- }
- .form-item{
- display: flex;
- align-items: center;
- font-size: 30rpx;
- padding: 6rpx 0;
- .title{
- width: 208rpx;
- text{
- color: red;
- font-weight: bold;
- }
- }
- .right{
- width: 450rpx;
- border-radius: 22rpx;
- border: 1px solid #acacac;
- }
- .righton{
- width: 450rpx;
- border-radius: 22rpx;
- border: 1px solid #e4e4e4;
- background-color: #e4e4e4;
- }
- input{
- width: 100%;
- padding: 8rpx 20rpx;
- font-size: 30rpx;
- }
- textarea{
- width: 98%;
- padding: 8rpx 20rpx;
- font-size: 30rpx;
- }
+ .form {
+ width: 668rpx;
+ margin: 20rpx auto;
+ padding-bottom: 240rpx;
+ }
- }
- .bottom-btn{
- 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 40rpx 40rpx;
- button{
- border-radius: 50rpx;
- width: 180rpx;
- height: 66rpx;
- line-height: 66rpx;
- font-size: 28rpx;
- }
- .btn-a{
- background-color: #3A78FF;
- color: #fff;
- }
- .btn-b{
- background-color: #41a863;
- color: #fff;
- }
- .btn-c{
- background-color: #acacac;
- color: #fff;
- position: absolute;
- right: 120rpx;
- }
- .btn-d{
- background-color: #ff8901;
- color: #fff;
- }
- }
+ .tab_area {
+ width: 100%;
+ height: 50rpx;
+ }
+
+ .other {
+ margin-top: 8rpx;
+ text-align: center;
+ font-size: 28rpx;
+ padding: 4rpx 18rpx;
+ color: #1890FF;
+ }
+
+ .form-item {
+ display: flex;
+ align-items: center;
+ font-size: 30rpx;
+ padding: 6rpx 0;
+
+ .title {
+ width: 208rpx;
+
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
+
+ .right {
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ }
+
+ .righton {
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+
+ input {
+ width: 100%;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+
+ textarea {
+ width: 98%;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+
+ }
+
+ .bottom-btn {
+ 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 40rpx 40rpx;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+
+ .btn-a {
+ background-color: #3A78FF;
+ color: #fff;
+ }
+
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #acacac;
+ color: #fff;
+ position: absolute;
+ right: 120rpx;
+ }
+
+ .btn-d {
+ background-color: #ff8901;
+ color: #fff;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue b/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
index 09189f9..0098e9b 100644
--- a/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
+++ b/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
@@ -175,7 +175,7 @@
}
},
onSearchClickHandler() {
- this.getWorkLinkList()
+ this.switchTab(this.tabs)
},
onResetClickHandler() {
this.dateRangePicker = ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"],
@@ -187,6 +187,7 @@
},
switchTab(tabIndex) {
this.tabs = tabIndex
+ this.sWhere = ''
switch (tabIndex) {
case 0:
this.sWhere =
@@ -207,8 +208,8 @@
this.getWorkLinkList()
},
async getWorkLinkList() {
+ this.sWhere += ` and 鏃ユ湡 >= CONVERT(VARCHAR(10), '${this.startDate}', 23) and 鏃ユ湡 <= CONVERT(VARCHAR(10), '${this.endDate}', 23)`
try {
- this.sWhere += ` and 鏃ユ湡 >= CONVERT(VARCHAR(10), '${this.startDate}', 23) and 鏃ユ湡 <= CONVERT(VARCHAR(10), '${this.endDate}', 23)`
let res = await CommonUtils.doRequest2Async({
url: 'Sc_MESTransFerWorkBill/GetOA_WorkLinkBillList',
diff --git a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
index 6054005..2eb392e 100644
--- a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -438,7 +438,7 @@
</view>
</view>
<view style="height: 120rpx"></view>
- <view class="bottom-btn">
+ <view class="bottom-btn" @tap.stop="() => {}">
<button class="btn-a" size="mini" @tap.stop="submit">鎻愪氦</button>
<view style="flex: 1"></view>
<button class="btn-a" size="mini" @tap.stop="addNew">鏂板</button>
@@ -556,7 +556,7 @@
// 涓嶈壇绫诲瀷
popList: [],
badReasonBackTypeList: [],
-
+
// 妫�楠屾柟妗�
arrayAnalysisMethod: [{
value: 1,
@@ -2166,7 +2166,7 @@
return
}
// 鏍规嵁 鎻愪氦杩斿洖 鐨勬槸鍚﹀厑璁告樉绀烘彁绀轰俊鎭� 鍒ゆ柇鏄洿鎺ユ柊澧炲崟鎹繕鏄彁绀轰俊鎭�
- if(res.data.NotShowTips) {
+ if (res.data.NotShowTips) {
this.addNew()
return
}
@@ -2460,6 +2460,21 @@
this.hform.HTakeSampleCheckBillID = e.linterid;
//鍙栨牱鍗曟煡璇㈡暟鎹�
await this.LoadingInformation_TakeSampleCheckBill(e.linterid);
+ } else if (e.HSouceBillType == "3772") {
+ if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
+ this.HSourceBillType = "宸ュ簭娴佽浆鍗�"; // 鏄剧ず鍚嶇О
+ this.hform.HSourceBillType = "3772"; // 瀵瑰簲鐨勫��
+ this.hform.HSourceBillNo = e.HBillNo
+ }
+
+ this.hform.HProcExchBillNo = e.HBillNo
+ this.hform.HProcExchInterID = e.linterid
+ this.hform.HProcExchEntryID = e.hsubid
+
+ await this.HandleBillSelectComplete({
+ HInterID: e.linterid,
+ HEntryID: e.hsubid
+ })
}
} else if (this.operationType == 3) {
await this.RoadBillMain();
@@ -2796,13 +2811,13 @@
margin-left: 4px;
font-weight: bold;
}
-
+
.popup-content {
width: 500rpx;
border-radius: 20rpx;
text-align: center;
padding-bottom: 20rpx;
-
+
.tit {
height: 120rpx;
line-height: 120rpx;
@@ -2810,7 +2825,7 @@
color: #222;
font-weight: bold;
}
-
+
.item {
height: 88rpx;
line-height: 88rpx;
diff --git a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
index fbacecf..18fe010 100644
--- a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
+++ b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -444,8 +444,8 @@
</view>
</view>
<view style="height: 120rpx"></view>
- <view class="bottom-btn">
- <button class="btn-a" size="mini" @tap.stop="submit">鎻愪氦</button>
+ <view class="bottom-btn" @tap.stop="() => {}">
+ <button class="btn-a" size="mini" @tap.stop="submit">鎻愪氦</button>
<view style="flex: 1"></view>
<button class="btn-a" size="mini" @tap.stop="addNew">鏂板</button>
<button class="btn-c" size="mini" @tap.stop="goBack">閫�鍑�</button>
@@ -747,8 +747,8 @@
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
- this.hform.HMainSourceBillNo = data[0]['HBillNo']
- this.hform.HSourceBillNo = data[0]['HBillNo']
+ this.hform.HMainSourceBillNo = data[0]['鍗曟嵁鍙�']
+ this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
this.hform.HMainSourceInterID = data[0].HInterID
this.hform.HMainSourceEntryID = data[0].HEntryID
this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
@@ -823,8 +823,8 @@
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
- this.hform.HMainSourceBillNo = data[0]['HBillNo']
- this.hform.HSourceBillNo = data[0]['HBillNo']
+ this.hform.HMainSourceBillNo = data[0]['鍗曟嵁鍙�']
+ this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
this.hform.HMainSourceInterID = data[0].HInterID
this.hform.HMainSourceEntryID = data[0].HEntryID
this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
@@ -879,8 +879,8 @@
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
- this.hform.HMainSourceBillNo = data[0]['HBillNo']
- this.hform.HSourceBillNo = data[0]['HBillNo']
+ this.hform.HMainSourceBillNo = data[0]['鍗曟嵁鍙�']
+ this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
this.hform.HMainSourceInterID = data[0].HInterID
this.hform.HMainSourceEntryID = data[0].HEntryID
this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
@@ -927,8 +927,8 @@
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
- this.hform.HMainSourceBillNo = data[0]['HBillNo']
- this.hform.HSourceBillNo = data[0]['HBillNo']
+ this.hform.HMainSourceBillNo = data[0]['鍗曟嵁鍙�']
+ this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
this.hform.HMainSourceInterID = data[0].HInterID
this.hform.HMainSourceEntryID = data[0].HEntryID
this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
@@ -2364,7 +2364,7 @@
await this.getMaxBillNo();
} else if (this.operationType == 2) {
//鏈夋簮鍗曚笅鎺�
- await this.getMaxBillNo();
+ await this.getMaxBillNo();
if (e.HSouceBillType == "7521") {
if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
@@ -2377,6 +2377,18 @@
this.hform.HTakeSampleCheckBillID = e.linterid;
//鍙栨牱鍗曟煡璇㈡暟鎹�
await this.LoadingInformation_TakeSampleCheckBill(e.linterid);
+ } else if (e.HSouceBillType == "3772"){
+ if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
+ this.HSourceBillType = "宸ュ簭娴佽浆鍗�"; // 鏄剧ず鍚嶇О
+ this.hform.HSourceBillType = "3772"; // 瀵瑰簲鐨勫��
+ this.hform.HSourceBillNo = e.HBillNo
+ }
+
+ this.hform.HProcExchBillNo = e.HBillNo
+ this.hform.HProcExchInterID = e.linterid
+ this.hform.HProcExchEntryID = e.hsubid
+
+ await this.HandleBillSelectComplete({HInterID: e.linterid, HEntryID: e.hsubid})
}
} else if (this.operationType == 3) {
this.hform.HInterID = e.linterid || 0;
diff --git a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
index dc81f37..bb8be38 100644
--- a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
+++ b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -430,7 +430,7 @@
</view>
</view>
<view style="height: 120rpx"></view>
- <view class="bottom-btn">
+ <view class="bottom-btn" @tap.stop="() => {}">
<button class="btn-a" size="mini" @tap.stop="submit">鎻愪氦</button>
<view style="flex: 1"></view>
<button class="btn-a" size="mini" @tap.stop="addNew">鏂板</button>
@@ -594,7 +594,7 @@
HShiftsID: "0",
HICMOBillNo: "",
HICMOInterID: "0",
- HICMOEntryID: "1",
+ HICMOEntryID: "0",
HICMOQty: "0",
HProcExchBillNo: "",
HProcExchInterID: "0",
@@ -1819,11 +1819,11 @@
return
}
// 鏍规嵁 鎻愪氦杩斿洖 鐨勬槸鍚﹀厑璁告樉绀烘彁绀轰俊鎭� 鍒ゆ柇鏄洿鎺ユ柊澧炲崟鎹繕鏄彁绀轰俊鎭�
- if(res.data.NotShowTips) {
+ if (res.data.NotShowTips) {
this.addNew()
return
}
-
+
uni.showModal({
title: "鎻愮ず",
content: res.data.Message + "銆傛槸鍚﹁繑鍥烇紵",
@@ -2136,6 +2136,18 @@
this.hform.HTakeSampleCheckBillNo = e.HBillNo;
this.hform.HTakeSampleCheckBillID = e.linterid;
//鍙栨牱鍗曟煡璇㈡暟鎹�
+ } else if (e.HSouceBillType == "3772") {
+ if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
+ this.HSourceBillType = "宸ュ簭娴佽浆鍗�"; // 鏄剧ず鍚嶇О
+ this.hform.HSourceBillType = "3772"; // 瀵瑰簲鐨勫��
+ this.hform.HSourceBillNo = e.HBillNo
+ }
+
+ this.hform.HProcExchBillNo = e.HBillNo
+ this.hform.HProcExchInterID = e.linterid
+ this.hform.HProcExchEntryID = e.hsubid
+
+ await this.LoadingInformation_ProcExchange(e.HBillNo)
}
} else if (this.operationType == 3) {
await this.RoadBillMain();
diff --git a/pages/baogong/DayPlanBillList.vue b/pages/baogong/DayPlanBillList.vue
index f7ba3d6..f23beb2 100644
--- a/pages/baogong/DayPlanBillList.vue
+++ b/pages/baogong/DayPlanBillList.vue
@@ -1,5 +1,39 @@
<template>
<view class="content">
+ <view class="list">
+ <uni-card :title="'褰撴湡璁㈠崟锛�'+currentOrder[0].HSourceBillNo"
+ style="margin: 10px;">
+ <view class="card-detail">
+ <view class="detail" v-if="currentOrder[0].HSourceName" style="width: 100%;">
+ <text>褰撳墠璁惧锛�</text>{{currentOrder[0].HSourceName}}
+ </view>
+ <view class="detail" v-if="currentOrder[0].棣栨娆℃暟?currentOrder[0].棣栨娆℃暟:0" style="width: 100%;">
+ <text>棣栨娆℃暟锛�</text>{{currentOrder[0].棣栨娆℃暟}}
+ </view>
+ <view class="detail">
+ <text>宸℃娆℃暟锛�</text>{{currentOrder[0].宸℃娆℃暟?currentOrder[0].宸℃娆℃暟:0}}
+ </view>
+ <view class="detail">
+ <text>杩囩▼妫�娆℃暟锛�</text>{{currentOrder[0].杩囩▼妫�娆℃暟?currentOrder[0].杩囩▼妫�娆℃暟:0}}
+ </view>
+ <view class="detail" v-if="currentOrder[0].褰撴棩鐐规瀹屾垚鎯呭喌">
+ <text>鐐规瀹屾垚鎯呭喌锛�</text>{{currentOrder[0].褰撴棩鐐规瀹屾垚鎯呭喌}}
+ </view>
+ <view class="detail" v-if="currentOrder[0].瀹夌伅鏈獙鏀舵暟閲�">
+ <text>寮傚父鍙嶉鏈獙鏀讹細</text>{{currentOrder[0].瀹夌伅鏈獙鏀舵暟閲弣}
+ <view style="width: 6rpx; display: inline-block;"></view>
+ <template v-if="currentOrder[0].瀹夌伅鏈獙鏀舵暟閲� == 0">
+ <uni-icons type="smallcircle-filled" size="12"
+ color="#13ad4c"></uni-icons>
+ </template>
+ <template v-else-if="currentOrder[0].瀹夌伅鏈獙鏀舵暟閲� != 0">
+ <uni-icons type="smallcircle-filled" size="12"
+ color="#e74c3c"></uni-icons>
+ </template>
+ </view>
+ </view>
+ </uni-card>
+ </view>
<view class="list" v-for="(item,index) in listData" :key="index">
<uni-card :title="'宸ュ崟鍙凤細'+item.HICMOBillNo" :extra="'鏃ユ湡锛�'+item.璁″垝鏃ユ湡" style="margin: 10px;" @tap="edit(item)">
<view class="card-detail">
@@ -40,8 +74,10 @@
</template>
<script>
- import { CommonUtils } from "../../utils/common";
-import {
+ import {
+ CommonUtils
+ } from "../../utils/common";
+ import {
getUserInfo
} from "@/utils/auth.js";
export default {
@@ -56,6 +92,7 @@
chooseIt: '',
popList: ['浜哄憳鍘熷洜', '璁惧鍘熷洜', '鏉愭枡鍘熷洜', '宸ヨ壓鍘熷洜', '妯″叿鍘熷洜', '娴嬭瘯鍘熷洜', '鐜鍘熷洜'],
badReasonBackTypeList: [],
+ currentOrder: [],
// 瀹氫箟鎿嶄綔鏄犲皠閰嶇疆
actionConfig: {
'寮�宸�': {
@@ -92,9 +129,30 @@
handler: 'handleICMOTechParam',
checkStatus: true,
denyMsg: '鍗曟嵁鐘舵�佷笉婊¤冻宸ヨ壓鍙傛暟鐐规鏉′欢!' // 鍥哄畾閿欒鎻愮ず
+ },
+ '棣栨': {
+ apiUrl: '',
+ type: '棣栨',
+ handler: 'handleFirstCheck',
+ checkStatus: false,
+ denyMsg: '鍗曟嵁鐘舵�佷笉婊¤冻宸ヨ壓鍙傛暟鐐规鏉′欢!'
+ },
+ '宸℃': {
+ apiUrl: '', // 宸℃闇�瑕佹鏌ラ浠舵槸鍚﹀畬鎴�
+ type: '宸℃',
+ handler: 'handlePatrolCheck',
+ checkStatus: false,
+ denyMsg: '鍗曟嵁鐘舵�佷笉婊¤冻宸℃鏉′欢!'
+ },
+ '鏈': {
+ apiUrl: '',
+ type: '鏈',
+ handler: 'handleProcessCheck',
+ checkStatus: false,
+ denyMsg: '鍗曟嵁鐘舵�佷笉婊¤冻鏈鏉′欢!'
}
}
- }
+ }
},
onLoad(e) {
console.log(e)
@@ -114,7 +172,7 @@
},
methods: {
async getErrMsgBackType() {
- try{
+ try {
let res = await CommonUtils.doRequest2Async({
url: '/Gy_BadReason/Gy_ErrMsgBackTypeList',
data: {
@@ -122,18 +180,22 @@
user: getUserInfo()['Czymc']
}
})
-
- let {data, count, Message} = res.data
- if(count == 1) {
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
this.popList = Array.from(data).map(item => item['寮傚父鍙嶉绫诲瀷鍚嶇О'])
this.badReasonBackTypeList = data
- }else {
+ } else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
message: `鑾峰彇寮傚父鍙嶉绫诲瀷澶辫触: ${Message}`
})
}
- }catch(err){
+ } catch (err) {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
message: `鑾峰彇寮傚父鍙嶉绫诲瀷澶辫触: ${err}`
@@ -150,6 +212,7 @@
if (res.data.count == 1) {
console.log(res.data.data.h_p_JIT_GetWorkBillListInfoBySource)
this.listData = res.data.data.h_p_JIT_GetWorkBillListInfoBySource
+ this.currentOrder = res.data.data.h_p_JIT_GetWorkBillListInfoBySource1
for (var i = 0; i < this.listData.length; i++) {
this.listData[i].percent = (this.listData[i].HDateFinishQty / this.listData[
i].HDatePlanQty).toFixed(4)
@@ -294,6 +357,27 @@
upData
)
},
+ handleFirstCheck(item, config) {
+ let uri = `?HSouceBillType=${item.HBillType}&HBillNo=${item.HICMOBillNo}` +
+ `&linterid=${item.HProcExchInterID}&hsubid=${item.HProcExchEntryID || 1}`
+ uni.navigateTo({
+ url: '/pages/ZLGL/shoujianjianyan/firstCheckBill' + uri + `&operationType=2`
+ })
+ },
+ handlePatrolCheck(item, config) {
+ let uri = `?HSouceBillType=${item.HBillType}&HBillNo=${item.HICMOBillNo}` +
+ `&linterid=${item.HProcExchInterID}&hsubid=${item.HProcExchEntryID || 1}`
+ uni.navigateTo({
+ url: '/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill' + uri + `&operationType=2`
+ })
+ },
+ handleProcessCheck(item, config) {
+ let uri = `?HSouceBillType=${item.HBillType}&HBillNo=${item.HICMOBillNo}` +
+ `&linterid=${item.HProcExchInterID}&hsubid=${item.HProcExchEntryID || 1}`
+ uni.navigateTo({
+ url: '/pages/ZLGL/mojianjianyan/ProcessCheckBill' + uri + `&operationType=2`
+ })
+ },
// 鍒涘缓閫氱敤鐨勮姹傛暟鎹�
createUpData(item) {
return {
@@ -406,10 +490,10 @@
mask: true
})
console.log('鎵ц鎿嶄綔鍙傛暟:', upData)
-
+
if (actionType == '宸ヨ壓鍙傛暟鐐规') {
uni.hideLoading()
- console.log('item: ',item);
+ console.log('item: ', item);
uni.navigateTo({
url: `/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit?hinterid=${item.HSourceInterID}&hsubid=${item.HSourceEntryID}&operationType=5`
})
@@ -426,8 +510,8 @@
title: `${actionType}鎴愬姛锛乣,
icon: 'success'
})
-
- if(actionType == '瀹屽伐') {
+
+ if (actionType == '瀹屽伐') {
// 瀹屽伐鍗曟彁浜ゆ垚鍔熷悗銆傛彁绀烘槸鍚﹂渶瑕佽烦杞揪鍒颁笅妯″崟
uni.showModal({
title: "璺宠浆椤甸潰",
@@ -443,7 +527,7 @@
}
}
})
-
+
}
} else {
uni.hideLoading()
diff --git a/pages/baogong/OA_ErrMsgBackBill.vue b/pages/baogong/OA_ErrMsgBackBill.vue
index 0620f09..493033f 100644
--- a/pages/baogong/OA_ErrMsgBackBill.vue
+++ b/pages/baogong/OA_ErrMsgBackBill.vue
@@ -1,1160 +1,1209 @@
<template>
- <view>
- <!-- 椤电鍖哄煙 -->
- <view class="tabs" id="tabs">
- <view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鍏朵粬淇℃伅</view>
- <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍒跺崟淇℃伅</view>
- </view>
- </view>
- <!-- 鍩烘湰淇℃伅 -->
- <template v-if="tabs == 0">
- <view class="form" :style="{height: containerHeight + 'px',overflow: 'auto' }">
- <view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
- <view class="righton">
- <input name="HBillNo" disabled v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁鏃ユ湡:</view>
- <view class="righton">
- <input name="HDate" disabled v-model="hform.HDate" placeholder="璇烽�夋嫨" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">涓婚:</view>
- <view class="right">
- <input name="HContext" v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
- </view>
- </view>
- <view class="form-item" style="align-items: flex-start;">
- <view class="title"><text>*</text>璇︾粏鍐呭:</view>
- <view class="right" style="min-height: 150rpx;">
- <textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1"
- placeholder="璇疯緭鍏ヨ缁嗗唴瀹�"></textarea>
- </view>
- </view>
- <view class="form-item">
- <view class="title">寮傚父绫诲瀷:</view>
- <view class="right">
- <uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="璇烽�夋嫨"
- v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍙戦�侀儴闂�:</view>
- <view class="right">
- <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
- @input="HDeptNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍙戦�佷汉:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鍙戦�佷汉" v-model="hform.HSendMan"
- @input="HSendManChange"></uni-combox>
- </view>
- </view>
+ <view>
+ <!-- 椤电鍖哄煙 -->
+ <view class="tabs" id="tabs">
+ <view class="tabs">
+ <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鍏朵粬淇℃伅</view>
+ <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍒跺崟淇℃伅</view>
+ </view>
+ </view>
+ <!-- 鍩烘湰淇℃伅 -->
+ <template v-if="tabs == 0">
+ <view class="form" :style="{height: containerHeight + 'px',overflow: 'auto' }">
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�:</view>
+ <view class="righton">
+ <input name="HBillNo" disabled v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鏃ユ湡:</view>
+ <view class="righton">
+ <input name="HDate" disabled v-model="hform.HDate" placeholder="璇烽�夋嫨" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">涓婚:</view>
+ <view class="right">
+ <input name="HContext" v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
+ </view>
+ </view>
+ <view class="form-item" style="align-items: flex-start;">
+ <view class="title"><text>*</text>璇︾粏鍐呭:</view>
+ <view class="right" style="min-height: 150rpx;">
+ <textarea disabled name="HDescription" v-model="dynamicDesc" auto-height maxlength="-1"
+ placeholder="璇疯緭鍏ヨ缁嗗唴瀹�"></textarea>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">寮傚父绫诲瀷:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="璇烽�夋嫨"
+ v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍙戦�侀儴闂�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+ @input="HDeptNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍙戦�佷汉:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鍙戦�佷汉" v-model="hform.HSendMan"
+ @input="HSendManChange"></uni-combox>
+ </view>
+ </view>
- <view class="form-item">
- <view class="title"><text>*</text>鎺ユ敹浜�:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎺ユ敹浜�" v-model="hform.HReceiveMan"
- @input="HReceiveManChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">澶勭悊浜�:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨澶勭悊浜�" v-model="hform.HHandleEmpName"
- @input="HHandleEmpNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">璐ｄ换浜�:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨璐ｄ换浜�" v-model="hform.HBadProcManName"
- @input="HBadProcManNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">闂鏉ユ簮:</view>
- <view class="right">
- <uni-combox :candidates="arrayHForm" placeholder="璇烽�夋嫨闂鏉ユ簮" v-model="hform.HForm"
- @input="HFormChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐢熶骇璧勬簮:</view>
- <view class="right">
- <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨" v-model="hform.HSourceName"
- @input="HSourceNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">杞﹂棿:</view>
- <view class="right">
- <uni-combox :candidates="arrayHCenterName" placeholder="璇烽�夋嫨" v-model="hform.HCenterName"
- @input="HCenterNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">浜у搧缂栫爜:</view>
- <view class="right">
- <input name="HMaterNumber" v-model="hform.HMaterNumber" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">浜у搧鍚嶇О:</view>
- <view class="right">
- <input name="HMaterName" v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">瑙勬牸鍨嬪彿:</view>
- <view class="right">
- <input name="HMaterModel" v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">娑夊強鏁伴噺:</view>
- <view class="right">
- <input name="HQty" type="number" v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐢熶骇鐝:</view>
- <view class="right">
- <uni-combox :candidates="arrayHShiftsName" placeholder="璇烽�夋嫨" v-model="hform.HShiftsName"
- @input="HShiftsNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">褰卞搷闈㈢▼搴�:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEffect" placeholder="璇烽�夋嫨褰卞搷闈㈢▼搴�" v-model="hform.HErrLev"
- @input="HEffectChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">澶囨敞:</view>
- <view class="right" style="min-height: 150rpx;">
- <input name="HRemark" v-model="hform.HRemark" placeholder="" />
- </view>
- </view>
- </view>
- </template>
- <!-- 鍏朵粬淇℃伅 -->
- <template v-if="tabs == 1">
- <view class="form">
- <view class="form-item">
- <view class="title">鎺ユ敹閮ㄩ棬:</view>
- <view class="right">
- <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HRecDeptName"
- @input="HRecDeptChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鎶勯�佷汉:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎶勯�佷汉" v-model="hform.HCopyMan"
- @input="HCopyManChange" multiple></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">QE璐ｄ换浜�:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨QE璐ｄ换浜�" v-model="hform.HQEManName"
- @input="HQEManNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">绱ф�ョ▼搴�:</view>
- <view class="right">
- <uni-combox :candidates="arrayHLevel" placeholder="璇烽�夋嫨绱ф�ョ▼搴�" v-model="hform.HLevel"
- @input="HLevelChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍙戦�佺被鍨�:</view>
- <view class="right">
- <uni-combox :candidates="arrayHSendType" placeholder="璇烽�夋嫨鍙戦�佺被鍨�" v-model="hform.HSendType"
- @input="HSendTypeChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍌績娆℃暟:</view>
- <view class="right">
- <input name="HHasten" type="number" v-model="hform.HHasten" placeholder="璇疯緭鍏ュ偓淇冩鏁�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍙樺寲鐐�:</view>
- <view class="right">
- <input name="HChangeNote" v-model="hform.HChangeNote" placeholder="璇疯緭鍏ュ彉鍖栫偣" />
- </view>
- </view>
+ <view class="form-item">
+ <view class="title"><text>*</text>鎺ユ敹浜�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎺ユ敹浜�" v-model="hform.HReceiveMan"
+ @input="HReceiveManChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">澶勭悊浜�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨澶勭悊浜�" v-model="hform.HHandleEmpName"
+ @input="HHandleEmpNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璐ｄ换浜�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨璐ｄ换浜�" v-model="hform.HBadProcManName"
+ @input="HBadProcManNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">闂鏉ユ簮:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHForm" placeholder="璇烽�夋嫨闂鏉ユ簮" v-model="hform.HForm"
+ @input="HFormChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇璧勬簮:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨" v-model="hform.HSourceName"
+ @input="HSourceNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">杞﹂棿:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHCenterName" placeholder="璇烽�夋嫨" v-model="hform.HCenterName"
+ @input="HCenterNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浜у搧缂栫爜:</view>
+ <view class="right">
+ <input name="HMaterNumber" v-model="hform.HMaterNumber" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浜у搧鍚嶇О:</view>
+ <view class="right">
+ <input name="HMaterName" v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瑙勬牸鍨嬪彿:</view>
+ <view class="right">
+ <input name="HMaterModel" v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">娑夊強鏁伴噺:</view>
+ <view class="right">
+ <input name="HQty" type="number" v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇鐝:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHShiftsName" placeholder="璇烽�夋嫨" v-model="hform.HShiftsName"
+ @input="HShiftsNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">褰卞搷闈㈢▼搴�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEffect" placeholder="璇烽�夋嫨褰卞搷闈㈢▼搴�" v-model="hform.HErrLev"
+ @input="HEffectChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">澶囨敞:</view>
+ <view class="right" style="min-height: 150rpx;">
+ <input name="HRemark" v-model="hform.HRemark" placeholder="" />
+ </view>
+ </view>
+ </view>
+ </template>
+ <!-- 鍏朵粬淇℃伅 -->
+ <template v-if="tabs == 1">
+ <view class="form">
+ <view class="form-item">
+ <view class="title">鎺ユ敹閮ㄩ棬:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HRecDeptName"
+ @input="HRecDeptChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鎶勯�佷汉:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎶勯�佷汉" v-model="hform.HCopyMan"
+ @input="HCopyManChange" multiple></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">QE璐ｄ换浜�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨QE璐ｄ换浜�" v-model="hform.HQEManName"
+ @input="HQEManNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">绱ф�ョ▼搴�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHLevel" placeholder="璇烽�夋嫨绱ф�ョ▼搴�" v-model="hform.HLevel"
+ @input="HLevelChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍙戦�佺被鍨�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHSendType" placeholder="璇烽�夋嫨鍙戦�佺被鍨�" v-model="hform.HSendType"
+ @input="HSendTypeChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍌績娆℃暟:</view>
+ <view class="right">
+ <input name="HHasten" type="number" v-model="hform.HHasten" placeholder="璇疯緭鍏ュ偓淇冩鏁�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍙樺寲鐐�:</view>
+ <view class="right">
+ <input name="HChangeNote" v-model="hform.HChangeNote" placeholder="璇疯緭鍏ュ彉鍖栫偣" />
+ </view>
+ </view>
- <view class="form-item">
- <view class="title">鍗曟嵁绫诲瀷:</view>
- <view class="righton">
- <input name="HBillTypeName" disabled v-model="hform.HBillTypeName" placeholder="璇疯緭鍏ュ崟鎹被鍨�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁鍙风爜:</view>
- <view class="righton">
- <input name="HPlanBillNo" disabled v-model="hform.HPlanBillNo" placeholder="璇疯緭鍏ュ崟鎹彿鐮�" />
- </view>
- </view>
- </view>
- </template>
- <!-- 鍒跺崟淇℃伅 -->
- <template v-if="tabs == 2">
- <view class="form">
- <view class="form-item">
- <view class="title">鍒跺崟浜�:</view>
- <view class="righton">
- <input v-model="hform.HMaker" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍒跺崟鏃ユ湡:</view>
- <view class="righton">
- <input name="HMakeDate" disabled v-model="hform.HMakeDate" placeholder="" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">淇敼浜�:</view>
- <view class="righton">
- <input v-model="hform.HUpDater" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">淇敼鏃ユ湡:</view>
- <view class="righton">
- <input name="HUpDateDate" disabled v-model="hform.HUpDateDate" placeholder="" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">瀹℃牳浜�:</view>
- <view class="righton">
- <input v-model="hform.HChecker" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">瀹℃牳鏃ユ湡:</view>
- <view class="righton">
- <input name="HCheckDate" disabled v-model="hform.HCheckDate" placeholder="" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">浣滃簾浜�:</view>
- <view class="righton">
- <input v-model="hform.HDeleteMan" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">浣滃簾鏃ユ湡:</view>
- <view class="righton">
- <input name="HDeleteDate" disabled v-model="hform.HDeleteDate" placeholder="" />
- </view>
- </view>
- </view>
- </template>
- <view class="buttons" id="buttons">
- <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>
- </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁绫诲瀷:</view>
+ <view class="righton">
+ <input name="HBillTypeName" disabled v-model="hform.HBillTypeName" placeholder="璇疯緭鍏ュ崟鎹被鍨�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙风爜:</view>
+ <view class="righton">
+ <input name="HPlanBillNo" disabled v-model="hform.HPlanBillNo" placeholder="璇疯緭鍏ュ崟鎹彿鐮�" />
+ </view>
+ </view>
+ </view>
+ </template>
+ <!-- 鍒跺崟淇℃伅 -->
+ <template v-if="tabs == 2">
+ <view class="form">
+ <view class="form-item">
+ <view class="title">鍒跺崟浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HMaker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍒跺崟鏃ユ湡:</view>
+ <view class="righton">
+ <input name="HMakeDate" disabled v-model="hform.HMakeDate" placeholder="" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HUpDater" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼鏃ユ湡:</view>
+ <view class="righton">
+ <input name="HUpDateDate" disabled v-model="hform.HUpDateDate" placeholder="" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HChecker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳鏃ユ湡:</view>
+ <view class="righton">
+ <input name="HCheckDate" disabled v-model="hform.HCheckDate" placeholder="" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HDeleteMan" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾鏃ユ湡:</view>
+ <view class="righton">
+ <input name="HDeleteDate" disabled v-model="hform.HDeleteDate" placeholder="" />
+ </view>
+ </view>
+ </view>
+ </template>
+ <view class="buttons" id="buttons">
+ <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>
+ </view>
</template>
<script>
- import dayjs from "dayjs";
- import {
- CommonUtils
- } from "@/utils/common";
- import getDateTime from '@/utils/getdateTime.js';
- import {
- getUserInfo
- } from "../../utils/auth";
- export default {
- data() {
- return {
- tabs: 0,
- tabsBottom: 0,
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- OperationType: 1,
- refSav: "",
+ import dayjs from "dayjs";
+ import {
+ CommonUtils
+ } from "@/utils/common";
+ import getDateTime from '@/utils/getdateTime.js';
+ import {
+ getUserInfo
+ } from "../../utils/auth";
+ export default {
+ data() {
+ return {
+ tabs: 0,
+ tabsBottom: 0,
+ userInfo: getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ OperationType: 1,
+ refSav: "",
- arrayHLevel: ['鏅��', '绱ф��'],
- arrayHForm: ['浜�', '鏈�', '鏂�', '娉�', '鐜�', '娴�'],
- arrayHEffect: ['鍋滅嚎', '鎵归噺涓嶈壇', '鍋跺彂涓嶈壇', '鏃犳硶鍒ゆ柇'],
- arrayHSendType: ['鍏叡', '涓汉'],
+ arrayHLevel: ['鏅��', '绱ф��'],
+ arrayHForm: ['浜�', '鏈�', '鏂�', '娉�', '鐜�', '娴�'],
+ arrayHEffect: ['鍋滅嚎', '鎵归噺涓嶈壇', '鍋跺彂涓嶈壇', '鏃犳硶鍒ゆ柇'],
+ arrayHSendType: ['鍏叡', '涓汉'],
- // 浜哄憳鐩稿叧鏁扮粍
- arrayHEmpName: [], // 鎺ユ敹浜� 鍙戦�佷汉 澶勭悊浜� 璐ｄ换浜� 鎶勯�佷汉 QE璐ｄ换浜�
- HEmpNameList: [],
+ // 浜哄憳鐩稿叧鏁扮粍
+ arrayHEmpName: [], // 鎺ユ敹浜� 鍙戦�佷汉 澶勭悊浜� 璐ｄ换浜� 鎶勯�佷汉 QE璐ｄ换浜�
+ HEmpNameList: [],
- // 鍏朵粬鏁扮粍
- arrayHDeptName: [], // 鎺ユ敹銆佸彂閫侀儴闂�
- HDeptNameList: [],
- arrayHErrMsgBackTypeName: [], // 寮傚父鍙嶉绫诲瀷
- HErrMsgBackTypeNameList: [],
- arrayHSourceName: [], //鐢熶骇璧勬簮
- HSourceNameList: [],
- arrayHCenterName: [], //宸ヤ綔涓績
- HCenterNameList: [],
- arrayHShiftsName: [], //鐢熶骇鐝
- HShiftsNameList: [],
+ // 鍏朵粬鏁扮粍
+ arrayHDeptName: [], // 鎺ユ敹銆佸彂閫侀儴闂�
+ HDeptNameList: [],
+ arrayHErrMsgBackTypeName: [], // 寮傚父鍙嶉绫诲瀷
+ HErrMsgBackTypeNameList: [],
+ arrayHSourceName: [], //鐢熶骇璧勬簮
+ HSourceNameList: [],
+ arrayHCenterName: [], //宸ヤ綔涓績
+ HCenterNameList: [],
+ arrayHShiftsName: [], //鐢熶骇鐝
+ HShiftsNameList: [],
- isEdit: false,
- eData: {
- HICMOBillNo: '',
- HSourceName: '',
- HSourceBillNo: '',
- HType: '',
- OperationType: '',
- linterid: '',
- HSouceBillType: '',
- },
+ isEdit: false,
+ eData: {
+ HICMOBillNo: '',
+ HSourceName: '',
+ HSourceBillNo: '',
+ HType: '',
+ OperationType: '',
+ linterid: '',
+ HSouceBillType: '',
+ },
- hform: {
- HBillNo: '',
- HInterID: '',
- HDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
- HContext: '',
- HDescription: '',
- HRemark: '',
+ hform: {
+ HBillNo: '',
+ HInterID: '',
+ HDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+ HContext: '',
+ HDescription: '',
+ HRemark: '',
- HErrMsgBackTypeName: '',
- HErrMsgBackTypeID: '0',
- HDeptName: getUserInfo().HDeptName,
- HDeptID: getUserInfo().HDeptID,
- HSendMan: getUserInfo().Czymc,
- HReceiveMan: '',
- HHandleEmpName: '',
- HHandleEmpID: '0',
- HCopyMan: '',
- HBadProcManName: '',
- HBadProcMan: '0',
- HQEManName: '',
- HQEMan: '0',
- HRecDeptName: getUserInfo().HDeptName,
- HRecDeptID: getUserInfo().HDeptID,
+ HErrMsgBackTypeName: '',
+ HErrMsgBackTypeID: '0',
+ HDeptName: getUserInfo().HDeptName,
+ HDeptID: getUserInfo().HDeptID,
+ HSendMan: getUserInfo().Czymc,
+ HReceiveMan: '',
+ HHandleEmpName: '',
+ HHandleEmpID: '0',
+ HCopyMan: '',
+ HBadProcManName: '',
+ HBadProcMan: '0',
+ HQEManName: '',
+ HQEMan: '0',
+ HRecDeptName: getUserInfo().HDeptName,
+ HRecDeptID: getUserInfo().HDeptID,
- HLevel: '鏅��',
- HBillTypeName: '',
- HPlanBillNo: '',
- HMaterNumber: '',
- HMaterName: '',
- HMaterModel: '',
+ HLevel: '鏅��',
+ HBillTypeName: '',
+ HPlanBillNo: '',
+ HMaterNumber: '',
+ HMaterName: '',
+ HMaterModel: '',
- // 鏂版坊鍔犵殑瀛楁
- HHasten: 0, // 鍌績娆℃暟
- HChangeNote: '', // 鍙樺寲鐐�
- HShiftsName: '', // 鐢熶骇鐝
- HShiftsID: '0', // 鐢熶骇鐝ID
- HErrLev: '', // 褰卞搷闈㈢▼搴�
- HForm: '浜�', // 闂鏉ユ簮
- HSendType: '鍏叡', // 鍙戦�佺被鍨�
- HReTransmitMan: '', // 杞彂鑷�
- HSourceName: '', // 鐢熶骇璧勬簮
- HSourceID: '0', // 鐢熶骇璧勬簮ID
- HCenterName: getUserInfo().HWorkCenterName, // 杞﹂棿
- HCenterID: getUserInfo().HWorkCenterID, // 杞﹂棿ID
- HQty: 0, // 鏁伴噺
- HDeleteMan: '', // 浣滃簾浜�
- HDeleteDate: '', // 浣滃簾鏃ユ湡
+ // 鏂版坊鍔犵殑瀛楁
+ HHasten: 0, // 鍌績娆℃暟
+ HChangeNote: '', // 鍙樺寲鐐�
+ HShiftsName: '', // 鐢熶骇鐝
+ HShiftsID: '0', // 鐢熶骇鐝ID
+ HErrLev: '', // 褰卞搷闈㈢▼搴�
+ HForm: '浜�', // 闂鏉ユ簮
+ HSendType: '鍏叡', // 鍙戦�佺被鍨�
+ HReTransmitMan: '', // 杞彂鑷�
+ HSourceName: '', // 鐢熶骇璧勬簮
+ HSourceID: '0', // 鐢熶骇璧勬簮ID
+ HCenterName: getUserInfo().HWorkCenterName, // 杞﹂棿
+ HCenterID: getUserInfo().HWorkCenterID, // 杞﹂棿ID
+ HQty: 0, // 鏁伴噺
+ HDeleteMan: '', // 浣滃簾浜�
+ HDeleteDate: '', // 浣滃簾鏃ユ湡
- HMainSourceBillNo: '',
- HMainSourceInterID: '0',
- HMainSourceEntryID: '0',
- HMainSourceBillType: '',
+ HMainSourceBillNo: '',
+ HMainSourceInterID: '0',
+ HMainSourceEntryID: '0',
+ HMainSourceBillType: '',
- HMaker: getUserInfo().Czymc,
- HMakeDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
- HUpDater: '',
- HUpDateDate: '',
- HChecker: '',
- HCheckDate: '',
- }
- }
- },
- onLoad(e) {
- this.getListData()
- if (!e.OperationType) {
- this.OperationType = 1
- } else {
- this.OperationType = e.OperationType
- }
+ HMaker: getUserInfo().Czymc,
+ HMakeDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+ HUpDater: '',
+ HUpDateDate: '',
+ HChecker: '',
+ HCheckDate: '',
+ }
+ }
+ },
+ onLoad(e) {
+ this.getListData()
+ if (!e.OperationType) {
+ this.OperationType = 1
+ } else {
+ this.OperationType = e.OperationType
+ }
- if (this.OperationType == 1) {
- // 鏂板
- this.getMaxNum()
- } else if (this.OperationType == 2) {
- // 鏈夋簮鍗�
- this.getMaxNum()
- } else if (this.OperationType == 3) {
- // 缂栬緫
- this.getEditData(e.hmainid)
- } else if (this.OperationType == 4) {
- // 鎶ュ伐鍙拌烦杞�
- this.getMaxNum()
- this.set_Sc_ICMOBillStatus(e.HSourceBillNo, e.HType, e.HSourceName); //鍥炲～淇℃伅
- this.hform.HContext = e.HType
- }
- },
- computed: {
- containerHeight: {
- get() {
- return this.btnTop - this.tabsBottom - 5
- }
- }
- },
- onReady() {
- const query = uni.createSelectorQuery().in(this)
- query.select("#buttons")
- .boundingClientRect()
- .select("#tabs")
- .boundingClientRect()
- .exec(res => {
- this.btnTop = Math.floor(res[0].top)
- this.tabsBottom = Math.ceil(res[1].bottom)
- })
- },
- methods: {
- //閫夋嫨鍙戦�侀儴闂�
- HDeptNameChange(e) {
- for (var i = 0; i < this.HDeptNameList.length; i++) {
- if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
- this.hform.HDeptID = this.HDeptNameList[i].HItemID;
- break;
- }
- }
- },
- //閫夋嫨鎺ユ敹閮ㄩ棬
- HRecDeptNameChange(e) {
- for (var i = 0; i < this.HDeptNameList.length; i++) {
- if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
- this.hform.HRecDeptID = this.HDeptNameList[i].HItemID;
- break;
- }
- }
- },
- //閫夋嫨寮傚父鍙嶉绫诲瀷
- HErrMsgBackTypeNameChange(e) {
- for (var i = 0; i < this.HErrMsgBackTypeNameList.length; i++) {
- if (this.HErrMsgBackTypeNameList[i].寮傚父鍙嶉绫诲瀷鍚嶇О == e) {
- this.hform.HErrMsgBackTypeName = this.HErrMsgBackTypeNameList[i].寮傚父鍙嶉绫诲瀷鍚嶇О;
- this.hform.HErrMsgBackTypeID = this.HErrMsgBackTypeNameList[i].HItemID;
- break;
- }
- }
- },
- //閫夋嫨鍙戦�佷汉
- HSendManChange(e) {
- for (var i = 0; i < this.HEmpNameList.length; i++) {
- if (this.HEmpNameList[i].HName == e) {
+ if (this.OperationType == 1) {
+ // 鏂板
+ this.getMaxNum()
+ } else if (this.OperationType == 2) {
+ // 鏈夋簮鍗�
+ this.getMaxNum()
+ } else if (this.OperationType == 3) {
+ // 缂栬緫
+ this.getEditData(e.hmainid)
+ } else if (this.OperationType == 4) {
+ // 鎶ュ伐鍙拌烦杞�
+ console.log('e: ', e);
+ this.getMaxNum()
+ this.set_Sc_ICMOBillStatus(e.HSourceBillNo, e.HType, e.HSourceName); //鍥炲～淇℃伅
+ this.hform.HContext = e.HType
+ this.eData = e
+ }
+ },
+ computed: {
+ containerHeight: {
+ get() {
+ return this.btnTop - this.tabsBottom - 5
+ }
+ },
+ dynamicDesc: {
+ get() {
+ return '寮傚父鍙嶉鍗曞彿:' + this.hform.HBillNo + ',寮傚父绫诲瀷:' + this.eData.HType + ',璁㈠崟鍙�:' + this
+ .eData.HICMOBillNo + ',娴佽浆鍗″彿:' + this.eData.HICMOBillNo +
+ ', 浜у搧缂栫爜:' + this.hform.HMaterNumber + ',浜у搧鍚嶇О:' + this.hform.HMaterName + ',瑙勬牸鍨嬪彿:' + this
+ .hform.HMaterModel +
+ ',鍙戦�佷汉:' + this.hform.HMaker + ',鍙戠敓鏃堕棿:' + this.hform.HDate + ',鐢熶骇璧勬簮:' + this.hform
+ .HSourceName + ',璁惧缂栫爜:' + this.hform.EquipNumber + ',瀵瑰簲澶勭悊浜�:' + this.hform.HHandleEmpName
+ }
+ }
+ },
+ onReady() {
+ const query = uni.createSelectorQuery().in(this)
+ query.select("#buttons")
+ .boundingClientRect()
+ .select("#tabs")
+ .boundingClientRect()
+ .exec(res => {
+ this.btnTop = Math.floor(res[0].top)
+ this.tabsBottom = Math.ceil(res[1].bottom)
+ })
+ },
+ methods: {
+ //閫夋嫨鍙戦�侀儴闂�
+ HDeptNameChange(e) {
+ for (var i = 0; i < this.HDeptNameList.length; i++) {
+ if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+ this.hform.HDeptID = this.HDeptNameList[i].HItemID;
+ break;
+ }
+ }
+ },
+ //閫夋嫨鎺ユ敹閮ㄩ棬
+ HRecDeptNameChange(e) {
+ for (var i = 0; i < this.HDeptNameList.length; i++) {
+ if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+ this.hform.HRecDeptID = this.HDeptNameList[i].HItemID;
+ break;
+ }
+ }
+ },
+ //閫夋嫨寮傚父鍙嶉绫诲瀷
+ HErrMsgBackTypeNameChange(e) {
+ for (var i = 0; i < this.HErrMsgBackTypeNameList.length; i++) {
+ if (this.HErrMsgBackTypeNameList[i].寮傚父鍙嶉绫诲瀷鍚嶇О == e) {
+ this.hform.HErrMsgBackTypeName = this.HErrMsgBackTypeNameList[i].寮傚父鍙嶉绫诲瀷鍚嶇О;
+ this.hform.HErrMsgBackTypeID = this.HErrMsgBackTypeNameList[i].HItemID;
+ break;
+ }
+ }
+ },
+ //閫夋嫨鍙戦�佷汉
+ HSendManChange(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
- }
- }
- },
- //閫夋嫨鎺ユ敹浜�
- HReceiveManChange(e) {
- for (var i = 0; i < this.HEmpNameList.length; i++) {
- if (this.HEmpNameList[i].HName == e) {
+ }
+ }
+ },
+ //閫夋嫨鎺ユ敹浜�
+ HReceiveManChange(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+ this.hform.HReceiveMan = e
+ }
+ }
+ },
+ //閫夋嫨澶勭悊浜�
+ HHandleEmpNameChange(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+ this.hform.HHandleEmpName = e
+ this.hform.HHandleEmpID = this.HEmpNameList[i].HItemID
+ }
+ }
+ },
+ //閫夋嫨鎶勯�佷汉
+ HCopyManChange(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
- }
- }
- },
- //閫夋嫨澶勭悊浜�
- HHandleEmpNameChange(e) {
- for (var i = 0; i < this.HEmpNameList.length; i++) {
- if (this.HEmpNameList[i].HName == e) {
- this.hform.HHandleEmpID = this.HEmpNameList[i].HItemID
- }
- }
- },
- //閫夋嫨鎶勯�佷汉
- HCopyManChange(e) {
- for (var i = 0; i < this.HEmpNameList.length; i++) {
- if (this.HEmpNameList[i].HName == e) {
+ }
+ }
+ },
+ //閫夋嫨鎶勯�佷汉
+ HBadProcManNameChange(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+ this.hform.HBadProcManName = e
+ this.hform.HBadProcMan = this.HEmpNameList[i].HItemID
+ }
+ }
+ },
+ //閫夋嫨QE璐ｄ换浜�
+ HQEManNameChange(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+ this.hform.HQEMan = this.HEmpNameList[i].HItemID
+ }
+ }
+ },
+ //閫夋嫨鐢熶骇璧勬簮
+ HSourceNameChange(e) {
+ for (var i = 0; i < this.HSourceNameList.length; i++) {
+ if (this.HSourceNameList[i].鐢熶骇璧勬簮 == e) {
+ this.hform.HSourceName = this.HSourceNameList[i].鐢熶骇璧勬簮;
+ this.hform.HSourceID = this.HSourceNameList[i].HItemID;
+ break;
+ }
+ }
+ },
+ //閫夋嫨杞﹂棿
+ HCenterNameChange(e) {
+ for (var i = 0; i < this.HCenterNameList.length; i++) {
+ if (this.HCenterNameList[i].宸ヤ綔涓績 == e) {
+ this.hform.HCenterName = this.HCenterNameList[i].宸ヤ綔涓績;
+ this.hform.HCenterID = this.HCenterNameList[i].HItemID;
+ break;
+ }
+ }
+ },
+ //閫夋嫨鐢熶骇鐝
+ HShiftsNameChange(e) {
+ for (var i = 0; i < this.HShiftsNameList.length; i++) {
+ if (this.HShiftsNameList[i].鐝鍚嶇О == e) {
+ this.hform.HShiftsName = this.HShiftsNameList[i].鐝鍚嶇О;
+ this.hform.HShiftsID = this.HShiftsNameList[i].HItemID;
+ break;
+ }
+ }
+ },
+ // 闈欐�佷笅鎷夋閫夋嫨鏂规硶
+ HLevelChange(e) {
+ this.hform.HLevel = e;
+ },
+ HFormChange(e) {
+ this.hform.HForm = e;
+ },
+ HEffectChange(e) {
+ this.hform.HErrLev = e;
+ },
+ HSendTypeChange(e) {
+ this.hform.HSendType = e;
+ },
+ //鏂板鎸夐挳浜嬩欢
+ addNew() {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛岀‘瀹氳鏂板鍚楋紵',
+ success: (res) => {
+ if (res.confirm) {
+ uni.redirectTo({
+ url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill?operationType=1'
+ })
+ // 閲嶆柊鑾峰彇鏈�澶у崟鎹彿
+ this.getMaxNum();
+ // 鍒囨崲鍒板熀鏈俊鎭〉绛�
+ this.tabs = 0;
+ }
+ }
+ });
+ },
+ // 鑾峰彇鎵�鏈夊垪琛ㄦ暟鎹�
+ async getListData() {
+ // 鑾峰彇閮ㄩ棬鍒楄〃
+ await this.getDepartmentList();
+ // 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
+ await this.getHErrMesTypeList();
+ // 鑾峰彇浜哄憳鍒楄〃锛堟帴鏀朵汉銆佸鐞嗕汉銆佹妱閫佷汉銆佽矗浠讳汉銆丵E璐ｄ换浜猴級
+ await this.getPersonList();
+ // 鑾峰彇鐢熶骇璧勬簮鍒楄〃
+ await this.getSourceList();
+ // 鑾峰彇杞﹂棿鍒楄〃
+ await this.getCenterList();
+ // 鑾峰彇鐢熶骇鐝鍒楄〃
+ await this.getShiftsList();
+ },
- }
- }
- },
- //閫夋嫨鎶勯�佷汉
- HBadProcManNameChange(e) {
- for (var i = 0; i < this.HEmpNameList.length; i++) {
- if (this.HEmpNameList[i].HName == e) {
- this.hform.HBadProcMan = this.HEmpNameList[i].HItemID
- }
- }
- },
- //閫夋嫨QE璐ｄ换浜�
- HQEManNameChange(e) {
- for (var i = 0; i < this.HEmpNameList.length; i++) {
- if (this.HEmpNameList[i].HName == e) {
- this.hform.HQEMan = this.HEmpNameList[i].HItemID
- }
- }
- },
- //閫夋嫨鐢熶骇璧勬簮
- HSourceNameChange(e) {
- for (var i = 0; i < this.HSourceNameList.length; i++) {
- if (this.HSourceNameList[i].鐢熶骇璧勬簮 == e) {
- this.hform.HSourceName = this.HSourceNameList[i].鐢熶骇璧勬簮;
- this.hform.HSourceID = this.HSourceNameList[i].HItemID;
- break;
- }
- }
- },
- //閫夋嫨杞﹂棿
- HCenterNameChange(e) {
- for (var i = 0; i < this.HCenterNameList.length; i++) {
- if (this.HCenterNameList[i].宸ヤ綔涓績 == e) {
- this.hform.HCenterName = this.HCenterNameList[i].宸ヤ綔涓績;
- this.hform.HCenterID = this.HCenterNameList[i].HItemID;
- break;
- }
- }
- },
- //閫夋嫨鐢熶骇鐝
- HShiftsNameChange(e) {
- for (var i = 0; i < this.HShiftsNameList.length; i++) {
- if (this.HShiftsNameList[i].鐝鍚嶇О == e) {
- this.hform.HShiftsName = this.HShiftsNameList[i].鐝鍚嶇О;
- this.hform.HShiftsID = this.HShiftsNameList[i].HItemID;
- break;
- }
- }
- },
- // 闈欐�佷笅鎷夋閫夋嫨鏂规硶
- HLevelChange(e) {
- this.hform.HLevel = e;
- },
- HFormChange(e) {
- this.hform.HForm = e;
- },
- HEffectChange(e) {
- this.hform.HErrLev = e;
- },
- HSendTypeChange(e) {
- this.hform.HSendType = e;
- },
- //鏂板鎸夐挳浜嬩欢
- addNew() {
- uni.showModal({
- title: '鎻愮ず',
- content: '鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛岀‘瀹氳鏂板鍚楋紵',
- success: (res) => {
- if (res.confirm) {
- uni.redirectTo({
- url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill?operationType=1'
- })
- // 閲嶆柊鑾峰彇鏈�澶у崟鎹彿
- this.getMaxNum();
- // 鍒囨崲鍒板熀鏈俊鎭〉绛�
- this.tabs = 0;
- }
- }
- });
- },
- // 鑾峰彇鎵�鏈夊垪琛ㄦ暟鎹�
- async getListData() {
- // 鑾峰彇閮ㄩ棬鍒楄〃
- await this.getDepartmentList();
- // 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
- await this.getHErrMesTypeList();
- // 鑾峰彇浜哄憳鍒楄〃锛堟帴鏀朵汉銆佸鐞嗕汉銆佹妱閫佷汉銆佽矗浠讳汉銆丵E璐ｄ换浜猴級
- await this.getPersonList();
- // 鑾峰彇鐢熶骇璧勬簮鍒楄〃
- await this.getSourceList();
- // 鑾峰彇杞﹂棿鍒楄〃
- await this.getCenterList();
- // 鑾峰彇鐢熶骇鐝鍒楄〃
- await this.getShiftsList();
- },
+ // 鑾峰彇閮ㄩ棬鍒楄〃
+ getDepartmentList() {
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: this.serverUrl + '/Gy_Department/list',
+ data: {
+ sWhere: "",
+ user: uni.getStorageSync('HUserName'),
+ Organization: uni.getStorageSync('Organization')
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.HDeptNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+ }
+ this.$forceUpdate();
+ resolve();
+ } else {
+ uni.showToast({
+ title: '鑾峰彇閮ㄩ棬淇℃伅澶辫触',
+ icon: 'none'
+ })
+ reject();
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇閮ㄩ棬淇℃伅澶辫触',
+ icon: 'none'
+ })
+ reject();
+ },
+ });
+ });
+ },
- // 鑾峰彇閮ㄩ棬鍒楄〃
- getDepartmentList() {
- return new Promise((resolve, reject) => {
- uni.request({
- url: this.serverUrl + '/Gy_Department/list',
- data: {
- sWhere: "",
- user: uni.getStorageSync('HUserName'),
- Organization: uni.getStorageSync('Organization')
- },
- success: (res) => {
- if (res.data.count == 1) {
- this.HDeptNameList = res.data.data
- for (var i = 0; i < res.data.data.length; i++) {
- this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
- }
- this.$forceUpdate();
- resolve();
- } else {
- uni.showToast({
- title: '鑾峰彇閮ㄩ棬淇℃伅澶辫触',
- icon: 'none'
- })
- reject();
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鑾峰彇閮ㄩ棬淇℃伅澶辫触',
- icon: 'none'
- })
- reject();
- },
- });
- });
- },
+ // 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
+ getHErrMesTypeList() {
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: this.serverUrl + '/Web/GetGy_ErrMsgBackTypeList_Json',
+ data: {
+ ErrMsg: "",
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.HErrMsgBackTypeNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHErrMsgBackTypeName[i] = res.data.data[i].寮傚父鍙嶉绫诲瀷鍚嶇О
+ }
+ this.$forceUpdate();
+ resolve();
+ } else {
+ uni.showToast({
+ title: '鑾峰彇寮傚父鍙嶉绫诲瀷淇℃伅澶辫触',
+ icon: 'none'
+ })
+ reject();
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇寮傚父鍙嶉绫诲瀷淇℃伅澶辫触',
+ icon: 'none'
+ })
+ reject();
+ },
+ });
+ });
+ },
- // 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
- getHErrMesTypeList() {
- return new Promise((resolve, reject) => {
- uni.request({
- url: this.serverUrl + '/Web/GetGy_ErrMsgBackTypeList_Json',
- data: {
- ErrMsg: "",
- },
- success: (res) => {
- if (res.data.count == 1) {
- this.HErrMsgBackTypeNameList = res.data.data
- for (var i = 0; i < res.data.data.length; i++) {
- this.arrayHErrMsgBackTypeName[i] = res.data.data[i].寮傚父鍙嶉绫诲瀷鍚嶇О
- }
- this.$forceUpdate();
- resolve();
- } else {
- uni.showToast({
- title: '鑾峰彇寮傚父鍙嶉绫诲瀷淇℃伅澶辫触',
- icon: 'none'
- })
- reject();
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鑾峰彇寮傚父鍙嶉绫诲瀷淇℃伅澶辫触',
- icon: 'none'
- })
- reject();
- },
- });
- });
- },
-
- // 鑾峰彇浜哄憳鍒楄〃锛堥�氱敤鏂规硶锛�
- getPersonList() {
- console.log('uni.getStorageSync("HDeptID"): ',uni.getStorageSync("HDeptID"));
- return new Promise((resolve, reject) => {
- uni.request({
- url: this.serverUrl + '/Web/GetEmployeeList_Json',
- data: {
- Employee: '',
- HGroupID: 0,
+ // 鑾峰彇浜哄憳鍒楄〃锛堥�氱敤鏂规硶锛�
+ getPersonList() {
+ console.log('uni.getStorageSync("HDeptID"): ', uni.getStorageSync("HDeptID"));
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: this.serverUrl + '/Web/GetEmployeeList_Json',
+ data: {
+ Employee: '',
+ HGroupID: 0,
HDeptID: uni.getStorageSync("HDeptID")
- },
- success: (res) => {
- if (res.data.count == 1) {
- this.HEmpNameList = res.data.data
- for (var i = 0; i < res.data.data.length; i++) {
- this.arrayHEmpName[i] = res.data.data[i].HName
- }
- this.$forceUpdate();
- resolve(); // 鎴愬姛鏃秗esolve
- } else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- reject(res.data.Message); // 澶辫触鏃秗eject
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- reject(res); // 澶辫触鏃秗eject
- },
- });
- });
- },
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.HEmpNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHEmpName[i] = res.data.data[i].HName
+ }
+ this.$forceUpdate();
+ resolve(); // 鎴愬姛鏃秗esolve
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ reject(res.data.Message); // 澶辫触鏃秗eject
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ reject(res); // 澶辫触鏃秗eject
+ },
+ });
+ });
+ },
- // 鑾峰彇鐢熶骇璧勬簮鍒楄〃
- getSourceList() {
- return new Promise((resolve, reject) => {
- uni.request({
- url: this.serverUrl + '/api/newBill/getSourceList',
- data: {
- sWhere: ""
- },
- success: (res) => {
- if (res.data.code == 1) {
- this.HSourceNameList = res.data.data.Gy_Source
- for (var i = 0; i < res.data.data.Gy_Source.length; i++) {
- this.arrayHSourceName[i] = res.data.data.Gy_Source[i].鐢熶骇璧勬簮
- }
- this.$forceUpdate();
- resolve();
- } else {
- uni.showToast({
- title: '鑾峰彇鐢熶骇璧勬簮鍒楄〃澶辫触',
- icon: 'none'
- })
- reject();
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鑾峰彇鐢熶骇璧勬簮鍒楄〃澶辫触',
- icon: 'none'
- })
- reject();
- },
- });
- });
- },
+ // 鑾峰彇鐢熶骇璧勬簮鍒楄〃
+ getSourceList() {
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: this.serverUrl + '/api/newBill/getSourceList',
+ data: {
+ sWhere: ""
+ },
+ success: (res) => {
+ if (res.data.code == 1) {
+ this.HSourceNameList = res.data.data.Gy_Source
+ for (var i = 0; i < res.data.data.Gy_Source.length; i++) {
+ this.arrayHSourceName[i] = res.data.data.Gy_Source[i].鐢熶骇璧勬簮
+ }
+ this.$forceUpdate();
+ resolve();
+ } else {
+ uni.showToast({
+ title: '鑾峰彇鐢熶骇璧勬簮鍒楄〃澶辫触',
+ icon: 'none'
+ })
+ reject();
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇鐢熶骇璧勬簮鍒楄〃澶辫触',
+ icon: 'none'
+ })
+ reject();
+ },
+ });
+ });
+ },
- // 鑾峰彇宸ヤ綔涓績鍒楄〃
- getCenterList() {
- return new Promise((resolve, reject) => {
- uni.request({
- url: this.serverUrl + '/api/newBill/getWorkCenterList',
- data: {
- sWhere: ""
- },
- success: (res) => {
- if (res.data.code == 1) {
- this.HCenterNameList = res.data.data.Gy_WorkCenter
- for (var i = 0; i < res.data.data.Gy_WorkCenter.length; i++) {
- this.arrayHCenterName[i] = res.data.data.Gy_WorkCenter[i].宸ヤ綔涓績
- }
- this.$forceUpdate();
- resolve();
- } else {
- uni.showToast({
- title: '鑾峰彇杞﹂棿鍒楄〃澶辫触',
- icon: 'none'
- })
- reject();
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鑾峰彇杞﹂棿鍒楄〃澶辫触',
- icon: 'none'
- })
- reject();
- },
- });
- });
- },
+ // 鑾峰彇宸ヤ綔涓績鍒楄〃
+ getCenterList() {
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: this.serverUrl + '/api/newBill/getWorkCenterList',
+ data: {
+ sWhere: ""
+ },
+ success: (res) => {
+ if (res.data.code == 1) {
+ this.HCenterNameList = res.data.data.Gy_WorkCenter
+ for (var i = 0; i < res.data.data.Gy_WorkCenter.length; i++) {
+ this.arrayHCenterName[i] = res.data.data.Gy_WorkCenter[i].宸ヤ綔涓績
+ }
+ this.$forceUpdate();
+ resolve();
+ } else {
+ uni.showToast({
+ title: '鑾峰彇杞﹂棿鍒楄〃澶辫触',
+ icon: 'none'
+ })
+ reject();
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇杞﹂棿鍒楄〃澶辫触',
+ icon: 'none'
+ })
+ reject();
+ },
+ });
+ });
+ },
- // 鑾峰彇鐢熶骇鐝鍒楄〃
- getShiftsList() {
- return new Promise((resolve, reject) => {
- uni.request({
- url: this.serverUrl + '/Gy_ShiftsController/Get_Gy_WorkShiftList',
- data: {
- sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}'`,
- HMaker: getUserInfo()["Czymc"],
- },
- success: (res) => {
- if (res.data.count == 1) {
- this.HShiftsNameList = res.data.data
- for (var i = 0; i < res.data.data.length; i++) {
- this.arrayHShiftsName[i] = res.data.data[i].鐝鍚嶇О
- }
- this.$forceUpdate();
- resolve();
- } else {
- uni.showToast({
- title: '鑾峰彇鐢熶骇鐝鍒楄〃澶辫触',
- icon: 'none'
- })
- reject();
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鑾峰彇鐢熶骇鐝鍒楄〃澶辫触',
- icon: 'none'
- })
- reject();
- },
- });
- });
- },
- //鏂板
- getMaxNum() {
- uni.request({
- url: this.serverUrl + '/Web/GetMAXNum',
- data: {
- HBillType: '4502'
- },
- success: (res) => {
- if (res.data.count == 1) {
- this.hform.HInterID = res.data.data[0].HInterID
- this.hform.HBillNo = res.data.data[0].HBillNo
- } else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- });
- },
- //鎶ュ伐鍙拌烦杞�
- set_Sc_ICMOBillStatus(HSourceBill, HType, HSourceName) {
- uni.request({
- url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_Sc_ICMOBillStatus',
- type: "GET",
- data: {
- "HSourceBill": HSourceBill
- },
- success: (res) => {
- if (res.data.count == 1) {
- this.hform.HMaterNumber = res.data.data[0].鐗╂枡浠ｇ爜 //浜у搧鍚嶇О
- this.hform.HMaterName = res.data.data[0].鐗╂枡鍚嶇О //浜у搧鍚嶇О
- this.hform.HMaterModel = res.data.data[0].瑙勬牸鍨嬪彿 //浜у搧瑙勬牸
- this.hform.HMainSourceBillNo = res.data.data[0].娴佽浆鍗″彿 //婧愬崟鍗曞彿
- this.hform.HMainSourceInterID = res.data.data[0].娴佽浆鍗′富鍐呯爜 //婧愬崟涓诲唴鐮�
- this.hform.HMainSourceEntryID = res.data.data[0].娴佽浆鍗″瓙鍐呯爜 //婧愬崟瀛愬唴鐮�
- this.hform.HMainSourceBillType = 3772 //婧愬崟绫诲瀷
- this.hform.HQty = res.data.data[0].璁″垝鏁伴噺 //璁″垝鏁伴噺
- this.hform.HSourceID = res.data.data[0].HSourceID //鐢熶骇璧勬簮id
- this.hform.HSourceName = res.data.data[0].鐢熶骇璧勬簮 //鐢熶骇璧勬簮
- } else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- });
- uni.request({
- url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_ErrMsgBackType',
- type: "GET",
- data: {
- "TypeName": HType
- },
- success: (res) => {
- var data = res.data.data[0]
- if (res.data.count == 1) {
- this.hform.HErrMsgBackTypeID = data.HItemID
- this.hform.HErrMsgBackTypeName = data.HName
- } else {
- uni.showToast({
- title: '鑾峰彇寮傚父绫诲瀷鏁版嵁澶辫触',
- icon: 'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鑾峰彇寮傚父绫诲瀷澶辫触',
- icon: 'none'
- })
- },
- });
- uni.request({
- url: this.serverUrl + '/Sc_MESTransFerWorkBill/set_EquipFile',
- type: "GET",
- data: {
- "HSourceName": HSourceName
- },
- success: (res) => {
- var data = res.data.data[0]
- console.log(res.data)
- if (res.data.count == 1) {
- this.hform.EquipNumber = data.璁惧缂栫爜
- } else {
- uni.showToast({
- title: '鑾峰彇璁惧缂栫爜澶辫触',
- icon: 'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鑾峰彇璁惧缂栫爜澶辫触',
- icon: 'none'
- })
- },
- });
+ // 鑾峰彇鐢熶骇鐝鍒楄〃
+ getShiftsList() {
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: this.serverUrl + '/Gy_ShiftsController/Get_Gy_WorkShiftList',
+ data: {
+ sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}'`,
+ HMaker: getUserInfo()["Czymc"],
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.HShiftsNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHShiftsName[i] = res.data.data[i].鐝鍚嶇О
+ }
+ this.$forceUpdate();
+ resolve();
+ } else {
+ uni.showToast({
+ title: '鑾峰彇鐢熶骇鐝鍒楄〃澶辫触',
+ icon: 'none'
+ })
+ reject();
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇鐢熶骇鐝鍒楄〃澶辫触',
+ icon: 'none'
+ })
+ reject();
+ },
+ });
+ });
+ },
+ //鏂板
+ getMaxNum() {
+ uni.request({
+ url: this.serverUrl + '/Web/GetMAXNum',
+ data: {
+ HBillType: '4502'
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.hform.HInterID = res.data.data[0].HInterID
+ this.hform.HBillNo = res.data.data[0].HBillNo
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //鎶ュ伐鍙拌烦杞�
+ set_Sc_ICMOBillStatus(HSourceBill, HType, HSourceName) {
+ uni.request({
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_Sc_ICMOBillStatus',
+ type: "GET",
+ data: {
+ "HSourceBill": HSourceBill
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.hform.HMaterNumber = res.data.data[0].鐗╂枡浠ｇ爜 //浜у搧鍚嶇О
+ this.hform.HMaterName = res.data.data[0].鐗╂枡鍚嶇О //浜у搧鍚嶇О
+ this.hform.HMaterModel = res.data.data[0].瑙勬牸鍨嬪彿 //浜у搧瑙勬牸
+ this.hform.HMainSourceBillNo = res.data.data[0].娴佽浆鍗″彿 //婧愬崟鍗曞彿
+ this.hform.HMainSourceInterID = res.data.data[0].娴佽浆鍗′富鍐呯爜 //婧愬崟涓诲唴鐮�
+ this.hform.HMainSourceEntryID = res.data.data[0].娴佽浆鍗″瓙鍐呯爜 //婧愬崟瀛愬唴鐮�
+ this.hform.HMainSourceBillType = 3772 //婧愬崟绫诲瀷
+ this.hform.HQty = res.data.data[0].璁″垝鏁伴噺 //璁″垝鏁伴噺
+ this.hform.HSourceID = res.data.data[0].HSourceID //鐢熶骇璧勬簮id
+ this.hform.HSourceName = res.data.data[0].鐢熶骇璧勬簮 //鐢熶骇璧勬簮
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ uni.request({
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_ErrMsgBackType',
+ type: "GET",
+ data: {
+ "TypeName": HType
+ },
+ success: (res) => {
+ var data = res.data.data[0]
+ if (res.data.count == 1) {
+ this.hform.HErrMsgBackTypeID = data.HItemID
+ this.hform.HErrMsgBackTypeName = data.HName
+ } else {
+ uni.showToast({
+ title: '鑾峰彇寮傚父绫诲瀷鏁版嵁澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇寮傚父绫诲瀷澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ uni.request({
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/set_EquipFile',
+ type: "GET",
+ data: {
+ "HSourceName": HSourceName
+ },
+ success: (res) => {
+ var data = res.data.data[0]
+ console.log(res.data)
+ if (res.data.count == 1) {
+ this.hform.EquipNumber = data.璁惧缂栫爜
- setTimeout(() => {
- uni.hideLoading()
- this.hform.HDescription = '寮傚父鍙嶉鍗曞彿:' + this.hform.HBillNo + ',寮傚父绫诲瀷:' + HType + ',璁㈠崟鍙�:' + this
- .eData.HICMOBillNo + ',娴佽浆鍗″彿:' + this.eData.HICMOBillNo +
- ', 浜у搧缂栫爜:' + this.hform.HMaterNumber + ',浜у搧鍚嶇О:' + this.hform.HMaterName + ',瑙勬牸鍨嬪彿:' + this
- .hform.HMaterModel +
- ',鍙戦�佷汉:' + this.hform.HMaker + ',鍙戠敓鏃堕棿:' + this.hform.HDate + ',鐢熶骇璧勬簮:' + this.hform
- .HSourceName + ',璁惧缂栫爜:' + this.hform.EquipNumber + ',瀵瑰簲澶勭悊浜�:' + this.hform.HHandleEmpName
- }, 1000)
- },
- //缂栬緫
- getEditData(HInterID) {
- uni.showLoading({
- title: '鍔犺浇涓�'
- });
- uni.request({
- url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_TransFerBillListCheckDetaiL_APP',
- data: {
- "HID": HInterID
- },
- success: (res) => {
- uni.hideLoading();
- console.log('缂栬緫鏁版嵁:', res);
- if (res.data.code == 1) {
- const data = res.data.data.OA_ErrMsgBackBillMain[0];
+ this.getEquipBindingEmpInfo()
+ } else {
+ uni.showToast({
+ title: '鑾峰彇璁惧缂栫爜澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇璁惧缂栫爜澶辫触',
+ icon: 'none'
+ })
+ },
+ });
- // 鏄犲皠瀛楁鍒� Vue 涓殑 hform
- this.hform = {
- ...this.hform, // 淇濈暀鍘熸湁鐨勯粯璁ゅ��
- HInterID: data.HInterID,
- HEntryID: data.HEntryID || '',
- HBillNo: data.HBillNo || '',
- HDate: data.HDate ? data.HDate.substr(0, 10) : dayjs(new Date()).format(
- "YYYY-MM-DD"),
- HErrMsgBackTypeName: data.HErrMsgBackTypeName || '',
- HErrMsgBackTypeID: data.HErrMsgBackTypeID || '0',
- HContext: data.HContext || '',
- HSendMan: data.HSendMan || '',
- HDeptID: data.HDeptID || '0',
- HDeptName: data.HDeptName || '',
- HRecDeptID: data.HRecDeptID || '0',
- HRecDeptName: data.HRecDeptName || '',
- HCenterID: data.HCenterID || '0',
- HCenterName: data.HCenterName || '',
- HReceiveMan: data.HReceiveMan || '',
- HCopyMan: data.HCopyMan || '',
- HMainSourceInterID: data.HSourceInterID || '0',
- HMainSourceEntryID: data.HSourceEntryID || '0',
- HMainSourceBillNo: data.HSourceBillNo || '',
- HMainSourceBillType: data.HSourceBillType || '',
- HHasten: data.HHasten || 0,
- HMaterNumber: data.HMaterNumber || '',
- HMaterName: data.HMaterName || '',
- HHandleEmpID: data.HHandleEmpID || '0',
- HHandleEmpName: data.HHandleEmpName || '',
- HMaterModel: data.HMaterModel || '',
- HQty: data.HQty || 0,
- HForm: data.HForm || '浜�',
- HChangeNote: data.HChangeNote || '',
- HNote: data.HNote || '',
- HBadProcMan: data.HBadProcMan || '0',
- HBadProcManName: data.HBadProcManName || '',
- HQEMan: data.HQEMan || '0',
- HQEManName: data.HQEManName || '',
- HSourceID: data.HSourceID || '0',
- HSourceName: data.HSourceName || '',
- HShiftsID: data.HShiftsID || '0',
- HShiftsName: data.HShiftsName || '',
- HDescription: data.HDescription || '',
- HRemark: data.HRemark || '',
- HLevel: data.HLevel || '鏅��',
- HSendType: data.HSendType || '鍏叡',
- HErrLev: data.HErrLev || '',
- HMaker: data.HMaker || userInfo.Czymc || '',
- HMakeDate: data.HMakeDate ? data.HMakeDate.substr(0, 10) : dayjs(
- new Date()).format("YYYY-MM-DD"),
- HUpDater: uni.getStorageSync('HUserName') || userInfo.Czymc || '',
- HUpDateDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HChecker: data.HChecker || '',
- HCheckDate: data.HCheckDate ? data.HCheckDate.substr(0, 10) : '',
- HCloseMan: data.HCloseMan || '',
- HCloseDate: data.HCloseDate ? data.HCloseDate.substr(0, 10) : '',
- HDeleteMan: data.HDeleteMan || '',
- HDeleteDate: data.HDeleteDate ? data.HDeleteDate.substr(0, 10) : '',
- };
+ setTimeout(() => {
+ uni.hideLoading()
+ }, 1000)
+ },
+ async getEquipBindingEmpInfo() {
+ // 鑾峰彇璁惧缁戝畾鑱屽憳淇℃伅
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Web/getEquipBindingEmp",
+ data: {
+ HEquipNumber: this.hform.EquipNumber
+ }
+ })
- // 璁剧疆鍒跺崟浜轰俊鎭紙濡傛灉涓虹┖鍒欎娇鐢ㄥ綋鍓嶇敤鎴凤級
- if (!this.hform.HMaker) {
- this.hform.HMaker = getUserInfo().Czymc;
- }
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ let data0 = data[0]
+ this.HReceiveManChange(data0["HMouldEmpName"])
+ this.HHandleEmpNameChange(data0["HMouldManagerName"])
+ this.HBadProcManNameChange(data0["HEquipUseEmpName"])
+ this.hform.HReceiveMan = data0["HMouldEmpName"]
+ this.hform.HHandleEmpName = data0["HMouldManagerName"]
+ this.hform.HHandleEmpID = data0["HMouldManagerID"]
+ this.hform.HBadProcMan = data0["HEquipUseEmpID"]
+ this.hform.HBadProcManName = data0["HEquipUseEmpName"]
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇璁惧缁戝畾鑱屽憳淇℃伅寮傚父: ${Message}`
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇璁惧缁戝畾鑱屽憳淇℃伅寮傚父: ${err}`
+ })
+ }
+ },
+ //缂栬緫
+ getEditData(HInterID) {
+ uni.showLoading({
+ title: '鍔犺浇涓�'
+ });
+ uni.request({
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_TransFerBillListCheckDetaiL_APP',
+ data: {
+ "HID": HInterID
+ },
+ success: (res) => {
+ uni.hideLoading();
+ console.log('缂栬緫鏁版嵁:', res);
+ if (res.data.code == 1) {
+ const data = res.data.data.OA_ErrMsgBackBillMain[0];
- // 璁剧疆淇敼浜轰俊鎭�
- if (!this.hform.HUpDater) {
- this.hform.HUpDater = uni.getStorageSync('HUserName') || '';
- }
+ // 鏄犲皠瀛楁鍒� Vue 涓殑 hform
+ this.hform = {
+ ...this.hform, // 淇濈暀鍘熸湁鐨勯粯璁ゅ��
+ HInterID: data.HInterID,
+ HEntryID: data.HEntryID || '',
+ HBillNo: data.HBillNo || '',
+ HDate: data.HDate ? data.HDate.substr(0, 10) : dayjs(new Date()).format(
+ "YYYY-MM-DD"),
+ HErrMsgBackTypeName: data.HErrMsgBackTypeName || '',
+ HErrMsgBackTypeID: data.HErrMsgBackTypeID || '0',
+ HContext: data.HContext || '',
+ HSendMan: data.HSendMan || '',
+ HDeptID: data.HDeptID || '0',
+ HDeptName: data.HDeptName || '',
+ HRecDeptID: data.HRecDeptID || '0',
+ HRecDeptName: data.HRecDeptName || '',
+ HCenterID: data.HCenterID || '0',
+ HCenterName: data.HCenterName || '',
+ HReceiveMan: data.HReceiveMan || '',
+ HCopyMan: data.HCopyMan || '',
+ HMainSourceInterID: data.HSourceInterID || '0',
+ HMainSourceEntryID: data.HSourceEntryID || '0',
+ HMainSourceBillNo: data.HSourceBillNo || '',
+ HMainSourceBillType: data.HSourceBillType || '',
+ HHasten: data.HHasten || 0,
+ HMaterNumber: data.HMaterNumber || '',
+ HMaterName: data.HMaterName || '',
+ HHandleEmpID: data.HHandleEmpID || '0',
+ HHandleEmpName: data.HHandleEmpName || '',
+ HMaterModel: data.HMaterModel || '',
+ HQty: data.HQty || 0,
+ HForm: data.HForm || '浜�',
+ HChangeNote: data.HChangeNote || '',
+ HNote: data.HNote || '',
+ HBadProcMan: data.HBadProcMan || '0',
+ HBadProcManName: data.HBadProcManName || '',
+ HQEMan: data.HQEMan || '0',
+ HQEManName: data.HQEManName || '',
+ HSourceID: data.HSourceID || '0',
+ HSourceName: data.HSourceName || '',
+ HShiftsID: data.HShiftsID || '0',
+ HShiftsName: data.HShiftsName || '',
+ HDescription: data.HDescription || '',
+ HRemark: data.HRemark || '',
+ HLevel: data.HLevel || '鏅��',
+ HSendType: data.HSendType || '鍏叡',
+ HErrLev: data.HErrLev || '',
+ HMaker: data.HMaker || userInfo.Czymc || '',
+ HMakeDate: data.HMakeDate ? data.HMakeDate.substr(0, 10) : dayjs(
+ new Date()).format("YYYY-MM-DD"),
+ HUpDater: uni.getStorageSync('HUserName') || userInfo.Czymc || '',
+ HUpDateDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HChecker: data.HChecker || '',
+ HCheckDate: data.HCheckDate ? data.HCheckDate.substr(0, 10) : '',
+ HCloseMan: data.HCloseMan || '',
+ HCloseDate: data.HCloseDate ? data.HCloseDate.substr(0, 10) : '',
+ HDeleteMan: data.HDeleteMan || '',
+ HDeleteDate: data.HDeleteDate ? data.HDeleteDate.substr(0, 10) : '',
+ };
- // 璁剧疆鍏朵粬瀛楁锛堝鏋滈渶瑕佸湪鐣岄潰涓婃樉绀猴級
- if (this.hform.HMainSourceBillNo) {
- this.hform.HPlanBillNo = this.hform.HMainSourceBillNo;
- this.hform.HBillTypeName = this.hform.HMainSourceBillType;
- }
+ // 璁剧疆鍒跺崟浜轰俊鎭紙濡傛灉涓虹┖鍒欎娇鐢ㄥ綋鍓嶇敤鎴凤級
+ if (!this.hform.HMaker) {
+ this.hform.HMaker = getUserInfo().Czymc;
+ }
- this.isEdit = true;
- } else {
- uni.showToast({
- title: res.data.msg || '鑾峰彇缂栬緫鏁版嵁澶辫触',
- icon: 'none'
- });
- }
- },
- fail: (res) => {
- uni.hideLoading();
- console.log('缂栬緫鏁版嵁璇锋眰澶辫触:', res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- });
- }
- });
- },
- //淇濆瓨
- submit() {
- if (!this.hform.HReceiveMan) {
- uni.showToast({
- title: '璇烽�夋嫨鎺ユ敹浜�',
- icon: 'none'
- })
- } else {
- uni.showLoading({
- title: '璇风◢鍊�'
- })
- if (this.OperationType == 1 || this.OperationType == 2 || this.OperationType == 4) {
- this.refSav = "Add";
- }
- //鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
- if (this.OperationType == 3) {
- this.refSav = "Update";
- this.hform.HUpdater = getUserInfo().Czymc;
- this.hform.HUpdaterDate = dayjs(new Date()).format("YYYY-MM-DD");
- }
- var sMainStr = JSON.stringify(this.hform);
- var sMainSub = sMainStr + ';' + uni.getStorageSync('HUserName') + ';' + this.refSav
- uni.request({
- url: this.serverUrl + '/Sc_MESTransFerWorkBill/SaveGetMESTransFerWorkFrom_APP',
- method: 'POST',
- dataType: "json",
- data: {
- "msg": sMainSub
- },
- success: (res) => {
- console.log(1, res);
- uni.hideLoading()
- if (res.data.count == 1) {
- if (res.data.Verify == "Y") { //鑷姩瀹℃牳
- this.SaveVerify(res.data.HInterID) //瀹℃牳
- } else {
- uni.showModal({
- title: '鎻愮ず',
- content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.redirectTo({
- url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill?operationType=1'
- })
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
- }
- }
- });
- }
- }
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- });
- }
- },
+ // 璁剧疆淇敼浜轰俊鎭�
+ if (!this.hform.HUpDater) {
+ this.hform.HUpDater = uni.getStorageSync('HUserName') || '';
+ }
- SaveVerify(HInterID) {
- var datas = {
- HInterID: HInterID,
- IsAudit: 0,
- CurUserName: getUserInfo().Czymc
- }
- uni.request({
- url: this.serverUrl + '/Sc_MESTransFerWorkBill/AuditTransFerReportList',
- method: 'GET',
- dataType: "json",
- async: true,
- data: datas,
- success: (res) => {
- uni.showModal({
- title: '鎻愮ず',
- content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.redirectTo({
- url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill?operationType=1'
- })
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
- }
- }
- });
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- });
- },
+ // 璁剧疆鍏朵粬瀛楁锛堝鏋滈渶瑕佸湪鐣岄潰涓婃樉绀猴級
+ if (this.hform.HMainSourceBillNo) {
+ this.hform.HPlanBillNo = this.hform.HMainSourceBillNo;
+ this.hform.HBillTypeName = this.hform.HMainSourceBillType;
+ }
- goBack() {
- uni.navigateBack()
- }
- }
- }
+ this.isEdit = true;
+ } else {
+ uni.showToast({
+ title: res.data.msg || '鑾峰彇缂栬緫鏁版嵁澶辫触',
+ icon: 'none'
+ });
+ }
+ },
+ fail: (res) => {
+ uni.hideLoading();
+ console.log('缂栬緫鏁版嵁璇锋眰澶辫触:', res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ });
+ }
+ });
+ },
+ //淇濆瓨
+ submit() {
+ if (!this.hform.HReceiveMan) {
+ uni.showToast({
+ title: '璇烽�夋嫨鎺ユ敹浜�',
+ icon: 'none'
+ })
+ } else {
+ this.hform.HDescription = this.dynamicDesc
+ uni.showLoading({
+ title: '璇风◢鍊�'
+ })
+ if (this.OperationType == 1 || this.OperationType == 2 || this.OperationType == 4) {
+ this.refSav = "Add";
+ }
+ //鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+ if (this.OperationType == 3) {
+ this.refSav = "Update";
+ this.hform.HUpdater = getUserInfo().Czymc;
+ this.hform.HUpdaterDate = dayjs(new Date()).format("YYYY-MM-DD");
+ }
+ var sMainStr = JSON.stringify(this.hform);
+ var sMainSub = sMainStr + ';' + uni.getStorageSync('HUserName') + ';' + this.refSav
+ uni.request({
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/SaveGetMESTransFerWorkFrom_APP',
+ method: 'POST',
+ dataType: "json",
+ data: {
+ "msg": sMainSub
+ },
+ success: (res) => {
+ console.log(1, res);
+ uni.hideLoading()
+ if (res.data.count == 1) {
+ if (res.data.Verify == "Y") { //鑷姩瀹℃牳
+ this.SaveVerify(res.data.HInterID) //瀹℃牳
+ } else {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill?operationType=1'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
+ }
+ });
+ }
+ }
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ }
+ },
+
+ SaveVerify(HInterID) {
+ var datas = {
+ HInterID: HInterID,
+ IsAudit: 0,
+ CurUserName: getUserInfo().Czymc
+ }
+ uni.request({
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/AuditTransFerReportList',
+ method: 'GET',
+ dataType: "json",
+ async: true,
+ data: datas,
+ success: (res) => {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill?operationType=1'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
+ }
+ });
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+
+ goBack() {
+ uni.navigateBack()
+ }
+ }
+ }
</script>
<style lang="scss">
diff --git a/pages/caigouruku/POStockInBill.vue b/pages/caigouruku/POStockInBill.vue
index 14f994a..17a731c 100644
--- a/pages/caigouruku/POStockInBill.vue
+++ b/pages/caigouruku/POStockInBill.vue
@@ -26,7 +26,9 @@
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t(`Gy.HStockPlaceName`) == "Gy.HStockPlaceName"?"浠撲綅": $t(`Gy.HStockPlaceName`) }}:</view>
+ <view class="title">
+ {{ $t(`Gy.HStockPlaceName`) == "Gy.HStockPlaceName"?"浠撲綅": $t(`Gy.HStockPlaceName`) }}:
+ </view>
<view class="right" v-show="true">
<uni-combox :candidates="arrayHStockPlaceNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
@@ -37,15 +39,25 @@
</view>
<view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">{{ $t(`Gy.SourceBillSelect`) == "Gy.SourceBillSelect"?"閫夋嫨婧愬崟": $t(`Gy.SourceBillSelect`) }}</view>
- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">{{ $t(`Gy.TableHeaderInfo`) == "Gy.TableHeaderInfo"?"琛ㄥご淇℃伅": $t(`Gy.TableHeaderInfo`) }}</view>
- <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">{{ $t(`Gy.MaterInfo`) == "Gy.MaterInfo"?"鐗╂枡淇℃伅": $t(`Gy.MaterInfo`) }}</view>
- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">{{ $t(`Gy.BarCodeInfo`) == "Gy.BarCodeInfo"?"鏉＄爜淇℃伅": $t(`Gy.BarCodeInfo`) }}</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">
+ {{ $t(`Gy.SourceBillSelect`) == "Gy.SourceBillSelect"?"閫夋嫨婧愬崟": $t(`Gy.SourceBillSelect`) }}
+ </view>
+ <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">
+ {{ $t(`Gy.TableHeaderInfo`) == "Gy.TableHeaderInfo"?"琛ㄥご淇℃伅": $t(`Gy.TableHeaderInfo`) }}
+ </view>
+ <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">
+ {{ $t(`Gy.MaterInfo`) == "Gy.MaterInfo"?"鐗╂枡淇℃伅": $t(`Gy.MaterInfo`) }}
+ </view>
+ <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">
+ {{ $t(`Gy.BarCodeInfo`) == "Gy.BarCodeInfo"?"鏉＄爜淇℃伅": $t(`Gy.BarCodeInfo`) }}
+ </view>
</view>
<view v-if="tabs == 0">
<view class="form-item">
- <view class="title">{{ $t(`Gy.HMainSourceBillType`) == "Gy.HMainSourceBillType"?"婧愬崟绫诲瀷": $t(`Gy.HMainSourceBillType`) }}:</view>
+ <view class="title">
+ {{ $t(`Gy.HMainSourceBillType`) == "Gy.HMainSourceBillType"?"婧愬崟绫诲瀷": $t(`Gy.HMainSourceBillType`) }}:
+ </view>
<view class="right" v-show="showHMainSourceBillType">
<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
@change="HMainSourceBillTypeChange">
@@ -60,7 +72,9 @@
</view>
</view>
<view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="title">
+ {{$t(`Gy.HMainSourceBillNo`) == "Gy.HMainSourceBillNo"?"婧愬崟鍗曞彿": $t(`Gy.HMainSourceBillNo`) }}:
+ </view>
<view class="right" v-show="showHSourceBillNo">
<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
@@ -69,8 +83,12 @@
</view>
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+ <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
+ </view>
+ <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
</view>
+
<view class="righton" v-show="!showHSourceBillNo">
<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
@@ -86,7 +104,7 @@
</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="璇烽�夋嫨鏃ユ湡" />
@@ -95,13 +113,13 @@
</view>
</view>
<view class="form-item">
- <view class="title">鍒跺崟浜�:</view>
+ <view class="title">{{ $t(`Gy.HMaker`) == "Gy.HMaker"?"鍒跺崟浜�": $t(`Gy.HMaker`) }}:</view>
<view class="righton">
<input name="HMaker" disabled v-model="hform.HMaker" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t(`Gy.HBillNo`) == "Gy.HBillNo"?"鍗曟嵁鍙�": $t(`Gy.HBillNo`) }}:</view>
<view class="righton">
<input name="HBillNo" disabled v-model="hform.HBillNo" />
</view>
@@ -159,45 +177,45 @@
<view v-if="tabs == 2">
<view class="list" v-for="(item,index) in Materlist" :key="index">
- <uni-card :title="item.鐗╂枡鍚嶇О" style="margin: 10px;" @tap="delMater(item, $event)">
- <!-- 鐗╂枡浠ｇ爜浣滀负鍙偣鍑婚摼鎺� -->
- <view class="card-header" @tap.stop="gotoInventoryQuery(item.鐗╂枡浠ｇ爜)">
- <text class="link-text">鐗╂枡浠ｇ爜锛歿{item.鐗╂枡浠ｇ爜}}</text>
- </view>
-
- <view class="card-detail">
- <view class="detail">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
- </view>
- <view class="detail">
- <text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
- </view>
- <view class="detail">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
- </view>
- <view class="detail">
- <text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
- </view>
- <view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
- </view>
- <view class="detail" v-if="item.杈呭姪灞炴��">
- <text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
- </view>
- <view class="detail" v-if="item.娆惧彿">
- <text>娆惧彿锛�</text>{{item.娆惧彿}}
- </view>
- <view class="detail" v-if="item.鍚堣鏁伴噺">
- <text>鍚堣鏁伴噺锛�</text>{{item.鍚堣鏁伴噺}}
- </view>
- <view class="detail" v-if="item.鍗曚环">
- <text>鍗曚环锛�</text>{{item.鍗曚环}}
- </view>
- <view class="detail" v-if="materMeta[0].HWHName && /鍏磋揪/.test(hform.HStockOrgName)">
- <text>浠撳簱锛�</text>{{materMeta[0].HWHName}}
- </view>
- </view>
- </uni-card>
+ <uni-card :title="item.鐗╂枡鍚嶇О" style="margin: 10px;" @tap="delMater(item, $event)">
+ <!-- 鐗╂枡浠ｇ爜浣滀负鍙偣鍑婚摼鎺� -->
+ <view class="card-header" @tap.stop="gotoInventoryQuery(item.鐗╂枡浠ｇ爜)">
+ <text class="link-text">鐗╂枡浠ｇ爜锛歿{item.鐗╂枡浠ｇ爜}}</text>
+ </view>
+
+ <view class="card-detail">
+ <view class="detail">
+ <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ </view>
+ <view class="detail">
+ <text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
+ </view>
+ <view class="detail">
+ <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ </view>
+ <view class="detail">
+ <text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
+ </view>
+ <view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+ <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ </view>
+ <view class="detail" v-if="item.杈呭姪灞炴��">
+ <text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+ </view>
+ <view class="detail" v-if="item.娆惧彿">
+ <text>娆惧彿锛�</text>{{item.娆惧彿}}
+ </view>
+ <view class="detail" v-if="item.鍚堣鏁伴噺">
+ <text>鍚堣鏁伴噺锛�</text>{{item.鍚堣鏁伴噺}}
+ </view>
+ <view class="detail" v-if="item.鍗曚环">
+ <text>鍗曚环锛�</text>{{item.鍗曚环}}
+ </view>
+ <view class="detail" v-if="materMeta[0].HWHName && /鍏磋揪/.test(hform.HStockOrgName)">
+ <text>浠撳簱锛�</text>{{materMeta[0].HWHName}}
+ </view>
+ </view>
+ </uni-card>
</view>
<view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
</view>
@@ -284,6 +302,7 @@
} from "@/utils/userRelationManager.js"
import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+import { MpaasScan } from '../../utils/mpaasScan';
export default {
data() {
return {
@@ -424,6 +443,11 @@
uni.$off('BillSelectComplete')
},
methods: {
+ toScanBillCode() {
+ MpaasScan.scanCode((res) => {
+ this.getHBarCodeData(res)
+ })
+ },
async HWHNameScan(e) {
return
// 鎵弿浠撳簱鐮�
@@ -523,7 +547,7 @@
this.hform.HBarCode = ""
})
},
-
+
//鎵爜
toScanCode() {
var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
@@ -803,7 +827,7 @@
if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
this.showHStockPlaceName = true
this.getStockPlaceRemote(this.HWHNameList[i]["HSPGroupID"])
- }
+ }
}
}
},
@@ -1543,30 +1567,30 @@
},
});
},
- gotoInventoryQuery(HMaterNumber) {
- console.log('璺宠浆鍒板簱瀛樻煡璇紝鐗╂枡浠ｇ爜锛�', HMaterNumber);
-
- // 浣跨敤uni.navigateTo璺宠浆鍒版柊椤甸潰
- uni.navigateTo({
- url: `/pages/jishikucunchaxun/table?OperationType=2&HMaterNumber=${HMaterNumber}`,
- success: (res) => {
- console.log('璺宠浆鎴愬姛');
- },
- fail: (err) => {
- console.error('璺宠浆澶辫触锛�', err);
- // 濡傛灉椤甸潰涓嶅瓨鍦紝鍙互璺宠浆鍒伴粯璁ら〉闈�
- uni.showToast({
- title: '鍔熻兘姝ｅ湪寮�鍙戜腑',
- icon: 'none'
- });
- }
- });
- },
+ gotoInventoryQuery(HMaterNumber) {
+ console.log('璺宠浆鍒板簱瀛樻煡璇紝鐗╂枡浠ｇ爜锛�', HMaterNumber);
+
+ // 浣跨敤uni.navigateTo璺宠浆鍒版柊椤甸潰
+ uni.navigateTo({
+ url: `/pages/jishikucunchaxun/table?OperationType=2&HMaterNumber=${HMaterNumber}`,
+ success: (res) => {
+ console.log('璺宠浆鎴愬姛');
+ },
+ fail: (err) => {
+ console.error('璺宠浆澶辫触锛�', err);
+ // 濡傛灉椤甸潰涓嶅瓨鍦紝鍙互璺宠浆鍒伴粯璁ら〉闈�
+ uni.showToast({
+ title: '鍔熻兘姝ｅ湪寮�鍙戜腑',
+ icon: 'none'
+ });
+ }
+ });
+ },
delMater(item) {
- if (event && event.target.classList && event.target.classList.contains('link-text')) {
- return; // 濡傛灉鏄摼鎺ョ偣鍑伙紝涓嶆墽琛屽垹闄�
- }
-
+ if (event && event.target.classList && event.target.classList.contains('link-text')) {
+ return; // 濡傛灉鏄摼鎺ョ偣鍑伙紝涓嶆墽琛屽垹闄�
+ }
+
uni.showModal({
title: '鎻愮ず',
content: '纭瑕佸垹闄� "' + item.鐗╂枡鍚嶇О + '" 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
@@ -2044,10 +2068,12 @@
color: #fff;
}
}
- /* 娣诲姞閾炬帴鏍峰紡 */
- .link-text {
- color: #3a78ff; /* 钃濊壊锛岀被浼艰秴閾炬帴 */
- }
+
+ /* 娣诲姞閾炬帴鏍峰紡 */
+ .link-text {
+ color: #3a78ff;
+ /* 钃濊壊锛岀被浼艰秴閾炬帴 */
+ }
.list {
width: 100%;
@@ -2067,10 +2093,10 @@
margin-right: 20rpx;
text {
- color: #999;
- font-size: 26rpx;
- }
-
+ color: #999;
+ font-size: 26rpx;
+ }
+
}
}
diff --git a/pages/caigoutuiliao/POStockInBackBill.vue b/pages/caigoutuiliao/POStockInBackBill.vue
index 959ec4c..7605161 100644
--- a/pages/caigoutuiliao/POStockInBackBill.vue
+++ b/pages/caigoutuiliao/POStockInBackBill.vue
@@ -2,9 +2,9 @@
<view>
<view class="form">
<view class="form-item">
- <view class="title">鏉＄爜:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.BarCode") == "POStockInBackBill_PDA.BarCode" ? "鏉＄爜" : $t("POStockInBackBill_PDA.BarCode") }}:</view>
<view class="right" style="width: 380rpx;">
- <input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜"
+ <input :focus="barCodeFocus" v-model="hform.HBarCode" :placeholder="placeholder_BarCode"
@confirm="getCode(hform.HBarCode)" />
</view>
<uni-icons type="scan"
@@ -12,39 +12,39 @@
size="20" @click="toScanCode"></uni-icons>
</view>
<view class="form-item">
- <view class="title">鏁伴噺:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.Qty") == "POStockInBackBill_PDA.Qty" ? "鏁伴噺" : $t("POStockInBackBill_PDA.Qty") }}:</view>
<view class="right">
- <input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
+ <input v-model="hform.HQty" :placeholder="placeholder_Qty" />
</view>
</view>
<view class="form-item">
- <view class="title">浠撳簱:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.Warehouse") == "POStockInBackBill_PDA.Warehouse" ? "浠撳簱" : $t("POStockInBackBill_PDA.Warehouse") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+ <uni-combox :candidates="arrayHWHName" :placeholder="placeholder_Warehouse" v-model="hform.HWHName"
@input="HWHNameChange" @confirm="HWHNameScan"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">浠撲綅:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.StockPlace") == "POStockInBackBill_PDA.StockPlace" ? "浠撲綅" : $t("POStockInBackBill_PDA.StockPlace") }}:</view>
<view class="right" v-show="showHStockPlaceName">
- <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+ <uni-combox :candidates="HStockPlaceNameListComputed" :placeholder="placeholder_SCStockPlace"
v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
@confirm="HStockPlaceNameScan"></uni-combox>
</view>
<view class="righton" v-show="!showHStockPlaceName"><input v-model="hform.HStockPlaceName"
- placeholder="涓嶅彲鎿嶄綔" disabled="" /></view>
+ :placeholder="unOperate" disabled="" /></view>
</view>
<view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
- <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鏉＄爜淇℃伅</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">{{ $t("POStockInBackBill_PDA.selectSource") == "POStockInBackBill_PDA.selectSource" ? "閫夋嫨婧愬崟" : $t("POStockInBackBill_PDA.selectSource") }}</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">{{ $t("POStockInBackBill_PDA.tableInfo") == "POStockInBackBill_PDA.tableInfo" ? "琛ㄥご淇℃伅" : $t("POStockInBackBill_PDA.tableInfo") }}</view>
+ <view :class="tabs == 2 ? 'on' : ''" @tap="tabs = 2">{{ $t("POStockInBackBill_PDA.materInfo") == "POStockInBackBill_PDA.materInfo" ? "鐗╂枡淇℃伅" : $t("POStockInBackBill_PDA.materInfo") }}</view>
+ <view :class="tabs == 3 ? 'on' : ''" @tap="tabs = 3">{{ $t("POStockInBackBill_PDA.barInfo") == "POStockInBackBill_PDA.barInfo" ? "鏉＄爜淇℃伅" : $t("POStockInBackBill_PDA.barInfo") }}</view>
</view>
<view v-if="tabs == 0">
<view class="form-item">
- <view class="title">婧愬崟绫诲瀷:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.SourceBillType") == "POStockInBackBill_PDA.SourceBillType" ? "婧愬崟绫诲瀷" : $t("POStockInBackBill_PDA.SourceBillType") }}:</view>
<view class="right" v-show="showHMainSourceBillType">
<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
@change="HMainSourceBillTypeChange">
@@ -59,7 +59,7 @@
</view>
</view>
<view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.SourceBillNo") == "POStockInBackBill_PDA.SourceBillNo" ? "婧愬崟鍗曞彿" : $t("POStockInBackBill_PDA.SourceBillNo") }}:</view>
<!-- <view class="right" v-show="showHSourceBillNo">
<uni-combox :isFocus="HSourceBillNoFocus" ref="uniComboxSourceBill"
:confirm-call="onSourceBillBlurHandler" v-if="reHSourceBillNo"
@@ -70,18 +70,21 @@
<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
<input :focus="HSourceBillNoFocus" @confirm="onSourceBillBlurHandler" type="text"
- name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ name="HSourceBillNo" v-model="hform.HSourceBillNo" :placeholder="placeholder_SourceBillNo" />
+ </view>
+ <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+ <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
</view>
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
</view>
<view class="righton" v-show="!showHSourceBillNo">
- <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" :placeholder="placeholder_SourceBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">鏃ユ湡:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.Date") == "POStockInBackBill_PDA.Date" ? "鏃ユ湡" : $t("POStockInBackBill_PDA.Date") }}:</view>
<view class="right">
<picker mode="date" v-model="hform.HDate" @change="HDateChange">
<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
@@ -90,13 +93,13 @@
</view>
</view>
<view class="form-item">
- <view class="title">鍒跺崟浜�:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.Maker") == "POStockInBackBill_PDA.Maker" ? "鍒跺崟浜�" : $t("POStockInBackBill_PDA.Maker") }}:</view>
<view class="righton">
<input name="HMaker" disabled v-model="hform.HMaker" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.BillNo") == "POStockInBackBill_PDA.BillNo" ? "鍗曟嵁鍙�" : $t("POStockInBackBill_PDA.BillNo") }}:</view>
<view class="righton">
<input name="HBillNo" disabled v-model="hform.HBillNo" />
</view>
@@ -105,7 +108,7 @@
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁ID:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.BillID") == "POStockInBackBill_PDA.BillID" ? "鍗曟嵁ID" : $t("POStockInBackBill_PDA.BillID") }}:</view>
<view class="righton">
<input name="HInterID" disabled v-model="hform.HInterID" />
</view>
@@ -114,38 +117,38 @@
<view v-if="tabs == 1">
<view class="form-item">
- <view class="title">淇濈:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.Keeper") == "POStockInBackBill_PDA.Keeper" ? "淇濈" : $t("POStockInBackBill_PDA.Keeper") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
+ <uni-combox :candidates="arrayHEmpName" :placeholder="placeholder_Keeper" v-model="hform.HKeeperName"
@input="HKeeperNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">楠屾敹:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.SecManager") == "POStockInBackBill_PDA.SecManager" ? "楠屾敹" : $t("POStockInBackBill_PDA.SecManager") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
+ <uni-combox :candidates="arrayHEmpName" :placeholder="placeholder_SecManager" v-model="hform.HSecManagerName"
@input="HSecManagerNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">閮ㄩ棬:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.Dept") == "POStockInBackBill_PDA.Dept" ? "閮ㄩ棬" : $t("POStockInBackBill_PDA.Dept") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+ <uni-combox :candidates="arrayHDeptName" :placeholder="placeholder_Dept" v-model="hform.HDeptName"
@input="HDeptNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">渚涘簲鍟�:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.Supplier") == "POStockInBackBill_PDA.Supplier" ? "渚涘簲鍟�" : $t("POStockInBackBill_PDA.Supplier") }}:</view>
<!-- <view class="right" v-show="showHSupName">
<uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" v-model="hform.HSupName"
@input="HSupNameChange"></uni-combox>
</view> -->
<view class="righton">
- <input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
+ <input name="HSupName" disabled v-model="hform.HSupName" :placeholder="placeholder_Supplier" />
</view>
</view>
<view class="form-item">
- <view class="title">缁勭粐:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.StockOrg") == "POStockInBackBill_PDA.StockOrg" ? "缁勭粐" : $t("POStockInBackBill_PDA.StockOrg") }}:</view>
<view class="righton">
<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
</view>
@@ -157,86 +160,86 @@
<uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠ｇ爜" style="margin: 10px;" @tap="delMater(item)">
<view class="card-detail">
<view class="detail">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("POStockInBackBill_PDA.table_SourceBillNo") == "POStockInBackBill_PDA.table_SourceBillNo" ? "婧愬崟鍗曞彿" : $t("POStockInBackBill_PDA.table_SourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail">
- <text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
+ <text>{{ $t("POStockInBackBill_PDA.table_SourceBillQty") == "POStockInBackBill_PDA.table_SourceBillQty" ? "婧愬崟鏁伴噺" : $t("POStockInBackBill_PDA.table_SourceBillQty") }}锛�</text>{{item.婧愬崟鏁伴噺}}
</view>
<view class="detail">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("POStockInBackBill_PDA.table_BarQty") == "POStockInBackBill_PDA.table_BarQty" ? "鏁伴噺" : $t("POStockInBackBill_PDA.table_BarQty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail">
- <text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
+ <text>{{ $t("POStockInBackBill_PDA.table_BarNum") == "POStockInBackBill_PDA.table_BarNum" ? "鏉＄爜涓暟" : $t("POStockInBackBill_PDA.table_BarNum") }}锛�</text>{{item.鏉＄爜涓暟}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ <text>{{ $t("POStockInBackBill_PDA.table_MaterModel") == "POStockInBackBill_PDA.table_MaterModel" ? "瑙勬牸鍨嬪彿" : $t("POStockInBackBill_PDA.table_MaterModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
<view class="detail" v-if="item.杈呭姪灞炴��">
- <text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+ <text>{{ $t("POStockInBackBill_PDA.table_Aux") == "POStockInBackBill_PDA.table_Aux" ? "杈呭姪灞炴��" : $t("POStockInBackBill_PDA.table_Aux") }}锛�</text>{{item.杈呭姪灞炴�}
</view>
<!-- 鍏磋揪瀹㈡埛 鍔熻兘 -->
<view class="detail" v-if="materMeta[0].HWHName && /鍏磋揪/.test(hform.HStockOrgName
)">
- <text>浠撳簱锛�</text>{{materMeta[0].HWHName}}
+ <text>{{ $t("POStockInBackBill_PDA.Warehouse") == "POStockInBackBill_PDA.Warehouse" ? "浠撳簱" : $t("POStockInBackBill_PDA.Warehouse") }}锛�</text>{{materMeta[0].HWHName}}
</view>
</view>
</uni-card>
</view>
- <view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="Materlist.length == 0">{{ $t("POStockInBackBill_PDA.noData") == "POStockInBackBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("POStockInBackBill_PDA.noData") }}</view>
</view>
<view v-if="tabs == 3">
<view class="form-item">
- <view class="title">鏉＄爜:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.BarCode") == "POStockInBackBill_PDA.BarCode" ? "鏉＄爜" : $t("POStockInBackBill_PDA.BarCode") }}:</view>
<view class="righton">
<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鐗╂枡:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.Material") == "POStockInBackBill_PDA.Material" ? "鐗╂枡" : $t("POStockInBackBill_PDA.Material") }}:</view>
<view class="righton">
<input disabled v-model="hform.HMaterName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">瑙勬牸:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.MaterModel") == "POStockInBackBill_PDA.MaterModel" ? "瑙勬牸" : $t("POStockInBackBill_PDA.MaterModel") }}:</view>
<view class="righton">
<input disabled v-model="hform.HMaterModel_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鎵规:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.BatchNo") == "POStockInBackBill_PDA.BatchNo" ? "鎵规" : $t("POStockInBackBill_PDA.BatchNo") }}:</view>
<view class="righton">
<input disabled v-model="hform.HBatchNo_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曚綅:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.Unit") == "POStockInBackBill_PDA.Unit" ? "鍗曚綅" : $t("POStockInBackBill_PDA.Unit") }}:</view>
<view class="righton">
<input disabled v-model="hform.HUnitName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鏁伴噺:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.Qty") == "POStockInBackBill_PDA.Qty" ? "鏁伴噺" : $t("POStockInBackBill_PDA.Qty") }}:</view>
<view class="righton">
<input disabled v-model="hform.HQty_B" />
</view>
</view>
<view class="form-item">
- <view class="title">瀹归噺:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.Capacity") == "POStockInBackBill_PDA.Capacity" ? "瀹归噺" : $t("POStockInBackBill_PDA.Capacity") }}:</view>
<view class="righton">
<input disabled v-model="hform.HTMQty_B" />
</view>
</view>
<view class="form-item">
- <view class="title">浠撳簱:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.Warehouse") == "POStockInBackBill_PDA.Warehouse" ? "浠撳簱" : $t("POStockInBackBill_PDA.Warehouse") }}:</view>
<view class="righton">
<input disabled v-model="hform.HWHName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">浠撲綅:</view>
+ <view class="title">{{ $t("POStockInBackBill_PDA.StockPlace") == "POStockInBackBill_PDA.StockPlace" ? "浠撲綅" : $t("POStockInBackBill_PDA.StockPlace") }}:</view>
<view class="righton">
<input disabled v-model="hform.HSPName_B" />
</view>
@@ -244,10 +247,10 @@
</view>
<view class="bottom-btn">
- <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button class="btn-a" size="mini" @tap="submit">{{ $t("POStockInBackBill_PDA.btnSubmit") == "POStockInBackBill_PDA.btnSubmit" ? "鎻愪氦" : $t("POStockInBackBill_PDA.btnSubmit") }}</button>
<view style="flex: 1;"></view>
- <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
- <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ <button class="btn-a" size="mini" @tap="addNew">{{ $t("POStockInBackBill_PDA.btnAdd") == "POStockInBackBill_PDA.btnAdd" ? "鏂板" : $t("POStockInBackBill_PDA.btnAdd") }}</button>
+ <button class="btn-c" size="mini" @tap="goBack">{{ $t("POStockInBackBill_PDA.btnExit") == "POStockInBackBill_PDA.btnExit" ? "閫�鍑�" : $t("POStockInBackBill_PDA.btnExit") }}</button>
</view>
</view>
<BillSelectPopupXiaoWeiVue v-if="enableModule == 1" ref="billList" :HBillType="hform.HBillType"
@@ -271,6 +274,7 @@
import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
import BillSelectPopupXiaoWeiVue from '../../components/BillSelectPopupXiaoWei/BillSelectPopupXiaoWei.vue';
+import { MpaasScan } from '../../utils/mpaasScan';
export default {
components: {
BillListPopupVue,
@@ -302,7 +306,8 @@
arrayHMainSourceBillType: ['閫�鏂欓�氱煡鍗�', '閲囪喘璁㈠崟', '閲囪喘鍏ュ簱鍗�',
'鎵嬪伐褰曞叆'
],
-
+ arrayHMainSourceBillValue: [1105, 1102, 1201, -1
+ ],
linterid: '',
HBillNo: '',
btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
@@ -364,7 +369,26 @@
HTMQty_B: '',
HWHName_B: '',
HSPName_B: '',
- }
+ },
+ placeholder_BarCode:this.$t("POStockInBackBill_PDA.placeholder_BarCode") == "POStockInBackBill_PDA.placeholder_BarCode" ? "璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" : this.$t("POStockInBackBill_PDA.placeholder_BarCode"),
+ placeholder_Qty:this.$t("POStockInBackBill_PDA.placeholder_Qty") == "POStockInBackBill_PDA.placeholder_Qty" ? "璇疯緭鍏ユ暟閲�" : this.$t("POStockInBackBill_PDA.placeholder_Qty"),
+ placeholder_DCWarehouse:this.$t("POStockInBackBill_PDA.placeholder_DCWarehouse") == "POStockInBackBill_PDA.placeholder_DCWarehouse" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" : this.$t("POStockInBackBill_PDA.placeholder_DCWarehouse"),
+ placeholder_DCStockPlace:this.$t("POStockInBackBill_PDA.placeholder_DCStockPlace") == "POStockInBackBill_PDA.placeholder_DCStockPlace" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" : this.$t("POStockInBackBill_PDA.placeholder_DCStockPlace"),
+ placeholder_SourceBillNo:this.$t("POStockInBackBill_PDA.placeholder_SourceBillNo") == "POStockInBackBill_PDA.placeholder_SourceBillNo" ? "璇疯緭鍏ユ簮鍗曞崟鍙�" : this.$t("POStockInBackBill_PDA.placeholder_SourceBillNo"),
+ placeholder_FIFOwarehouse:this.$t("POStockInBackBill_PDA.placeholder_FIFOwarehouse") == "POStockInBackBill_PDA.placeholder_FIFOwarehouse" ? "璇烽�夋嫨" : this.$t("POStockInBackBill_PDA.placeholder_FIFOwarehouse"),
+ placeholder_OutboundType:this.$t("POStockInBackBill_PDA.placeholder_OutboundType") == "POStockInBackBill_PDA.placeholder_OutboundType" ? "璇烽�夋嫨" : this.$t("POStockInBackBill_PDA.placeholder_OutboundType"),
+ placeholder_TransferDirection:this.$t("POStockInBackBill_PDA.placeholder_TransferDirection") == "POStockInBackBill_PDA.placeholder_TransferDirection" ? "璇烽�夋嫨璋冩嫧鏂瑰悜" : this.$t("POStockInBackBill_PDA.placeholder_TransferDirection"),
+ placeholder_TransferType:this.$t("POStockInBackBill_PDA.placeholder_TransferType") == "POStockInBackBill_PDA.placeholder_TransferType" ? "璇烽�夋嫨璋冩嫧绫诲瀷" : this.$t("POStockInBackBill_PDA.placeholder_TransferType"),
+ placeholder_SCWarehouse:this.$t("POStockInBackBill_PDA.placeholder_SCWarehouse") == "POStockInBackBill_PDA.placeholder_SCWarehouse" ? "璇烽�夋嫨璋冨嚭浠撳簱" : this.$t("POStockInBackBill_PDA.placeholder_SCWarehouse"),
+ placeholder_SCStockPlace:this.$t("POStockInBackBill_PDA.placeholder_SCStockPlace") == "POStockInBackBill_PDA.placeholder_SCStockPlace" ? "璇烽�夋嫨璋冨嚭浠撲綅" : this.$t("POStockInBackBill_PDA.placeholder_SCStockPlace"),
+ placeholder_SecManager:this.$t("POStockInBackBill_PDA.placeholder_SecManager") == "POStockInBackBill_PDA.placeholder_SecManager" ? "璇烽�夋嫨楠屾敹鍛�" : this.$t("POStockInBackBill_PDA.placeholder_SecManager"),
+ placeholder_Keeper:this.$t("POStockInBackBill_PDA.placeholder_Keeper") == "POStockInBackBill_PDA.placeholder_Keeper" ? "璇烽�夋嫨淇濈鍛�" : this.$t("POStockInBackBill_PDA.placeholder_Keeper"),
+ placeholder_Dept:this.$t("POStockInBackBill_PDA.placeholder_Dept") == "POStockInBackBill_PDA.placeholder_Dept" ? "璇烽�夋嫨閮ㄩ棬" : this.$t("POStockInBackBill_PDA.placeholder_Dept"),
+ placeholder_Supplier:this.$t("POStockInBackBill_PDA.placeholder_Supplier") == "POStockInBackBill_PDA.placeholder_Supplier" ? "璇烽�夋嫨渚涘簲鍟�" : this.$t("POStockInBackBill_PDA.placeholder_Supplier"),
+ placeholder_Customer:this.$t("POStockInBackBill_PDA.placeholder_Customer") == "POStockInBackBill_PDA.placeholder_Customer" ? "璇烽�夋嫨瀹㈡埛" : this.$t("POStockInBackBill_PDA.placeholder_Customer"),
+ placeholder_Warehouse:this.$t("POStockInBackBill_PDA.placeholder_Warehouse") == "POStockInBackBill_PDA.placeholder_Warehouse" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" : this.$t("POStockInBackBill_PDA.placeholder_Warehouse"),
+ placeholder_StockPlace:this.$t("POStockInBackBill_PDA.placeholder_StockPlace") == "POStockInBackBill_PDA.placeholder_StockPlace" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" : this.$t("POStockInBackBill_PDA.placeholder_StockPlace"),
+ unOperate:this.$t("POStockInBackBill_PDA.unOperate") == "POStockInBackBill_PDA.unOperate" ? "涓嶅彲鎿嶄綔" : this.$t("POStockInBackBill_PDA.unOperate")
}
},
computed: {
@@ -391,7 +415,10 @@
}
}
},
- onLoad(e) {
+ async onLoad(e) {
+ uni.setNavigationBarTitle({
+ title: this.$t("POStockInBackBill_PDA.title")
+ })
console.log(e, this.userInfo)
this.OperationType = e.OperationType
if (e.HInterID) {
@@ -408,6 +435,7 @@
// this.getHSupList()
this.getHEmpList()
this.getHDeptList()
+ await this.GetSourceBillType()
uni.$on('BillSelectComplete', (e) => {
console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
@@ -419,6 +447,11 @@
uni.$off('BillSelectComplete')
},
methods: {
+ toScanBillCode() {
+ MpaasScan.scanCode((res) => {
+ this.getHBarCodeData(res)
+ })
+ },
async HWHNameScan(e) {
// 鎵弿浠撳簱鐮�
console.log('浠撳簱鐮�: ', e);
@@ -692,6 +725,53 @@
// this.getHYDList()
},
+
+ // 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
+ async GetSourceBillType() {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Web/GetHSourceBillTypeByBillType',
+ data: {
+ HBillType: this.hform.HBillType,
+ Num: 2
+ }
+ })
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ console.log('data: ', data);
+ this.arrayHMainSourceBillType = []
+ this.arrayHMainSourceBillValue = []
+ Array.from(data).forEach(e => {
+ for(var j = 0; j < this.$t("POStockInBackBill_PDA.select option").length; j++){
+ let HSourceBillType_FY = this.$t("POStockInBackBill_PDA.select option[" + j + "]").split("@");
+ if(e['HSourceBillType'] == HSourceBillType_FY[0]){
+ console.log("褰撳墠鐨勫崟鎹被鍨嬶細", HSourceBillType_FY[1]);
+ this.arrayHMainSourceBillType.push(HSourceBillType_FY[1])
+ this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
+ }
+ }
+ })
+
+ this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
+ this.arrayHMainSourceBillValue.push('-1')
+ //濡傛灉鎵嬪伐褰曞叆涓嶇敤閫夋嫨婧愬崟
+ if (this.arrayHMainSourceBillType[0] == '鎵嬪伐褰曞叆') {
+ this.tabs = 1
+ }
+
+ this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
+ this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+
+ }
+ },
//婧愬崟璧勬枡
getHYDList() {
uni.request({
diff --git a/pages/caigoutuiliao/POStockInBackBillList.vue b/pages/caigoutuiliao/POStockInBackBillList.vue
index 80fd83e..cdaa6e7 100644
--- a/pages/caigoutuiliao/POStockInBackBillList.vue
+++ b/pages/caigoutuiliao/POStockInBackBillList.vue
@@ -2,10 +2,10 @@
<view class="content">
<view class="tabs">
<view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">
- {{ $t("POStockInBackBillList.cacheList") == "POStockInBackBillList.cacheList" ? "缂撳瓨鍒楄〃" : $t("POStockInBackBillList.cacheList") }}
+ {{ $t("POStockInBackBillList_PDA.cacheList") == "POStockInBackBillList_PDA.cacheList" ? "缂撳瓨鍒楄〃" : $t("POStockInBackBillList_PDA.cacheList") }}
</view>
<view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">
- {{ $t("POStockInBackBillList.updatedList") == "POStockInBackBillList.updatedList" ? "宸蹭笂浼犲垪琛�" : $t("POStockInBackBillList.updatedList") }}
+ {{ $t("POStockInBackBillList_PDA.updatedList") == "POStockInBackBillList_PDA.updatedList" ? "宸蹭笂浼犲垪琛�" : $t("POStockInBackBillList_PDA.updatedList") }}
</view>
</view>
@@ -14,28 +14,28 @@
<view class="form" v-if="tabs == 0">
<view class="buttons" @tap="add">
<uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>
- {{ $t("POStockInBackBillList.btnAdd") == "POStockInBackBillList.btnAdd" ? "鏂板" : $t("POStockInBackBillList.btnAdd") }}
+ {{ $t("POStockInBackBillList_PDA.btnAdd") == "POStockInBackBillList_PDA.btnAdd" ? "鏂板" : $t("POStockInBackBillList_PDA.btnAdd") }}
</view>
</view>
<view class="form" v-if="tabs == 1">
<view class="form-item">
- <view class="title">{{ $t("POStockInBackBillList.billNo") == "POStockInBackBillList.billNo" ? "鍗曟嵁鍙�:" : $t("POStockInBackBillList.billNo") }}:</view>
+ <view class="title">{{ $t("POStockInBackBillList_PDA.billNo") == "POStockInBackBillList_PDA.billNo" ? "鍗曟嵁鍙�:" : $t("POStockInBackBillList_PDA.billNo") }}:</view>
<view class="right">
- <input v-model="hform.HBillNo" :placeholder="$t('POStockInBackBillList.billNoPlaceholder') == 'POStockInBackBillList.billNoPlaceholder' ? '璇疯緭鍏ュ崟鎹彿' : $t('POStockInBackBillList.billNoPlaceholder')" />
+ <input v-model="hform.HBillNo" :placeholder="$t('POStockInBackBillList_PDA.billNoPlaceholder') == 'POStockInBackBillList_PDA.billNoPlaceholder' ? '璇疯緭鍏ュ崟鎹彿' : $t('POStockInBackBillList_PDA.billNoPlaceholder')" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("POStockInBackBillList.sourceBillNo") == "POStockInBackBillList.sourceBillNo" ? "婧愬崟鍗曞彿:" : $t("POStockInBackBillList.sourceBillNo") }}:</view>
+ <view class="title">{{ $t("POStockInBackBillList_PDA.sourceBillNo") == "POStockInBackBillList_PDA.sourceBillNo" ? "婧愬崟鍗曞彿:" : $t("POStockInBackBillList_PDA.sourceBillNo") }}:</view>
<view class="right">
- <input v-model="hform.HSourceBillNo" :placeholder="$t('POStockInBackBillList.sourceBillNoPlaceholder') == 'POStockInBackBillList.sourceBillNoPlaceholder' ? '璇疯緭鍏ユ簮鍗曞崟鍙�' : $t('POStockInBackBillList.sourceBillNoPlaceholder')" />
+ <input v-model="hform.HSourceBillNo" :placeholder="$t('POStockInBackBillList_PDA.sourceBillNoPlaceholder') == 'POStockInBackBillList_PDA.sourceBillNoPlaceholder' ? '璇疯緭鍏ユ簮鍗曞崟鍙�' : $t('POStockInBackBillList_PDA.sourceBillNoPlaceholder')" />
</view>
</view>
<view class="buttons">
<button class="btn-a" size="mini" type="default" @tap="clear">
- {{ $t("POStockInBackBillList.btn_Reset") == "POStockInBackBillList.btn_Reset" ? "閲嶇疆" : $t("POStockInBackBillList.btn_Reset") }}
+ {{ $t("POStockInBackBillList_PDA.btn_Reset") == "POStockInBackBillList_PDA.btn_Reset" ? "閲嶇疆" : $t("POStockInBackBillList_PDA.btn_Reset") }}
</button>
<button class="btn-c" size="mini" type="default" @tap="search">
- {{ $t("POStockInBackBillList.btn_Query") == "POStockInBackBillList.btn_Query" ? "鏌ヨ" : $t("POStockInBackBillList.btn_Query") }}
+ {{ $t("POStockInBackBillList_PDA.btn_Query") == "POStockInBackBillList_PDA.btn_Query" ? "鏌ヨ" : $t("POStockInBackBillList_PDA.btn_Query") }}
</button>
</view>
</view>
@@ -46,30 +46,30 @@
<uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
<view class="detail" v-if="item.鍒跺崟浜�">
- <text>{{ $t("POStockInBackBillList.table_Maker") == "POStockInBackBillList.table_Maker" ? "鍒跺崟浜猴細" : $t("POStockInBackBillList.table_Maker") }}锛�</text>{{item.鍒跺崟浜簘}
+ <text>{{ $t("POStockInBackBillList_PDA.table_Maker") == "POStockInBackBillList_PDA.table_Maker" ? "鍒跺崟浜猴細" : $t("POStockInBackBillList_PDA.table_Maker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鍗曟嵁鍐呯爜">
- <text>{{ $t("POStockInBackBillList.table_BillID") == "POStockInBackBillList.table_BillID" ? "鍗曟嵁鍐呯爜锛�" : $t("POStockInBackBillList.table_BillID") }}锛�</text>{{item.鍗曟嵁鍐呯爜}}
+ <text>{{ $t("POStockInBackBillList_PDA.table_BillID") == "POStockInBackBillList_PDA.table_BillID" ? "鍗曟嵁鍐呯爜锛�" : $t("POStockInBackBillList_PDA.table_BillID") }}锛�</text>{{item.鍗曟嵁鍐呯爜}}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>{{ $t("POStockInBackBillList.table_Qty") == "POStockInBackBillList.table_Qty" ? "鏁伴噺锛�" : $t("POStockInBackBillList.table_Qty") }}锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("POStockInBackBillList_PDA.table_Qty") == "POStockInBackBillList_PDA.table_Qty" ? "鏁伴噺锛�" : $t("POStockInBackBillList_PDA.table_Qty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>{{ $t("POStockInBackBillList.table_SourceBillNo") == "POStockInBackBillList.table_SourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("POStockInBackBillList.table_SourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("POStockInBackBillList_PDA.table_SourceBillNo") == "POStockInBackBillList_PDA.table_SourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("POStockInBackBillList_PDA.table_SourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>{{ $t("POStockInBackBillList.table_Org") == "POStockInBackBillList.table_Org" ? "缁勭粐锛�" : $t("POStockInBackBillList.table_Org") }}锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("POStockInBackBillList_PDA.table_Org") == "POStockInBackBillList_PDA.table_Org" ? "缁勭粐锛�" : $t("POStockInBackBillList_PDA.table_Org") }}锛�</text>{{item.缁勭粐}}
</view>
</view>
<view class="more">
<view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
<uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>
- {{ $t("POStockInBackBillList.btn_Edit") == "POStockInBackBillList.btn_Edit" ? "缂栬緫" : $t("POStockInBackBillList.btn_Edit") }}
+ {{ $t("POStockInBackBillList_PDA.btn_Edit") == "POStockInBackBillList_PDA.btn_Edit" ? "缂栬緫" : $t("POStockInBackBillList_PDA.btn_Edit") }}
</view>
<view class="part" style="color: #da0000;" @tap.stop="del(item)">
<uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>
- {{ $t("POStockInBackBillList.btn_Del") == "POStockInBackBillList.btn_Del" ? "鍒犻櫎" : $t("POStockInBackBillList.btn_Del") }}
+ {{ $t("POStockInBackBillList_PDA.btn_Del") == "POStockInBackBillList_PDA.btn_Del" ? "鍒犻櫎" : $t("POStockInBackBillList_PDA.btn_Del") }}
</view>
</view>
</uni-card>
@@ -78,49 +78,49 @@
<uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
<view class="detail" v-if="item.鍒跺崟浜�">
- <text>{{ $t("POStockInBackBillList.table_Maker") == "POStockInBackBillList.table_Maker" ? "鍒跺崟浜猴細" : $t("POStockInBackBillList.table_Maker") }}锛�</text>{{item.鍒跺崟浜簘}
+ <text>{{ $t("POStockInBackBillList_PDA.table_Maker") == "POStockInBackBillList_PDA.table_Maker" ? "鍒跺崟浜猴細" : $t("POStockInBackBillList_PDA.table_Maker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>{{ $t("POStockInBackBillList.table_Qty") == "POStockInBackBillList.table_Qty" ? "鏁伴噺锛�" : $t("POStockInBackBillList.table_Qty") }}锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("POStockInBackBillList_PDA.table_Qty") == "POStockInBackBillList_PDA.table_Qty" ? "鏁伴噺锛�" : $t("POStockInBackBillList_PDA.table_Qty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>{{ $t("POStockInBackBillList.table_SourceBillNo") == "POStockInBackBillList.table_SourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("POStockInBackBillList.table_SourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("POStockInBackBillList_PDA.table_SourceBillNo") == "POStockInBackBillList_PDA.table_SourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("POStockInBackBillList_PDA.table_SourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.鐗╂枡浠ｇ爜">
- <text>{{ $t("POStockInBackBillList.table_MaterNumber") == "POStockInBackBillList.table_MaterNumber" ? "鐗╂枡浠ｇ爜锛�" : $t("POStockInBackBillList.table_MaterNumber") }}锛�</text>{{item.鐗╂枡浠ｇ爜}}
+ <text>{{ $t("POStockInBackBillList_PDA.table_MaterNumber") == "POStockInBackBillList_PDA.table_MaterNumber" ? "鐗╂枡浠ｇ爜锛�" : $t("POStockInBackBillList_PDA.table_MaterNumber") }}锛�</text>{{item.鐗╂枡浠ｇ爜}}
</view>
<view class="detail" v-if="item.鐗╂枡鍚嶇О">
- <text>{{ $t("POStockInBackBillList.table_MaterName") == "POStockInBackBillList.table_MaterName" ? "鐗╂枡鍚嶇О锛�" : $t("POStockInBackBillList.table_MaterName") }}锛�</text>{{item.鐗╂枡鍚嶇О}}
+ <text>{{ $t("POStockInBackBillList_PDA.table_MaterName") == "POStockInBackBillList_PDA.table_MaterName" ? "鐗╂枡鍚嶇О锛�" : $t("POStockInBackBillList_PDA.table_MaterName") }}锛�</text>{{item.鐗╂枡鍚嶇О}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>{{ $t("POStockInBackBillList.table_MaterModel") == "POStockInBackBillList.table_MaterModel" ? "瑙勬牸鍨嬪彿锛�" : $t("POStockInBackBillList.table_MaterModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ <text>{{ $t("POStockInBackBillList_PDA.table_MaterModel") == "POStockInBackBillList_PDA.table_MaterModel" ? "瑙勬牸鍨嬪彿锛�" : $t("POStockInBackBillList_PDA.table_MaterModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>{{ $t("POStockInBackBillList.table_Org") == "POStockInBackBillList.table_Org" ? "缁勭粐锛�" : $t("POStockInBackBillList.table_Org") }}锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("POStockInBackBillList_PDA.table_Org") == "POStockInBackBillList_PDA.table_Org" ? "缁勭粐锛�" : $t("POStockInBackBillList_PDA.table_Org") }}锛�</text>{{item.缁勭粐}}
</view>
</view>
<view class="more">
<view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
<uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>
- {{ $t("POStockInBackBillList.btn_DisplayCode") == "POStockInBackBillList.btn_DisplayCode" ? "鏄剧ず浜岀淮鐮�" : $t("POStockInBackBillList.btn_DisplayCode") }}
+ {{ $t("POStockInBackBillList_PDA.btn_DisplayCode") == "POStockInBackBillList_PDA.btn_DisplayCode" ? "鏄剧ず浜岀淮鐮�" : $t("POStockInBackBillList_PDA.btn_DisplayCode") }}
</view>
<view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
<uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>
- {{ $t("POStockInBackBillList.btn_Revoke") == "POStockInBackBillList.btn_Revoke" ? "鎾ら攢" : $t("POStockInBackBillList.btn_Revoke") }}
+ {{ $t("POStockInBackBillList_PDA.btn_Revoke") == "POStockInBackBillList_PDA.btn_Revoke" ? "鎾ら攢" : $t("POStockInBackBillList_PDA.btn_Revoke") }}
</view>
</view>
</uni-card>
</view>
<view class="over" v-if="listData.length == 0">
- {{ $t("POStockInBackBillList.noDate") == "POStockInBackBillList.noDate" ? "鏆傛棤鏁版嵁" : $t("POStockInBackBillList.noDate") }}
+ {{ $t("POStockInBackBillList_PDA.noDate") == "POStockInBackBillList_PDA.noDate" ? "鏆傛棤鏁版嵁" : $t("POStockInBackBillList_PDA.noDate") }}
</view>
<view class="over" v-if="listData.length != 0 && listData.length != showList.length">
- {{ $t("POStockInBackBillList.Loading") == "POStockInBackBillList.Loading" ? "鍔犺浇涓�..." : $t("POStockInBackBillList.Loading") }}
+ {{ $t("POStockInBackBillList_PDA.Loading") == "POStockInBackBillList_PDA.Loading" ? "鍔犺浇涓�..." : $t("POStockInBackBillList_PDA.Loading") }}
</view>
<view class="over" v-if="listData.length != 0 && listData.length == showList.length">
- {{ $t("POStockInBackBillList.bottom") == "POStockInBackBillList.bottom" ? "宸插埌搴�" : $t("POStockInBackBillList.bottom") }}
+ {{ $t("POStockInBackBillList_PDA.bottom") == "POStockInBackBillList_PDA.bottom" ? "宸插埌搴�" : $t("POStockInBackBillList_PDA.bottom") }}
</view>
<BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
</view>
@@ -136,7 +136,7 @@
serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
tabs: 0,
urls: '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
- MvarReportTitle: this.$t('POStockInBackBillList.reportTitle') == 'POStockInBackBillList.reportTitle' ? '閲囪喘閫�鏂欏崟缂撳瓨鍒楄〃' : this.$t('POStockInBackBillList.reportTitle'),
+ MvarReportTitle: this.$t('POStockInBackBillList_PDA.reportTitle') == 'POStockInBackBillList_PDA.reportTitle' ? '閲囪喘閫�鏂欏崟缂撳瓨鍒楄〃' : this.$t('POStockInBackBillList_PDA.reportTitle'),
hform: {
HBillNo: '',
HSourceBillNo: '',
@@ -154,6 +154,9 @@
},
components: { BarCodePopupVue },
onLoad() {
+ uni.setNavigationBarTitle({
+ title: this.$t("POStockInBackBillList_PDA.title")
+ })
//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
this.CheckModRight()
this.changeTab(0)
@@ -195,7 +198,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: this.$t('POStockInBackBillList.requestFailed') == 'POStockInBackBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBackBillList.requestFailed'),
+ title: this.$t('POStockInBackBillList_PDA.requestFailed') == 'POStockInBackBillList_PDA.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBackBillList_PDA.requestFailed'),
icon: 'none'
})
},
@@ -222,7 +225,7 @@
},
getList() {
uni.showLoading({
- title: this.$t('POStockInBackBillList.loadingTitle') == 'POStockInBackBillList.loadingTitle' ? '鍔犺浇涓�...' : this.$t('POStockInBackBillList.loadingTitle')
+ title: this.$t('POStockInBackBillList_PDA.loadingTitle') == 'POStockInBackBillList_PDA.loadingTitle' ? '鍔犺浇涓�...' : this.$t('POStockInBackBillList_PDA.loadingTitle')
})
uni.request({
url: this.serverUrl + this.urls,
@@ -248,7 +251,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: this.$t('POStockInBackBillList.requestFailed') == 'POStockInBackBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBackBillList.requestFailed'),
+ title: this.$t('POStockInBackBillList_PDA.requestFailed') == 'POStockInBackBillList_PDA.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBackBillList_PDA.requestFailed'),
icon: 'none'
})
},
@@ -313,7 +316,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: this.$t('POStockInBackBillList.requestFailed') == 'POStockInBackBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBackBillList.requestFailed'),
+ title: this.$t('POStockInBackBillList_PDA.requestFailed') == 'POStockInBackBillList_PDA.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBackBillList_PDA.requestFailed'),
icon: 'none'
})
},
@@ -322,8 +325,8 @@
//鍒犻櫎
del(item) {
uni.showModal({
- title: this.$t('POStockInBackBillList.confirmTitle') == 'POStockInBackBillList.confirmTitle' ? '鎻愮ず' : this.$t('POStockInBackBillList.confirmTitle'),
- content: this.$t('POStockInBackBillList.delConfirm') == 'POStockInBackBillList.delConfirm' ? '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�' : this.$t('POStockInBackBillList.delConfirm'),
+ title: this.$t('POStockInBackBillList_PDA.confirmTitle') == 'POStockInBackBillList_PDA.confirmTitle' ? '鎻愮ず' : this.$t('POStockInBackBillList_PDA.confirmTitle'),
+ content: this.$t('POStockInBackBillList_PDA.delConfirm') == 'POStockInBackBillList_PDA.delConfirm' ? '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�' : this.$t('POStockInBackBillList_PDA.delConfirm'),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -350,7 +353,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: this.$t('POStockInBackBillList.requestFailed') == 'POStockInBackBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBackBillList.requestFailed'),
+ title: this.$t('POStockInBackBillList_PDA.requestFailed') == 'POStockInBackBillList_PDA.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBackBillList_PDA.requestFailed'),
icon: 'none'
})
},
@@ -364,8 +367,8 @@
//鎾ら攢
revoke(item) {
uni.showModal({
- title: this.$t('POStockInBackBillList.confirmTitle') == 'POStockInBackBillList.confirmTitle' ? '鎻愮ず' : this.$t('POStockInBackBillList.confirmTitle'),
- content: this.$t('POStockInBackBillList.revokeConfirm') == 'POStockInBackBillList.revokeConfirm' ? '鏄惁纭鎾ら攢' : this.$t('POStockInBackBillList.revokeConfirm'),
+ title: this.$t('POStockInBackBillList_PDA.confirmTitle') == 'POStockInBackBillList_PDA.confirmTitle' ? '鎻愮ず' : this.$t('POStockInBackBillList_PDA.confirmTitle'),
+ content: this.$t('POStockInBackBillList_PDA.revokeConfirm') == 'POStockInBackBillList_PDA.revokeConfirm' ? '鏄惁纭鎾ら攢' : this.$t('POStockInBackBillList_PDA.revokeConfirm'),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -392,7 +395,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: this.$t('POStockInBackBillList.requestFailed') == 'POStockInBackBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBackBillList.requestFailed'),
+ title: this.$t('POStockInBackBillList_PDA.requestFailed') == 'POStockInBackBillList_PDA.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBackBillList_PDA.requestFailed'),
icon: 'none'
})
},
diff --git a/pages/huanyangdan/BackSampleCheckBill.vue b/pages/huanyangdan/BackSampleCheckBill.vue
new file mode 100644
index 0000000..21f870a
--- /dev/null
+++ b/pages/huanyangdan/BackSampleCheckBill.vue
@@ -0,0 +1,817 @@
+<template>
+ <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="right">
+ <input type="text" name="HBarCode" id="HBarCode" v-model="HBarCode" @confirm="getCode(HBarCode)" />
+ </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">杩樻牱鏁伴噺:</view>
+ <view class="right">
+ <input type="number" name="HQty" id="HQty" v-model="hform.HQty" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">杩樻牱鍐呭:</view>
+ <view class="right">
+ <input type="text" name="HRemark" id="HRemark" v-model="hform.HRemark" />
+ </view>
+ </view>
+
+
+ <view class="form-item">
+ <view class="title">杩樻牱鍛�:</view>
+ <view class="right">
+ <uni-combox :candidates="HCheckEmpNameArray" name="HCheckEmpName" id="HCheckEmpName"
+ placeholder="璇烽�夋嫨杩樻牱鍛�" v-model="hform.HCheckEmpName"
+ @input="HCheckEmpNameChangeHandler"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">閮ㄩ棬:</view>
+ <view class="right">
+ <uni-combox :candidates="HDeptNameArray" name="HDeptName" id="HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬"
+ v-model="hform.HDeptName" @input="HDeptNameChangeHandler"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇鐝:</view>
+ <view class="right">
+ <uni-combox :candidates="HShiftsNameArray" name="HShiftsName" id="HShiftsName" placeholder="璇烽�夋嫨鐢熶骇鐝"
+ v-model="hform.HShiftsName" @input="HShiftsNameChangeHandler"></uni-combox>
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="title">鍗曟嵁鏃ユ湡:</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="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="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="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="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="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="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="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="right disabled">
+ <input disabled type="text" v-model="hform.HProcName" name="HProcName" id="HProcName" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">娴佽浆鍗℃壒鍙�:</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="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 class="placeholder__view"></view>
+ <view><button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button></view>
+ </view>
+ </view>
+</template>
+
+<script>
+ import dayjs from 'dayjs'
+ import {
+ getUserInfo
+ } from '../../utils/auth'
+ import {
+ CommonUtils
+ } from '../../utils/common'
+
+ export default {
+ data() {
+ return {
+ pageMeta: {
+ scrollContentTop: 0,
+ bottomBtnTop: 0,
+ },
+ refSav: 'Add',
+ showMask: true,
+ TestTypeArray: ["棣栨", "宸℃", "鏈", "瀹為獙"],
+
+ HBillType: '7522',
+ HProcNameArray: [],
+ HProcNameArraySource: [],
+
+ HDeptNameArray: [],
+ HDeptNameArraySource: [],
+
+ HShiftsNameArray: [],
+ HShiftsNameArraySource: [],
+
+ HGroupNameArray: [],
+ HGroupNameArraySource: [],
+
+ HCheckEmpNameArray: [],
+ HCheckEmpNameSource: [],
+
+ HSourceNameArray: [],
+ HSourceNameSource: [],
+
+ HBarCode: '',
+ hform: {
+ HBarCode: '',
+ HQty: '',
+ HRemark: '',
+ HEmpName: getUserInfo()['HEmpName'],
+ HEmp: getUserInfo()['HEmpID'],
+ HDeptName: '',
+ HDeptID: 0,
+ HWorkShiftName: '',
+ HWorkShiftID: 0,
+ HDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HBillNo: '',
+ HInterID: '',
+ HICMOBillNo: '',
+ HICMOInterID: '',
+ HICMOEntryID: '',
+ HProcExchBillNo: '',
+ HProcExchInterID: '',
+ HProcExchEntryID: '',
+ HMaterNumber: '',
+ HMaterID: 0,
+ HMaterName: '',
+ HModel: '',
+ HUnitName: '',
+ HUnitID: '',
+ HProcName: '',
+ HProcID: '',
+ HBatchNo: '',
+ HProcExchQty: '',
+ HICMOQty: '',
+ HMaker: getUserInfo()['Czymc'],
+ HMakeDate: dayjs(new Date()).format("YYYY-MM-DD hh:mm:ss"),
+ HUpDater: '',
+ HUpDateDate: '',
+ HChecker: '',
+ HCheckDate: '',
+ HDeleteMan: '',
+ HDeleteDate: '',
+ }
+ }
+ },
+ computed: {
+ scrollContentHeight: {
+ get() {
+ return this.pageMeta.bottomBtnTop - this.pageMeta.scrollContentTop
+ }
+ }
+ },
+ onReady() {
+ // #ifndef MP-WEIXIN
+ let query = uni.createSelectorQuery().in(this)
+ query.select("#scroll-content").boundingClientRect((data) => {
+ this.pageMeta.scrollContentTop = data.top
+ }).exec()
+ query.select("#bottom-btn").boundingClientRect((data) => {
+ this.pageMeta.bottomBtnTop = data.top
+ }).exec()
+ // #endif
+ // #ifdef MP-WEIXIN
+ // 寰俊涓嶆敮鎸� uni.createSelectorQuery().in(this)
+ // #endif
+
+ },
+ async onLoad(e) {
+ let {
+ operationType
+ } = e
+ if (operationType == 0) {
+ this.getMaxNum()
+ this.refSav = 'Add'
+ } else {
+ this.refSav = 'Update'
+ }
+
+ this.getProcessList()
+ this.get_Gy_WorkShiftList()
+ this.GetGroupList()
+ this.GetEmployeeList()
+ this.getSourceList()
+ this.GetDepartmentList()
+ },
+ methods: {
+ HDeptNameChangeHandler() {
+ let index = this.HDeptNameArray.findIndex(item => item == e)
+
+ if (index != -1) {
+ this.hform.HDeptID = this.HDeptNameArraySource[index]["HItemID"]
+ this.hform.HDeptName = this.HDeptNameArraySource[index]["HName"]
+ }
+ },
+ GetDepartmentList() {
+ CommonUtils.doRequest2({
+ url: '/Web/GetDepartmentList_Json',
+ data: {
+ Department: '',
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message,
+ code
+ } = res.data
+ if (count == 1) {
+ this.HDeptNameArray = Array.from(data).map(item => item['HName'])
+ this.HDeptNameArraySource = data
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+ HSourceNameChangeHandler(e) {
+ let index = this.HSourceNameArray.findIndex(item => item == e)
+
+ if (index != -1) {
+ this.hform.HSourceID = this.HSourceNameArraySource[index]["HItemID"]
+ this.hform.HSourceName = this.HSourceNameArraySource[index]["鐢熶骇璧勬簮"]
+ }
+
+ console.log('this.hform: ', this.hform);
+ },
+ // 鑾峰彇鐢熶骇璧勬簮
+ getSourceList() {
+ CommonUtils.doRequest2({
+ url: '/api/newBill/getSourceList',
+ data: {
+ sWhere: '',
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ msg,
+ code
+ } = res.data
+ if (code == 1) {
+ let data1 = data.Gy_Source
+ this.HSourceNameArray = Array.from(data1).map(item => item['鐢熶骇璧勬簮'])
+ this.HSourceNameArraySource = data1
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+ HCheckEmpNameChangeHandler(e) {
+ let index = this.HCheckEmpNameArray.findIndex(item => item == e)
+
+ if (index != -1) {
+ this.hform.HCheckEmp = this.HCheckEmpNameArraySource[index]["HItemID"]
+ this.hform.HCheckEmpName = this.HCheckEmpNameArraySource[index]["HName"]
+ }
+ },
+ // 鑾峰彇鑱屽憳淇℃伅
+ GetEmployeeList() {
+ CommonUtils.doRequest2({
+ url: '/Web/GetEmployeeList_Json',
+ data: {
+ Employee: '',
+ HGroupID: 0
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HCheckEmpNameArray = Array.from(data).map(item => item['HName'])
+ this.HCheckEmpNameArraySource = data
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+ HGroupNameChangeHandler(e) {
+ let index = this.HGroupNameArray.findIndex(item => item == e)
+
+ if (index != -1) {
+ this.hform.HGroupID = this.HGroupNameArraySource[index]["HItemID"]
+ this.hform.HGroupName = this.HGroupNameArraySource[index]["HName"]
+ }
+ },
+ // 鑾峰彇鐢熶骇鐝粍
+ GetGroupList() {
+ CommonUtils.doRequest2({
+ url: '/WEBSController/GetGroupList_Json',
+ data: {
+ Group: '',
+ HStockOrgID: uni.getStorageSync('OrganizationID')
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HGroupNameArray = Array.from(data).map(item => item['HName'])
+ this.HGroupNameArraySource = data
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+
+ // 鑾峰彇鏈�鏂板崟鎹彿鍜孒InterID
+ getMaxNum() {
+ CommonUtils.doRequest2({
+ url: '/Web/GetMAXNum',
+ data: {
+ HBillType: this.HBillType
+ },
+ resFunction: (res) => {
+ let {
+ count,
+ data,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.hform.HBillNo = data[0].HBillNo
+ this.hform.HInterID = data[0].HInterID
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+ HShiftsNameChangeHandler(e) {
+ let index = this.HShiftsNameArray.findIndex(item => item == e)
+ if (index != -1) {
+ this.hform.HShiftsID = this.HShiftsNameArraySource[index]['HInterID']
+ this.hform.HShiftsName = this.HShiftsNameArraySource[index]['鐝鍚嶇О']
+ }
+ },
+ // 鍒濆鍖栫彮娆′俊鎭�
+ get_Gy_WorkShiftList() {
+ CommonUtils.doRequest2({
+ url: '/Gy_ShiftsController/Get_Gy_WorkShiftList',
+ data: {
+ sWhere: ` and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync('Organization')}' and 绂佺敤鏍囪='' and ISNULL(瀹℃牳浜� ,'') !=''`,
+ HMaker: getUserInfo()['Czymc']
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HShiftsNameArray = Array.from(data).map(item => item['鐝鍚嶇О'])
+ this.HShiftsNameArraySource = data
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+ // 鑾峰彇鐝
+ get_HWorkShift() {
+ CommonUtils.doRequest2({
+ url: '/Gy_ShiftsController/Get_HWorkShift',
+ data: {
+ "HDeptID": this.hform.HDeptID,
+ "HCenterID": this.hform.HCenterID
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+
+ this.hform.HShiftsID = data[0]['HInterID']
+ this.hform.HShiftsName = data[0]['鐝']
+ }
+ })
+ },
+ ProcessExchangeBillQuerySub() {
+ let HProcID = this.hform.HProcID
+ let HBarCode = this.hform.HProcExchInterID
+ let sWhere = ` ${HBarCode} and HProcID = ${HProcID} `
+ CommonUtils.doRequest2({
+ url: '/LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json',
+ data: {
+ sWhere: sWhere
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ if (count == 1 && data.length > 0) {
+ this.hform = Object.assign(this.hform, {
+ HProcID: data[0]['HProcID'],
+ HProcName: data[0]['宸ュ簭鍚嶇О'],
+ HSourceID: data[0]['HSourceID'] || 0,
+ HSourceName: data[0]['鐢熶骇璧勬簮'] || '',
+ HMainSourceEntryID: data[0]['hsubid'],
+ HProcExchEntryID: data[0]['hsubid'],
+ HProcExchQty: data[0]['娴佽浆鍗℃暟閲�'],
+ HCenterID: data[0]['HCenterID'] || getUserInfo()['HWorkCenterID'],
+ })
+
+ }
+ }
+ })
+ },
+ onHProcNameChangeHandler(e) {
+ let index = this.HProcNameArray.findIndex(item => item == e)
+ if (index != -1) {
+ this.hform.HProcName = this.HProcNameArraySource[index]['HName']
+ this.hform.HProcID = this.HProcNameArraySource[index]['HItemID']
+ this.ProcessExchangeBillQuerySub()
+ }
+ },
+ getProcessList() {
+ CommonUtils.doRequest2({
+ url: '/WEBSController/GetProcessList_Json',
+ data: {
+ Process: '',
+ HStockOrgID: uni.getStorageSync("OrganizationID")
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HProcNameArray = Array.from(data).map(item => item.HName)
+ this.HProcNameArraySource = data
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+ TestTypeChange(e) {
+ console.log('e: ', e);
+ },
+ toScanCode() {
+ var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+ mpaasScanModule.mpaasScan({
+ 'hideAlbum': true,
+ 'timeoutInterval': '10', //瓒呮椂鏃堕棿
+ 'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ }, (ret) => {
+ console.log(ret.resp_result)
+ if (this.hform.HBarCode == '*') {
+ this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+ } else {
+ this.HBarCode = ret.resp_result
+ this.hform.HBarCode = ret.resp_result
+ }
+
+ this.getCode(this.hform.HBarCode)
+ })
+ },
+ getCode(HBarCode) {
+ console.log('HBarCode: ', HBarCode);
+ if (!HBarCode) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鏉″舰鐮佷笉鑳戒负绌�'
+ })
+ }
+ let sWhere = " and 宸ュ簭娴佽浆鍗″彿='" + HBarCode + "'";
+ CommonUtils.doRequest2({
+ url: '/QC_TakeSampleCheckBill/Get_BackSampleList',
+ data: {
+ "sWhere": sWhere
+ },
+ resFunction: (res) => {
+ let {
+ code,
+ Message,
+ count,
+ data
+ } = res.data
+ if (count == 1) {
+ this.hform = Object.assign(this.hform, {
+ "HMaterID": data[0].HMaterID, //浜у搧ID
+ "HMaterNumber": data[0].浜у搧缂栫爜, //浜у搧浠ｇ爜
+ "HMaterName": data[0].浜у搧鍚嶇О, //浜у搧鍚嶇О
+ "HModel": data[0].瑙勬牸鍨嬪彿, //浜у搧瑙勬牸
+ "HUnitID": data[0].HUnitID, //璁￠噺鍗曚綅id
+ "HUnitName": data[0].璁￠噺鍗曚綅, //璁￠噺鍗曚綅
+ "HProcExchBillNo": data[0].宸ュ簭娴佽浆鍗″彿, //娴佽浆鍗″彿
+ "HProcExchInterID": data[0].宸ュ簭娴佽浆鍗′富鍐呯爜, //娴佽浆鍗′富鍐呯爜(鍙栧�糎InterID)
+ "HBatchNo": data[0].宸ュ簭娴佽浆鍗℃壒娆″彿, //娴佽浆鍗℃壒娆�
+ "HICMOInterID": data[0].浠诲姟鍗曞唴鐮�, //鐢熶骇璁㈠崟ID
+ "HICMOEntryID": data[0].浠诲姟鍗曞瓙鍐呯爜, //鐢熶骇璁㈠崟瀛怚D
+ "HICMOBillNo": data[0].浠诲姟鍗曞彿, //鐢熶骇璁㈠崟
+ "HDeptID": data[0].HDeptID, //杞﹂棿ID
+ "HDeptName": data[0].閮ㄩ棬, //杞﹂棿
+ "HProcID": data[0].HProcID, //褰撳墠宸ュ簭ID
+ "HProcName": data[0].宸ュ簭, //褰撳墠宸ュ簭
+ "HProcExchEntryID": data[0].宸ュ簭娴佽浆鍗″瓙鍐呯爜, //娴佽浆鍗″瓙鍐呯爜(婧愬崟琛屽彿)
+ "HProcExchQty": data[0].宸ュ簭娴佽浆鍗℃暟閲�, //娴佽浆鍗℃暟閲�
+ "HICMOQty": data[0].浠诲姟鍗曟暟閲�,
+ "WorkShiftName": data[0].鐢熶骇鐝,
+ "HWorkShiftID": data[0].HShiftsID,
+ "HBarCode": "",
+ })
+
+ console.log('this.hform: ', this.hform);
+ uni.showToast({
+ icon: 'none',
+ title: '鑾峰彇鎴愬姛!'
+ })
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+ submit() {
+ if (this.hform.HProcID == 0) {
+ return uni.showToast({
+ icon: 'none',
+ title: '宸ュ簭娌℃湁閫夋嫨'
+ })
+ }
+ if (this.hform.HQty == '') {
+ return uni.showToast({
+ icon: 'none',
+ title: '鍙栨牱鏁伴噺涓虹┖'
+ })
+ }
+ if (this.hform.HProcID == 0) {
+ return uni.showToast({
+ icon: 'none',
+ title: '宸ュ簭娌℃湁閫夋嫨'
+ })
+ }
+ if (this.hform.HDeptID == 0) {
+ return uni.showToast({
+ icon: 'none',
+ title: '閮ㄩ棬娌℃湁閫夋嫨'
+ })
+ }
+ if (this.hform.HShiftsID == 0) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鐝鏈�夋嫨'
+ })
+ }
+ if (this.hform.HGroupID == 0) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鐢熶骇鐝粍鏈�夋嫨'
+ })
+ }
+ if (this.hform.HCheckEmp == 0) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鍙栨牱鍛樻湭閫夋嫨'
+ })
+ }
+ if (this.hform.HSourceID == 0) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鐢熶骇璧勬簮鏈�夋嫨'
+ })
+ }
+
+ console.log('this.hform: ', this.hform);
+ let sMainStr = JSON.stringify(this.hform)
+ let numData = [{
+ "HMaterID": this.hform.HMaterID,
+ "HUnitID": this.hform.HUnitID,
+ "HProcExchBillNo": this.hform.HProcExchBillNo,
+ "HProcExchInterID": this.hform.HProcExchInterID,
+ "HProcExchEntryID": this.hform.HProcExchEntryID,
+ "HICMOInterID": this.hform.HICMOInterID,
+ "HICMOEntryID": this.hform.HICMOEntryID,
+ "HICMOBillNo": this.hform.HICMOBillNo,
+ "HDeptID": this.hform.HDeptID,
+ "HProcID": this.hform.HProcID,
+ "HProcExchQty": this.hform.HProcExchQty,
+ "HWorkShiftID": this.hform.HWorkShiftID,
+ "HBatchNo": this.hform.HBatchNo,
+ "HICMOQty": this.hform.HICMOQty,
+ "HQty": this.hform.HQty
+ }]
+ let sSubStr = JSON.stringify(numData)
+ let sMainSub = sMainStr + ';' + sSubStr +';' + this.refSav + ';' + getUserInfo()['Czymc'];
+ CommonUtils.doRequest2({
+ method: 'POST',
+ url: '/QC_TakeSampleCheckBill/SaveQC_BackSampleCheckBillMain',
+ data: {
+ msg: sMainSub
+ },
+ resFunction: (res) => {
+ let {
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ return uni.showToast({
+ icon: 'none',
+ title: "鎻愪氦鎴愬姛!"
+ })
+ } else {
+ return uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+ onAddNewHandler() {
+ uni.redirectTo({
+ url: "/pages/quyangdan/TakeSampleCheckBillList?operationType=0"
+ })
+ },
+ goBack() {
+ uni.navigateBack()
+ },
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .scroll-content {
+ box-sizing: border-box;
+ padding: 20rpx;
+
+ ::v-deep .uni-scroll-view-content {
+ box-sizing: border-box;
+ padding: 0 40rpx;
+ display: flex;
+ flex-direction: column;
+ gap: 20rpx;
+ }
+
+ .form-item {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ gap: 20rpx;
+
+ input {
+ width: inherit;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+
+ .title {
+ width: 5em;
+ font-size: 30rpx;
+ flex-shrink: 0;
+ text-align: right;
+ }
+
+ .right {
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ }
+
+ .right-icon {
+ width: 54rpx;
+ height: 54rpx;
+ border-radius: 50%;
+ background-color: #3A78FF;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-shrink: 0;
+
+ }
+
+ .disabled {
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+ }
+ }
+
+ .bottom-btn {
+ 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: row;
+ gap: 20rpx;
+ justify-content: space-between;
+ width: 100%;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+
+ .btn-a {
+ background-color: #3A78FF;
+ color: #fff;
+ }
+
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #acacac;
+ color: #fff;
+ }
+ }
+
+ .placeholder__view {
+ flex: 1;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/huanyangdan/BackSampleCheckBillList.vue b/pages/huanyangdan/BackSampleCheckBillList.vue
new file mode 100644
index 0000000..227ce5a
--- /dev/null
+++ b/pages/huanyangdan/BackSampleCheckBillList.vue
@@ -0,0 +1,584 @@
+<template>
+ <view>
+ <view class="page-header">
+ <view class="search-item">
+ <view class="left">鏃ユ湡闂撮殧</view>
+ <view class="right">
+ <picker mode="selector" :value="curDateGap" :range="dateRangePicker"
+ @change="onDateRangePickerChangeHandler">
+ <input disabled v-model="curDateGap" placeholder="璇烽�夋嫨鏃ユ湡闂撮殧" />
+ <view class="picker-overlay"></view>
+ </picker>
+
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">寮�濮嬫棩鏈�</view>
+ <view class="right">
+ <uni-datetime-picker :clear-icon="false" type="date" v-model="startDate"
+ :disabled="!enableCustomDateRange">
+ <view class="datetime-picker-inner"
+ :class="enableCustomDateRange?'font__enable':'font__disable'">
+ <text>{{ startDate }}</text>
+ </view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">缁撴潫鏃ユ湡</view>
+ <view class="right">
+ <uni-datetime-picker :clear-icon="false" type="date" v-model="endDate"
+ :disabled="!enableCustomDateRange">
+ <view class="datetime-picker-inner"
+ :class="enableCustomDateRange?'font__enable':'font__disable'">{{ endDate }}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">鍗曟嵁鍙�</view>
+ <view class="right">
+ <input type="text" auto-focus v-model="HBillNo" />
+ </view>
+ </view>
+
+ <view class="button-groups">
+ <button type="default" size="mini" class="btn-b" @tap.stop="onAddClickHandler">鏂板</button>
+ <button type="default" size="mini" class="btn-c" @tap.stop="onSearchClickHandler">鏌ヨ</button>
+ <button type="default" size="mini" class="btn-a" @tap.stop="onResetClickHandler">閲嶇疆</button>
+ </view>
+ </view>
+ <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+ <scroll-view id="pageContent" scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
+ <view v-for="(item,index) in listData" :key="index">
+ <uni-card :title="item['鍗曟嵁鍙�']" :extra="'No.'+item['sorderid']"
+ @tap="showDetail = showDetail==index?-1:index">
+ <view class="card-detail">
+ <view class="detail" v-if="item['鍗曟嵁鍙�']">
+ <text>鍗曟嵁鍙凤細</text>{{item['鍗曟嵁鍙�']}}
+ </view>
+ <view class="detail" v-if="item['鍗曟嵁鐘舵��']">
+ <text>鍗曟嵁鐘舵�侊細</text>{{item['鍗曟嵁鐘舵��']}}
+ </view>
+ <view class="detail" v-if="item['鏃ユ湡']">
+ <text>鏃ユ湡锛�</text>{{item['鏃ユ湡']}}
+ </view>
+ <view class="detail" v-if="item['閮ㄩ棬']">
+ <text>閮ㄩ棬锛�</text>{{item['閮ㄩ棬']}}
+ </view>
+ <view class="detail" v-if="item['宸ュ簭']">
+ <text>宸ュ簭锛�</text>{{item['宸ュ簭']}}
+ </view>
+ <view class="detail" v-if="item['浜у搧缂栫爜']">
+ <text>浜у搧缂栫爜锛�</text>{{item['浜у搧缂栫爜']}}
+ </view>
+ <view class="detail" v-if="item['浜у搧鍚嶇О']">
+ <text>浜у搧鍚嶇О锛�</text>{{item['浜у搧鍚嶇О']}}
+ </view>
+ <view class="detail" v-if="item['瑙勬牸鍨嬪彿']">
+ <text>瑙勬牸鍨嬪彿锛�</text>{{item['瑙勬牸鍨嬪彿']}}
+ </view>
+ <view class="detail" v-if="item['璁￠噺鍗曚綅']">
+ <text>璁￠噺鍗曚綅锛�</text>{{item['璁￠噺鍗曚綅']}}
+ </view>
+ <view class="detail" v-if="item['鐢熶骇璁㈠崟']">
+ <text>鐢熶骇璁㈠崟锛�</text>{{item['鐢熶骇璁㈠崟']}}
+ </view>
+ <view class="detail" v-if="item['娴佽浆鍗�']">
+ <text>娴佽浆鍗★細</text>{{item['娴佽浆鍗�']}}
+ </view>
+ <view class="detail" v-if="item['鍒跺崟浜�']">
+ <text>鍒跺崟浜猴細</text>{{item['鍒跺崟浜�']}}
+ </view>
+ <view class="detail" v-if="item['瀹℃牳浜�']">
+ <text>瀹℃牳浜猴細</text>{{item['瀹℃牳浜�']}}
+ </view>
+ </view>
+ <view class="card-detail" v-if="showDetail == index">
+ <view class="detail" v-if="item['杩樻牱鍛�']">
+ <text>杩樻牱鍛橈細</text>{{item['杩樻牱鍛�']}}
+ </view>
+ <view class="detail" v-if="item['杩樻牱鏁伴噺']">
+ <text>杩樻牱鏁伴噺锛�</text>{{item['杩樻牱鏁伴噺']}}
+ </view>
+ <view class="detail" v-if="item['鏉ユ簮缁勭粐']">
+ <text>鏉ユ簮缁勭粐锛�</text>{{item['鏉ユ簮缁勭粐']}}
+ </view>
+ <view class="detail" v-if="item['璐ㄦ缁勭粐']">
+ <text>璐ㄦ缁勭粐锛�</text>{{item['璐ㄦ缁勭粐']}}
+ </view>
+ <view class="detail" v-if="item['宸ュ簭娴佽浆鍗″彿']">
+ <text>宸ュ簭娴佽浆鍗″彿锛�</text>{{item['宸ュ簭娴佽浆鍗″彿']}}
+ </view>
+ <view class="detail" v-if="item['宸ュ簭娴佽浆鍗″瓙鍐呯爜']">
+ <text>宸ュ簭娴佽浆鍗″瓙鍐呯爜锛�</text>{{item['宸ュ簭娴佽浆鍗″瓙鍐呯爜']}}
+ </view>
+ <view class="detail" v-if="item['宸ュ簭娴佽浆鍗℃暟閲�']">
+ <text>宸ュ簭娴佽浆鍗℃暟閲忥細</text>{{item['宸ュ簭娴佽浆鍗℃暟閲�']}}
+ </view>
+ <view class="detail" v-if="item['宸ュ簭娴佽浆鍗℃壒娆″彿']">
+ <text>宸ュ簭娴佽浆鍗℃壒娆″彿锛�</text>{{item['宸ュ簭娴佽浆鍗℃壒娆″彿']}}
+ </view>
+ <view class="detail" v-if="item['浠诲姟鍗曞彿']">
+ <text>浠诲姟鍗曞彿锛�</text>{{item['浠诲姟鍗曞彿']}}
+ </view>
+ <view class="detail" v-if="item['鍒跺崟鏃ユ湡']">
+ <text>鍒跺崟鏃ユ湡锛�</text>{{item['鍒跺崟鏃ユ湡']}}
+ </view>
+ <view class="detail" v-if="item['瀹℃牳鏃ユ湡']">
+ <text>瀹℃牳鏃ユ湡锛�</text>{{item['瀹℃牳鏃ユ湡']}}
+ </view>
+ <view class="detail" v-if="item['淇敼浜�']">
+ <text>淇敼浜猴細</text>{{item['淇敼浜�']}}
+ </view>
+ <view class="detail" v-if="item['淇敼鏃ユ湡']">
+ <text>淇敼鏃ユ湡锛�</text>{{item['淇敼鏃ユ湡']}}
+ </view>
+ <view class="detail" v-if="item['鍏抽棴浜�']">
+ <text>鍏抽棴浜猴細</text>{{item['鍏抽棴浜�']}}
+ </view>
+ <view class="detail" v-if="item['鍏抽棴鏃ユ湡']">
+ <text>鍏抽棴鏃ユ湡锛�</text>{{item['鍏抽棴鏃ユ湡']}}
+ </view>
+ <view class="detail" v-if="item['浣滃簾浜�']">
+ <text>浣滃簾浜猴細</text>{{item['浣滃簾浜�']}}
+ </view>
+ <view class="detail" v-if="item['浣滃簾鏃ユ湡']">
+ <text>浣滃簾鏃ユ湡锛�</text>{{item['浣滃簾鏃ユ湡']}}
+ </view>
+ </view>
+
+ <view class="more" v-if="showDetail == index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="more" v-if="showDetail != index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+
+ <view class="op" v-if="operations == index">
+ <!-- <button class="op1" size="mini" plain @tap.stop="">瀛愯〃淇℃伅</button> -->
+ <!-- <button class="op2" size="mini" plain @tap.stop="">鍙嶅鏍�</button> -->
+ <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+ <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+ </scroll-view>
+ <!-- 鍒嗛〉鍣� -->
+ <view class="page-footer">
+ <uni-pagination id="pagination" title="鏍囬鏂囧瓧" v-model="pageMeta.curPage" :pageSize="pageMeta.size"
+ :total="pageMeta.total" @change="onPageChangeHandler"></uni-pagination>
+ </view>
+ </view>
+</template>
+
+<script>
+ import dayjs from 'dayjs'
+ import {
+ CommonUtils
+ } from '@/utils/common.js'
+ import {
+ getUserInfo
+ } from '../../utils/auth'
+ export default {
+ data() {
+ return {
+ // 璁＄畻鍗＄墖鍒楄〃楂樺害
+ pagination_top: 0,
+ pageContent_top: 0,
+ // 鍒嗛〉鎺у埗
+ pageMeta: {
+ curPage: 1,
+ size: 50,
+ total: 0,
+ },
+ // 婊氬姩鎺у埗
+ scrollTop: 0,
+ old: {
+ scrollTop: 0
+ },
+
+ dateRangePicker: ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�",
+ "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"
+ ],
+ curDateGap: "杩戜竷澶�",
+ enableCustomDateRange: false,
+ startDate: dayjs(new Date()).subtract(7, 'day').format('YYYY-MM-DD'),
+ endDate: dayjs(new Date()).format('YYYY-MM-DD'),
+ HBillNo: '',
+
+ listData: [],
+ showDetail: -1,
+ operations: -1,
+ }
+ },
+ computed: {
+ pageContentHeight: {
+ get() {
+ return (this.pagination_top - this.pageContent_top)
+ }
+ },
+ },
+ onLoad() {
+ this.onSearchClickHandler()
+ },
+ onPullDownRefresh() {
+ this.onSearchClickHandler()
+ },
+ async onReady() {
+ // #ifndef MP-WEIXIN
+ let query = uni.createSelectorQuery().in(this)
+ query.select("#pagination")
+ .boundingClientRect((data) => {
+ if (data) {
+ this.pagination_top = data.top
+ } else {
+ console.log("鏈壘鍒�#pagination鑺傜偣");
+ }
+ })
+ .exec();
+ query.select("#pageContent")
+ .boundingClientRect((data) => {
+ if (data) {
+ this.pageContent_top = data.top
+ } else {
+ console.log("鏈壘鍒�#pageContent鑺傜偣");
+ }
+ })
+ .exec();
+ // #endif
+
+ },
+ methods: {
+ // 鏂板杩樻牱鍗�
+ onAddClickHandler() {
+ uni.navigateTo({
+ url: "/pages/huanyangdan/BackSampleCheckBill?operationType=0"
+ })
+ },
+ del(item) {
+ uni.showModal({
+ title: '鍒犻櫎纭',
+ content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ CommonUtils.doRequest2({
+ url: '/QC_TakeSampleCheckBill/DeleteQC_BackSampleCheckBillMain',
+ data: {
+ HInterID: item['hmainid'],
+ user: getUserInfo()['Czymc']
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ uni.showToast({
+ icon: 'none',
+ title: '鍒犻櫎鎴愬姛!'
+ })
+ this.onSearchClickHandler()
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
+ });
+ },
+ goTop: function(e) {
+ // 瑙ｅ喅view灞備笉鍚屾鐨勯棶棰�
+ this.scrollTop = this.old.scrollTop
+ this.$nextTick(function() {
+ this.scrollTop = 0
+ });
+ },
+ onDateRangePickerChangeHandler({
+ detail
+ }) {
+ this.enableCustomDateRange = false
+ this.curDateGap = this.dateRangePicker[detail.value]
+ let date = new Date()
+ switch (this.curDateGap) {
+ case "浠婂ぉ":
+ this.startDate = dayjs(date).format("YYYY-MM-DD")
+ break;
+ case "杩戜竴澶�":
+ this.startDate = dayjs(date).subtract(1, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜袱澶�":
+ this.startDate = dayjs(date).subtract(2, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜笁澶�":
+ this.startDate = dayjs(date).subtract(3, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戝洓澶�":
+ this.startDate = dayjs(date).subtract(4, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜簲澶�":
+ this.startDate = dayjs(date).subtract(5, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戝叚澶�":
+ this.startDate = dayjs(date).subtract(6, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜竷澶�":
+ this.startDate = dayjs(date).subtract(7, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩�30澶�":
+ this.startDate = dayjs(date).subtract(30, 'day').format("YYYY-MM-DD")
+ break;
+ }
+ if (this.curDateGap == '浠绘剰闂撮殧') {
+ this.enableCustomDateRange = true
+ }
+ },
+ onSearchClickHandler() {
+ let sWhere = ""
+ if (this.startDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.startDate + "'";
+ }
+ if (this.endDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.endDate + "'";
+ }
+ if (this.HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + this.HBillNo + "%'";
+ }
+ this.get_DisplayPage(sWhere);
+ },
+ clear() {
+ this.curDateGap = "杩戜竷澶�"
+ this.enableCustomDateRange = false
+ this.startDate = dayjs(new Date()).subtract(7, 'day').format('YYYY-MM-DD')
+ this.endDate = dayjs(new Date()).format('YYYY-MM-DD')
+ this.HBillNo = ''
+ },
+ async onResetClickHandler() {
+ this.clear()
+ await this.$nextTick()
+ this.onSearchClickHandler()
+ },
+ get_DisplayPage(sWhere) {
+ CommonUtils.doRequest2({
+ url: '/QC_TakeSampleCheckBill/get_QC_BackSampleCheckBillListPage',
+ data: {
+ "sWhere": sWhere,
+ "user": getUserInfo()["Czymc"],
+ "page": this.pageMeta.curPage,
+ "size": this.pageMeta.size
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ console.log('res.data: ', res.data);
+ this.listData = data;
+ this.pageMeta.total = count
+ uni.stopPullDownRefresh()
+ }
+ })
+ },
+ onPageChangeHandler() {
+ this.onSearchClickHandler()
+ this.goTop()
+ }
+ },
+ }
+</script>
+
+<style lang="scss">
+ .page-header {
+ display: flex;
+ box-sizing: border-box;
+ padding: 20rpx;
+ flex-direction: column;
+ gap: 10rpx;
+ font-size: 32rpx;
+
+ .search-item {
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: center;
+ align-items: center;
+
+ .left {
+ width: 4em;
+ }
+
+ .right {
+ flex: 1;
+ position: relative;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ display: flex;
+ padding: 4rpx 10rpx;
+
+ picker {
+ width: 100%;
+ }
+ }
+ }
+
+ input {
+ width: inherit;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+
+ .datetime-picker-inner {
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ display: flex;
+ align-items: center;
+ }
+
+ .font__enable {
+ color: #000;
+ }
+
+ .font__disable {
+ color: #cccccc;
+ }
+ }
+
+ .button-groups {
+ box-sizing: border-box;
+ padding: 10rpx 0 0 0;
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: space-between;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+
+ .btn-a {
+ background-color: #acacac;
+ color: #fff;
+ }
+
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
+
+ .page-content {
+ // height: 40vh;
+ box-sizing: border-box;
+ padding: 10rpx 0;
+
+ .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;
+ }
+ }
+ }
+
+ .more {
+ color: #888;
+ font-size: 24rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ text-align: center;
+ }
+ }
+
+ .op {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 20rpx;
+
+ button {
+ padding: 0;
+ width: 150rpx;
+ font-size: 25rpx;
+ }
+
+ .op1 {
+ border: 1px solid #41a863;
+ color: #41a863;
+ }
+
+ .op2 {
+ border: 1px solid #d98d00;
+ color: #d98d00;
+ }
+
+ .op3 {
+ border: 1px solid #3a78ff;
+ color: #3a78ff;
+ }
+
+ .op4 {
+ border: 1px solid #da0000;
+ color: #da0000;
+ }
+
+ .op5 {
+ border: 1px solid #888;
+ color: #888;
+ }
+ }
+ }
+
+ .page-footer {
+ position: fixed;
+ bottom: 0;
+ width: 100%;
+ box-sizing: border-box;
+ padding: 32rpx 40rpx;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a9889e2..4182bdf 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,6 +2,9 @@
<view class="content">
<view class="header">
鏅轰簯L-MES鍒堕�犳墽琛岀郴缁�
+ <view class="header-second">
+ {{ orgName }}
+ </view>
<view class="switch-button">
<uni-icons type="loop" @click="switchIconsModeHandler"></uni-icons>
</view>
@@ -46,6 +49,7 @@
},
data() {
return {
+ orgName: uni.getStorageSync("Organization"),
updateCount: 0,
menuListName: 'index',
canEdit: false,
@@ -485,8 +489,12 @@
font-weight: bold;
color: #FFFFFF;
text-align: center;
- padding: 9vh 0 6vh 0;
+ padding: 8vh 0 6vh 0;
position: relative;
+
+ .header-second{
+ font-size: 0.7em;
+ }
}
.switch-button {
diff --git a/pages/index/login.vue b/pages/index/login.vue
index 6c1f3b9..443f3c4 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -110,10 +110,11 @@
"鏉窞鍑礉濂堢壒": 'http://192.168.50.253:8080/API/',
"鏉窞鍑礉濂堢壒澶栫綉": 'http://erp.hzcabinet.cn:9090/API/',
"缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
- "闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.121:81/API/',
+ "闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.101:81/API/',
"闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.88.82:81/API/',
"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
"浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
+ "鏉ㄦ潈閼湰鍦版祴璇�": 'http://192.168.0.36:8082/API/',
// 灏忓崼鍐呭缃�
"鑻忓窞鍗櫤绉戞妧-澶栫綉": 'http://221.224.60.42:8082/API_WW/',
"鑻忓窞鍗櫤绉戞妧-鍐呯綉": 'http://172.16.20.233:8082/API_NW/',
@@ -127,8 +128,8 @@
"瀹佹尝鍗庤垷鍖呰1": "http://192.168.110.222:8082/API_NW/",
"瀹佹尝鍗庤垷鍖呰2": "http://192.168.88.167:8082/API_NW/",
"瀹佹尝鍗庤垷鍖呰": "http://61.164.64.222:8082/API_WW/",
- //浣欏鍗庤繙
- "浣欏鍗庤繙": "http://192.168.3.248:82/HuaYuaAPI/",
+ //浣欏鍗庤繙
+ "浣欏鍗庤繙": "http://192.168.3.248:82/HuaYuaAPI/",
},
serverUrlName: uni.getStorageSync('serverUrlName') || '瀹佹尝鍗庤垷鍖呰',
@@ -164,10 +165,13 @@
methods: {
async ApplyLanguagePack(lang, forceUpdate = false) {
// 璇诲彇璇█鍖呭苟鍔犺浇
- let {data, getRemoteFile} = await getLanguagePackJson(lang)
- if(getRemoteFile){
- this.$i18n.setLocaleMessage(lang, data)
- }
+ // let {
+ // data,
+ // getRemoteFile
+ // } = await getLanguagePackJson(lang)
+ // if (getRemoteFile) {
+ // this.$i18n.setLocaleMessage(lang, data)
+ // }
this.$i18n.locale = lang
},
onLanguageChangeHandler(e) {
@@ -302,124 +306,126 @@
title: '鐧诲綍涓�...',
mask: true
})
- if (this.serverUrlName =="浣欏鍗庤繙"){//鍗庤繙涓嶉渶瑕亀ms楠岃瘉
- var data = {
- UserName: this.UserName,
- PassWord: this.PassWord,
- HOrgName: this.HOrgName,
- Organization: this.Organization
- }
- var data2 = {//鐢ㄤ簬淇濆瓨鐧诲綍淇℃伅
- HUserNumber: this.UserName,
- HPassWord: this.PassWord,
- HStockOrgID: this.HOrgName,
- HStockOrgName: this.Organization
- }
- uni.setStorageSync('loginData', JSON.stringify(data2));
- uni.request({
- url: this.serverUrl + '/Web/GetUser',
- method: 'GET',
- data: data,
- success: (res) => {
- console.log(res)
- uni.hideLoading()
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- if (res.data.count == 1) {
- setLoginData(data2)
- setUserInfo(res.data.data[0])
- uni.setStorageSync('HUserName', res.data.data[0].Czymc);
- uni.setStorageSync('HBillerID', res.data.data[0].HK3UserID);
- uni.setStorageSync('SourceFlag', false);
- uni.setStorageSync('login', "login");
- uni.setStorageSync('Organization', this.Organization);
- uni.setStorageSync('OrganizationID', this.HOrgName);
- this.CommonUtils.setServerUrl(this.serverUrl)
- uni.reLaunch({
- url: '/pages/index/index'
+ if (this.serverUrlName == "浣欏鍗庤繙") { //鍗庤繙涓嶉渶瑕亀ms楠岃瘉
+ var data = {
+ UserName: this.UserName,
+ PassWord: this.PassWord,
+ HOrgName: this.HOrgName,
+ Organization: this.Organization
+ }
+ var data2 = { //鐢ㄤ簬淇濆瓨鐧诲綍淇℃伅
+ HUserNumber: this.UserName,
+ HPassWord: this.PassWord,
+ HStockOrgID: this.HOrgName,
+ HStockOrgName: this.Organization
+ }
+ uni.setStorageSync('loginData', JSON.stringify(data2));
+ uni.request({
+ url: this.serverUrl + '/Web/GetUser',
+ method: 'GET',
+ data: data,
+ success: (res) => {
+ console.log(res)
+ uni.hideLoading()
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
})
- }
- },
- fail: (res) => {
- console.log(res);
- uni.hideLoading()
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- });
- }else{
- var data = {
- HUserNumber: this.UserName,
- HPassWord: this.PassWord,
- HStockOrgID: this.HOrgName,
- HStockOrgName: this.Organization
- }
-
-
- uni.setStorageSync('loginData', JSON.stringify(data));
- uni.request({
- url: this.serverUrl + 'WEBSController/GetUser_Json',
- method: 'GET',
- data: data,
- success: (res) => {
- console.log(res)
- uni.hideLoading()
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- if (res.data.count == 1) {
- setLoginData(data)
- setUserInfo(res.data.data[0])
- uni.setStorageSync('HUserName', res.data.data[0].Czymc);
- uni.setStorageSync('HBillerID', res.data.data[0].HK3UserID);
- uni.setStorageSync('SourceFlag', false);
- uni.setStorageSync('login', "login");
- uni.setStorageSync('Organization', this.Organization);
- uni.setStorageSync('OrganizationID', this.HOrgName);
- //瀛樺偍閮ㄩ棬 鑱屽憳 浠撳簱 绛変俊鎭�
- uni.setStorageSync('HDeptID', res.data.data[0].HDeptID); //閮ㄩ棬
- uni.setStorageSync('HDeptName', res.data.data[0].HDeptName);
- uni.setStorageSync('HEmpID', res.data.data[0].HEmpID); //鑱屽憳
- uni.setStorageSync('HEmpName', res.data.data[0].HEmpName);
- uni.setStorageSync('HSCWHID', res.data.data[0].HSCWHID); //璋冨叆浠撳簱
- uni.setStorageSync('HSCWHName', res.data.data[0].HSCWHName);
- uni.setStorageSync('HWhID', res.data.data[0].HWhID); //瀵瑰簲浠撳簱
- uni.setStorageSync('HWhName', res.data.data[0].HWhName);
- uni.setStorageSync('HWorkCenterID', res.data.data[0].HWorkCenterID); //宸ヤ綔涓績
- uni.setStorageSync('HWorkCenterName', res.data.data[0].HWorkCenterName);
- uni.setStorageSync('HSecManagerID', res.data.data[0].HSecManagerID); //瀵瑰簲楠屾敹
- uni.setStorageSync('HSecManagerName', res.data.data[0].HSecManagerName);
- uni.setStorageSync('HGroupID', res.data.data[0].HGroupID); //瀵瑰簲鐝粍
- uni.setStorageSync('HGroupName', res.data.data[0].HGroupName);
- uni.setStorageSync('HProcID', res.data.data[0].HProcID); //瀵瑰簲宸ュ簭
- uni.setStorageSync('HProcName', res.data.data[0].HProcName);
- uni.setStorageSync('HSourceID', res.data.data[0].HSourceID); //瀵瑰簲鐢熶骇璧勬簮
- uni.setStorageSync('HSourceName', res.data.data[0].HSourceName);
- this.CommonUtils.setServerUrl(this.serverUrl)
- // this.WebSocketServices.createConnect(res.data.data[0].Czybm,res.data.data[0].Czymc);
- // getuiUtils.getClientID()
- getuiUtils.getClientID(res.data.data[0].Czybm, res.data.data[0].Czymc)
- uni.reLaunch({
- url: '/pages/index/index'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.hideLoading()
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- });
- }
-
+ if (res.data.count == 1) {
+ setLoginData(data2)
+ setUserInfo(res.data.data[0])
+ uni.setStorageSync('HUserName', res.data.data[0].Czymc);
+ uni.setStorageSync('HBillerID', res.data.data[0].HK3UserID);
+ uni.setStorageSync('SourceFlag', false);
+ uni.setStorageSync('login', "login");
+ uni.setStorageSync('Organization', this.Organization);
+ uni.setStorageSync('OrganizationID', this.HOrgName);
+ this.CommonUtils.setServerUrl(this.serverUrl)
+ uni.reLaunch({
+ url: '/pages/index/index'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.hideLoading()
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ } else {
+ var data = {
+ HUserNumber: this.UserName,
+ HPassWord: this.PassWord,
+ HStockOrgID: this.HOrgName,
+ HStockOrgName: this.Organization
+ }
+
+
+ uni.setStorageSync('loginData', JSON.stringify(data));
+ uni.request({
+ url: this.serverUrl + 'WEBSController/GetUser_Json',
+ method: 'GET',
+ data: data,
+ success: (res) => {
+ console.log(res)
+ uni.hideLoading()
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ if (res.data.count == 1) {
+ setLoginData(data)
+ setUserInfo(res.data.data[0])
+ uni.setStorageSync('HUserName', res.data.data[0].Czymc);
+ uni.setStorageSync('HBillerID', res.data.data[0].HK3UserID);
+ uni.setStorageSync('SourceFlag', false);
+ uni.setStorageSync('login', "login");
+ uni.setStorageSync('Organization', this.Organization);
+ uni.setStorageSync('OrganizationID', this.HOrgName);
+ //瀛樺偍閮ㄩ棬 鑱屽憳 浠撳簱 绛変俊鎭�
+ uni.setStorageSync('HDeptID', res.data.data[0].HDeptID); //閮ㄩ棬
+ uni.setStorageSync('HDeptName', res.data.data[0].HDeptName);
+ uni.setStorageSync('HEmpID', res.data.data[0].HEmpID); //鑱屽憳
+ uni.setStorageSync('HEmpName', res.data.data[0].HEmpName);
+ uni.setStorageSync('HSCWHID', res.data.data[0].HSCWHID); //璋冨叆浠撳簱
+ uni.setStorageSync('HSCWHName', res.data.data[0].HSCWHName);
+ uni.setStorageSync('HWhID', res.data.data[0].HWhID); //瀵瑰簲浠撳簱
+ uni.setStorageSync('HWhName', res.data.data[0].HWhName);
+ uni.setStorageSync('HWorkCenterID', res.data.data[0]
+ .HWorkCenterID); //宸ヤ綔涓績
+ uni.setStorageSync('HWorkCenterName', res.data.data[0].HWorkCenterName);
+ uni.setStorageSync('HSecManagerID', res.data.data[0]
+ .HSecManagerID); //瀵瑰簲楠屾敹
+ uni.setStorageSync('HSecManagerName', res.data.data[0].HSecManagerName);
+ uni.setStorageSync('HGroupID', res.data.data[0].HGroupID); //瀵瑰簲鐝粍
+ uni.setStorageSync('HGroupName', res.data.data[0].HGroupName);
+ uni.setStorageSync('HProcID', res.data.data[0].HProcID); //瀵瑰簲宸ュ簭
+ uni.setStorageSync('HProcName', res.data.data[0].HProcName);
+ uni.setStorageSync('HSourceID', res.data.data[0].HSourceID); //瀵瑰簲鐢熶骇璧勬簮
+ uni.setStorageSync('HSourceName', res.data.data[0].HSourceName);
+ this.CommonUtils.setServerUrl(this.serverUrl)
+ // this.WebSocketServices.createConnect(res.data.data[0].Czybm,res.data.data[0].Czymc);
+ // getuiUtils.getClientID()
+ getuiUtils.getClientID(res.data.data[0].Czybm, res.data.data[0].Czymc)
+ uni.reLaunch({
+ url: '/pages/index/index'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.hideLoading()
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ }
+
}
}
}
diff --git a/pages/index/tab1.vue b/pages/index/tab1.vue
index 5eaf4ed..3d933b9 100644
--- a/pages/index/tab1.vue
+++ b/pages/index/tab1.vue
@@ -9,8 +9,7 @@
<view v-if="!canEdit" :hidden="item.hidden||!item.id" class="box" v-for="(item,index) in itemData"
:key="index" @tap="toUrl(item)">
<template v-if="item.corner">
- <uni-badge :text="item.cornerCount" type="error" :max-num="99" size="normal"
- absolute="rightTop"
+ <uni-badge :text="item.cornerCount" type="error" :max-num="99" size="normal" absolute="rightTop"
:offset="[7, 7]">
<image :src="item.img" mode=""></image>
</uni-badge>
@@ -195,26 +194,46 @@
this.getHiddenItem()
},
async onShow() {
- if(this.initFinished) {
+ if (this.initFinished) {
let MessageIdentifier = await this.getMessageIdentifierCount(this.menuListName)
- if(MessageIdentifier.code == 0) {
+ if (MessageIdentifier.code == 0) {
CommonUtils.showTips({
title: "娓╅Θ鎻愮ず",
message: MessageIdentifier.msg
})
-
+
return
}
-
+
this.itemData.forEach((e, index) => {
- if(MessageIdentifier.data[e.text] != undefined) {
+ if (MessageIdentifier.data[e.text] != undefined) {
this.itemData[index]["corner"] = true
this.itemData[index]["cornerCount"] = MessageIdentifier.data[e.text]
}
})
-
+
this.$forceUpdate()
}
+ },
+ async onReady() {
+ let MessageIdentifier = await this.getMessageIdentifierCount(this.menuListName)
+ if (MessageIdentifier.code == 0) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: MessageIdentifier.msg
+ })
+
+ return
+ }
+
+ this.itemData.forEach((e, index) => {
+ if (MessageIdentifier.data[e.text] != undefined) {
+ this.itemData[index]["corner"] = true
+ this.itemData[index]["cornerCount"] = MessageIdentifier.data[e.text]
+ }
+ })
+
+ this.$forceUpdate()
},
methods: {
async getWorkLinkList() {
@@ -269,7 +288,7 @@
acc[item['moduleName']] = item.count
return acc
}, {})
-
+
return {
code: 1,
msg: Message,
@@ -283,14 +302,14 @@
}
}
} catch (err) {
-
+
}
},
async getHiddenItem() {
let data = await getMenuList({
menuName: this.menuListName
})
-
+
Array.from(data).forEach((e, index) => {
if (index < this.itemData.length) {
this.itemData[e["HIndex"]]["hidden"] = !CommonUtils.stringToBoolean(e[
@@ -298,22 +317,23 @@
this.itemData[e["HIndex"]].id = e["HEntryID"]; //id涓�0寮哄埗闅愯棌
}
})
-
+
let MessageIdentifier = await this.getMessageIdentifierCount(this.menuListName)
if (MessageIdentifier.code == 0) {
CommonUtils.showTips({
title: "娓╅Θ鎻愮ず",
message: MessageIdentifier.msg
})
-
+
return
}
-
+
Array.from(data).forEach((e, index) => {
if (index < this.itemData.length) {
if (MessageIdentifier.data[this.itemData[e["HIndex"]].text]) {
this.$set(this.itemData[e["HIndex"]], "corner", true)
- this.$set(this.itemData[e["HIndex"]], "cornerCount", MessageIdentifier.data[this.itemData[e["HIndex"]].text])
+ this.$set(this.itemData[e["HIndex"]], "cornerCount", MessageIdentifier.data[this
+ .itemData[e["HIndex"]].text])
}
}
})
diff --git a/pages/index/tab3.vue b/pages/index/tab3.vue
index 02c704f..0f1f1d2 100644
--- a/pages/index/tab3.vue
+++ b/pages/index/tab3.vue
@@ -323,6 +323,26 @@
this.$forceUpdate()
}
},
+ async onReady() {
+ let MessageIdentifier = await this.getMessageIdentifierCount(this.menuListName)
+ if (MessageIdentifier.code == 0) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: MessageIdentifier.msg
+ })
+
+ return
+ }
+
+ this.itemData.forEach((e, index) => {
+ if (MessageIdentifier.data[e.text] != undefined) {
+ this.itemData[index]["corner"] = true
+ this.itemData[index]["cornerCount"] = MessageIdentifier.data[e.text]
+ }
+ })
+
+ this.$forceUpdate()
+ },
methods: {
judgeHidden() {
return process.env.NODE_ENV === 'development'
diff --git a/pages/qijvguzhangdengji/mouldMistake.vue b/pages/qijvguzhangdengji/mouldMistake.vue
new file mode 100644
index 0000000..b3ac1ed
--- /dev/null
+++ b/pages/qijvguzhangdengji/mouldMistake.vue
@@ -0,0 +1,595 @@
+<template>
+ <view class="page" id="pageContent">
+ <view class="search-condition-zone">
+ <view class="form-item">
+ <view class="left">
+ 鏃ユ湡:
+ </view>
+ <view class="daterange" style="flex: 1;">
+ <view class="right general">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
+ <view>{{hform.HBeginDate}}</view>
+ </uni-datetime-picker>
+ </view>
+ <view>鈥�</view>
+ <view class="right general">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HEndDate">
+ <view>{{hform.HEndDate}}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">
+ 鍣ㄥ叿缂栫爜:
+ </view>
+ <view class="right general">
+ <input type="text" v-model="hform.HMoNumber" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">
+ 鍣ㄥ叿鍚嶇О:
+ </view>
+ <view class="right general">
+ <input type="text" v-model="hform.HMoName" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">
+ 鍗曟嵁鍙�:
+ </view>
+ <view class="right general">
+ <input type="text" v-model="hform.HBillNo" />
+ </view>
+ </view>
+ </view>
+ <view class="button-zone">
+ <button type="default" class="btn-a" size="mini" @tap="cmdAdd">鏂板</button>
+ <button type="default" class="btn-a" size="mini" @tap="cmdSearch">鏌ヨ</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="card-item" v-for="(item, index) in listDataShow">
+ <uni-card :title="item['鍗曟嵁鍙�']" :extra="'鏃ユ湡:' + item['鏃ユ湡'].split('T')[0]"
+ @tap="showDetail = showDetail==index?-1:index">
+ <view class="card-detail">
+ <view class="detail" v-if="item['鍙戠幇浜轰唬鐮�']">
+ <text>鍙戠幇浜轰唬鐮侊細</text>{{item['鍙戠幇浜轰唬鐮�']}}
+ </view>
+ <view class="detail" v-if="item['鍙戠幇浜�']">
+ <text>鍙戠幇浜猴細</text>{{item['鍙戠幇浜�']}}
+ </view>
+ <view class="detail" v-if="item['鏁呴殰绫诲埆浠ｇ爜']">
+ <text>鏁呴殰绫诲埆浠ｇ爜锛�</text>{{item['鏁呴殰绫诲埆浠ｇ爜']}}
+ </view>
+ <view class="detail" v-if="item['鏁呴殰绫诲埆']">
+ <text>鏁呴殰绫诲埆锛�</text>{{item['鏁呴殰绫诲埆']}}
+ </view>
+ <view class="detail" v-if="item['璐熻矗浜轰唬鐮�']">
+ <text>璐熻矗浜轰唬鐮侊細</text>{{item['璐熻矗浜轰唬鐮�']}}
+ </view>
+ <view class="detail" v-if="item['璐熻矗浜�']">
+ <text>璐熻矗浜猴細</text>{{item['璐熻矗浜�']}}
+ </view>
+ </view>
+ <view class="card-detail" v-if="showDetail == index">
+ <view class="detail" v-if="item.浣跨敤閮ㄩ棬浠ｇ爜">
+ <text>浣跨敤閮ㄩ棬浠ｇ爜锛�</text>{{item.浣跨敤閮ㄩ棬浠ｇ爜}}
+ </view>
+ <view class="detail" v-if="item.浣跨敤閮ㄩ棬">
+ <text>浣跨敤閮ㄩ棬锛�</text>{{item.浣跨敤閮ㄩ棬}}
+ </view>
+ <view class="detail" v-if="item.浜у搧妯″叿浠ｇ爜">
+ <text>鍣ㄥ叿缂栫爜锛�</text>{{item.浜у搧妯″叿浠ｇ爜}}
+ </view>
+ <view class="detail" v-if="item.浜у搧妯″叿">
+ <text>浜у搧鍣ㄥ叿锛�</text>{{item.浜у搧妯″叿}}
+ </view>
+ <view class="detail" v-if="item.妯″叿瑙勬牸">
+ <text>鍣ㄥ叿瑙勬牸锛�</text>{{item.妯″叿瑙勬牸}}
+ </view>
+ <view class="detail" v-if="item.妯″叿鍨嬪彿">
+ <text>鍣ㄥ叿鍨嬪彿锛�</text>{{item.妯″叿鍨嬪彿}}
+ </view>
+ <view class="detail" v-if="item.鏁呴殰鍙戠敓鏃ユ湡">
+ <text>鏁呴殰鍙戠敓鏃ユ湡锛�</text>{{item.鏁呴殰鍙戠敓鏃ユ湡.split("T")[0]}}
+ </view>
+ <view class="detail" v-if="item.瑕佹眰瀹屽杽鏃ユ湡">
+ <text>瑕佹眰瀹屽杽鏃ユ湡锛�</text>{{item.瑕佹眰瀹屽杽鏃ユ湡.split("T")[0]}}
+ </view>
+ <view class="detail" v-if="item.鎽樿">
+ <text>鎽樿锛�</text>{{item.鎽樿}}
+ </view>
+ <view class="detail" v-if="item.鍐呴儴鍗曟嵁鍙�">
+ <text>鍐呴儴鍗曟嵁鍙凤細</text>{{item.鍐呴儴鍗曟嵁鍙穧}
+ </view>
+ <view class="detail" v-if="item.鏁呴殰鎻忚堪">
+ <text>鏁呴殰鎻忚堪锛�</text>{{item.鏁呴殰鎻忚堪}}
+ </view>
+ <view class="detail" v-if="item.澶囨敞">
+ <text>澶囨敞锛�</text>{{item.澶囨敞}}
+ </view>
+ <view class="detail" v-if="item.鏁呴殰鍘熷洜浠ｇ爜">
+ <text>鏁呴殰鍘熷洜浠ｇ爜锛�</text>{{item.鏁呴殰鍘熷洜浠ｇ爜}}
+ </view>
+ <view class="detail" v-if="item.鏁呴殰鍘熷洜">
+ <text>鏁呴殰鍘熷洜锛�</text>{{item.鏁呴殰鍘熷洜}}
+ </view>
+ <view class="detail" v-if="item.鏁呴殰鍘熷洜鎻忚堪">
+ <text>鏁呴殰鍘熷洜鎻忚堪锛�</text>{{item.鏁呴殰鍘熷洜鎻忚堪}}
+ </view>
+ <view class="detail" v-if="item.瀛愯礋璐ｄ汉浠ｇ爜">
+ <text>瀛愯礋璐ｄ汉浠ｇ爜锛�</text>{{item.瀛愯礋璐ｄ汉浠ｇ爜}}
+ </view>
+ <view class="detail" v-if="item.瀛愯礋璐ｄ汉">
+ <text>瀛愯礋璐ｄ汉锛�</text>{{item.瀛愯礋璐ｄ汉}}
+ </view>
+ <view class="detail" v-if="item.鍏宠仈鏁伴噺">
+ <text>鍏宠仈鏁伴噺锛�</text>{{item.鍏宠仈鏁伴噺}}
+ </view>
+ <view class="detail" v-if="item.琛屽叧闂汉">
+ <text>琛屽叧闂汉锛�</text>{{item.琛屽叧闂汉}}
+ </view>
+ <view class="detail" v-if="item.鍏抽棴绫诲瀷">
+ <text>鍏抽棴绫诲瀷锛�</text>{{item.鍏抽棴绫诲瀷}}
+ </view>
+ <view class="detail" v-if="item.鍒跺崟浜�">
+ <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ </view>
+ <view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+ <text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.split('T')[0]}}
+ </view>
+ <view class="detail" v-if="item.淇敼浜�">
+ <text>淇敼浜猴細</text>{{item.淇敼浜簘}
+ </view>
+ <view class="detail" v-if="item.淇敼鏃ユ湡">
+ <text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.split('T')[0]}}
+ </view>
+ <view class="detail" v-if="item.鍏抽棴浜�">
+ <text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
+ </view>
+ <view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+ <text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.split('T')[0]}}
+ </view>
+ <view class="detail" v-if="item.浣滃簾浜�">
+ <text>浣滃簾浜猴細</text>{{item.浣滃簾浜簘}
+ </view>
+ <view class="detail" v-if="item.浣滃簾鏃ユ湡">
+ <text>浣滃簾鏃ユ湡锛�</text>{{item.浣滃簾鏃ユ湡.split('T')[0]}}
+ </view>
+ <view class="detail" v-if="item.婧愬崟鍗曞彿">
+ <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ </view>
+ <view class="detail" v-if="item.婧愬崟绫诲瀷">
+ <text>婧愬崟绫诲瀷锛�</text>{{item.婧愬崟绫诲瀷}}
+ </view>
+ </view>
+ <view class="more" v-if="showDetail == index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="more" v-if="showDetail != index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="op" v-if="operations == index">
+ <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+ <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="listDataShow.length == 0">鏆傛棤鏁版嵁</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'
+ import dayjs, {
+ Dayjs
+ } from 'dayjs'
+ export default {
+ data() {
+ return {
+
+ navHeight: 0,
+ scrollTop: 0,
+
+ showDetail: -1,
+ operations: -1,
+
+ hform: {
+ HBeginDate: dayjs(new Date).subtract(30, 'd').format('YYYY-MM-DD'),
+ HEndDate: dayjs(new Date).format('YYYY-MM-DD'),
+ HMoNumber: '',
+ HMoName: '',
+ HBillNo: ''
+ },
+
+ 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()
+ },
+ cmdAdd() {
+ uni.navigateTo({
+ url: "/pages/qijvguzhangdengji/mouldMistakeBill?operationType=1"
+ })
+ },
+ async cmdSearch() {
+ let sWhere = ''
+ if (this.hform.HBeginDate != "" && this.hform.HEndDate != "") {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) between '" + this.hform.HBeginDate + "' and '" +
+ this.hform.HEndDate + "' ";
+ }
+ if (this.hform.HMoNumber != "") {
+ sWhere += " and 浜у搧妯″叿浠ｇ爜 like '%" + this.hform.HMoNumber + "%'"
+ }
+ if (this.hform.HMoName != "") {
+ sWhere += " and 浜у搧妯″叿 like '%" + this.hform.HMoName + "%'"
+ }
+ if (this.hform.HBillNo != "") {
+ sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'"
+ }
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: '/Sc_MouldConkBookBill/GetMouldConkBookBillList_PDA',
+ data: {
+ "sWhere": sWhere,
+ "user": getUserInfo()["Czymc"]
+ },
+ })
+
+ if (!res) {
+ return
+ }
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count > 0) {
+ this.listData = data
+ this.paginationMeta.total = data.length
+ this.onPaginationChangeHandler({
+ current: 1
+ })
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ } catch (err) {
+ console.warn(err);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触:' + err,
+ icon: 'none'
+ })
+ }
+ },
+ async onPaginationChangeHandler({
+ current
+ }) {
+ this.listDataShow =
+ this.listData.slice((current - 1) * this.paginationMeta.pageSize,
+ current * this.paginationMeta.pageSize)
+
+ },
+ async del(item) {
+ console.log("delItem: ", item);
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+ success: async (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: '/Sc_MouldConkBookBill/DeltetMouldConkBookBill',
+ data: {
+ "HInterID": item.hmainid,
+ "user": getUserInfo()["Czymc"]
+ }
+ })
+
+ if (!res) {
+ return
+ }
+
+ let {
+ count,
+ code,
+ Message
+ } = res.data
+ if (count == 0) {
+ return uni.showModal({
+ title: '閿欒鎻愮ず',
+ content: `鍒犻櫎閿欒: ${Message}`,
+ showCancel: false
+ })
+ }
+ uni.showToast({
+ title: '鍒犻櫎鎴愬姛',
+ icon: 'none'
+ })
+ this.cmdSearch()
+ } catch (err) {
+ uni.showModal({
+ title: '閿欒鎻愮ず',
+ content: `鎺ュ彛璇锋眰澶辫触: ${err}`,
+ showCancel: false
+ })
+ }
+ }
+ },
+ })
+
+ },
+ edit(item) {
+ console.log("editItem:", item)
+ uni.navigateTo({
+ url: `/pages/qijvguzhangdengji/mouldMistakeBill?operationType=2&linterid=${item.hmainid}&hsubid=${item.hsubid}`
+ })
+ }
+ },
+ onLoad() {
+
+ this.$nextTick(() => {
+ this.cmdSearch()
+ })
+ },
+ onReady() {
+ // #ifndef MP-WEIXIN
+ let query = uni.createSelectorQuery().in(this)
+ query.select("#scroll-content").boundingClientRect((data) => {
+ this.pageMeta.scrollContentTop = data.top
+ }).exec()
+ query.select("#pagination-zone").boundingClientRect((data) => {
+ this.pageMeta.bottomBtnTop = data.top
+ }).exec()
+ // #endif
+ // #ifdef MP-WEIXIN
+ // 寰俊涓嶆敮鎸� uni.createSelectorQuery().in(this)
+ // #endif
+
+ },
+ }
+</script>
+
+<style lang="scss" scoped>
+ .page {
+ box-sizing: border-box;
+ display: flex;
+ flex-direction: column;
+ gap: 20rpx;
+ 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;
+ }
+ }
+ }
+ }
+ }
+
+ .daterange {
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: center;
+ align-items: center;
+ }
+
+ .more {
+ color: #888;
+ font-size: 24rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ text-align: center;
+ }
+ }
+
+ .op {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 20rpx;
+
+ button {
+ padding: 0;
+ width: 150rpx;
+ font-size: 25rpx;
+ }
+
+ .op1 {
+ border: 1px solid #41a863;
+ color: #41a863;
+ }
+
+ .op2 {
+ border: 1px solid #d98d00;
+ color: #d98d00;
+ }
+
+ .op3 {
+ border: 1px solid #3a78ff;
+ color: #3a78ff;
+ }
+
+ .op4 {
+ border: 1px solid #da0000;
+ color: #da0000;
+ }
+
+ .op5 {
+ border: 1px solid #888;
+ color: #888;
+ }
+ }
+
+ .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: 20rpx 40rpx 20rpx 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/qijvguzhangdengji/mouldMistakeBill.vue b/pages/qijvguzhangdengji/mouldMistakeBill.vue
new file mode 100644
index 0000000..72018db
--- /dev/null
+++ b/pages/qijvguzhangdengji/mouldMistakeBill.vue
@@ -0,0 +1,1129 @@
+<template>
+ <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>
+
+ <view v-if="tabs == 0">
+ <view class="form-item">
+ <view class="title">妯″叿鏉＄爜</view>
+ <view class="right" :class="barcodeReadOnly?'readonly':''">
+ <input type="text" :disabled="barcodeReadOnly" :focus="barCodeFocus" v-model="hform.HBarCode"
+ @confirm="getHBarCodeData(hform.HBarCode)" />
+ </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="righton" style="width: 350rpx;">
+ <input 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="right">
+ <uni-datetime-picker type="date">
+ <view style="font-size: 30rpx;">{{hform.HConkBeginDate}}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title required">鏁呴殰绫诲埆</view>
+ <view class="right">
+ <uni-combox :candidates="ConkTypeNameList" placeholder="璇烽�夋嫨鏁呴殰绫诲埆" v-model="hform.HConkTypeName"
+ @input="ConkTypeNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title required">鏁呴殰鍘熷洜</view>
+ <view class="right">
+ <uni-combox :candidates="ConkReasonNameList" placeholder="璇烽�夋嫨鏁呴殰鍘熷洜"
+ v-model="hform.HConkReasonName" @input="ConkReasonChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鏁呴殰鎻忚堪</view>
+ <view class="right">
+ <textarea value="" style="height: 6em;" maxlength="2000" placeholder="璇疯緭鍏ユ晠闅滄弿杩�..." />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�</view>
+ <view class="right">
+ <input name="HInterID" v-model="hform.HBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鏃ユ湡</view>
+ <view class="right">
+ <uni-datetime-picker type="date">
+ <view style="font-size: 30rpx;">{{hform.HDate}}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title required">閮ㄩ棬</view>
+ <view class="right">
+ <uni-combox :candidates="DeptNameList" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+ @input="DeptChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title required">鍙戠幇浜�</view>
+ <view class="right">
+ <uni-combox :candidates="EmpNameList" placeholder="璇烽�夋嫨鍙戠幇浜�" v-model="hform.HEmpName"
+ @input="EmpChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title required">璐熻矗浜�</view>
+ <view class="right">
+ <uni-combox :candidates="EmpNameList" placeholder="璇烽�夋嫨璐熻矗浜�" v-model="hform.HManagerName"
+ @input="ManagerChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍣ㄥ叿鍚嶇О</view>
+ <view class="righton">
+ <input disabled type="text" placeholder="璇疯緭鍏ュ櫒鍏峰悕绉�" v-model="hform.HBarName" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍣ㄥ叿瑙勬牸</view>
+ <view class="righton">
+ <input disabled type="text" placeholder="璇疯緭鍏ュ櫒鍏疯鏍�" v-model="hform.HBarSpec" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍣ㄥ叿鍨嬪彿</view>
+ <view class="righton">
+ <input disabled type="text" placeholder="璇疯緭鍏ュ櫒鍏峰瀷鍙�" v-model="hform.HBarModel" />
+ </view>
+ </view>
+ </view>
+
+ <view v-if="tabs == 1">
+ <view class="form-item">
+ <view class="title">鍒涘缓浜�:</view>
+ <view class="righton">
+ <input type="text" v-model="hform.HMaker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍒涘缓鏃ユ湡:</view>
+ <view class="righton">
+ <input type="text" v-model="hform.HMakeDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼浜�:</view>
+ <view class="righton">
+ <input type="text" v-model="hform.HUpDater" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼鏃ユ湡:</view>
+ <view class="righton">
+ <input type="text" v-model="hform.HUpDateDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳浜�:</view>
+ <view class="righton">
+ <input type="text" v-model="hform.HChecker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳鏃ユ湡:</view>
+ <view class="righton">
+ <input type="text" v-model="hform.HCheckDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾浜�:</view>
+ <view class="righton">
+ <input type="text" v-model="hform.HDeleteMan" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾鏃ユ湡:</view>
+ <view class="righton">
+ <input type="text" v-model="hform.HDeleteDate" disabled />
+ </view>
+ </view>
+ </view>
+
+ <view class="bottom-btn">
+ <button :class="EnableSave?'btn-a':'btn-c'" :disabled="!EnableSave" 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>
+ </view>
+ <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+ <BillListPopupMouldVue @BillSelectComplete="MouldBillHandler" ref="billListMould"></BillListPopupMouldVue>
+ </view>
+</template>
+<script>
+ import getDateTime from '@/utils/getdateTime.js';
+ import {
+ getUserInfo
+ } from "@/utils/auth.js";
+ import {
+ CommonUtils
+ } from '../../utils/common';
+ import {
+ getUserStockRelation
+ } from '../../utils/userRelationManager';
+ import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
+ import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+ import BillSelectPopupXiaoWeiVue from '../../components/BillSelectPopupXiaoWei/BillSelectPopupXiaoWei.vue';
+ import BillListPopupMouldVue from '../../components/BillListPopup/BillListPopup_Mould.vue';
+ import dayjs from 'dayjs';
+ import { MpaasScan } from '../../utils/mpaasScan';
+ export default {
+ components: {
+ BillListPopupVue,
+ BarCodePopupVue,
+ BillSelectPopupXiaoWeiVue,
+ BillListPopupMouldVue,
+ },
+
+ data() {
+ return {
+ HSourceBillNoFocus: false,
+
+ userInfo: getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ HModName: 'Kf_POStockInBackBill_PDA',
+ ModRightName: 'CE_POStockInBack',
+ OperationType: 1,
+ HInterID_Temp: '',
+
+ showHStockPlaceName: false,
+ showHMainSourceBillType: true,
+ showHSourceBillNo: true,
+ reHSourceBillNo: true,
+ showHSupName: true,
+ barCodeFocus: false,
+ barcodeReadOnly: false,
+ EnableSave: true, // 鏄惁鍚敤淇濆瓨
+
+
+ tabs: 0,
+
+ HBarCode: '',
+ linterid: '',
+ HBillNo: '',
+ btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
+ showmore: false,
+
+ materMeta: [],
+ Materlist: [],
+
+ // 鏁呴殰绫诲埆鍒楄〃
+ ConkTypeNameList: [],
+ ConkTypeList: [],
+ // 鏁呴殰鍘熷洜鍒楄〃
+ ConkReasonNameList: [],
+ ConkReasonList: [],
+ // 閮ㄩ棬鍒楄〃
+ DeptNameList: [],
+ DeptList: [],
+ // 鑱屽憳鍒楄〃(鍚屾椂浣滀负鍙戠幇浜哄拰璐熻矗浜虹殑鍙�夋嫨瀵硅薄)
+ EmpNameList: [],
+ EmpList: [],
+ // 鎻愪氦鏁版嵁
+ hform: {
+ "HBarCode": "",
+ "HConkBeginDate": dayjs(new Date()).format("YYYY-MM-DD hh:mm:ss"),
+ "HConkTypeName": "",
+ "HConkTypeID": "0",
+ "HConkReasonName": "",
+ "HConkReasonID": "0",
+ "HExplanation": "",
+ "HBillNo": "",
+ "HInterID": "0",
+ "HDate": dayjs(new Date()).format("YYYY-MM-DD hh:mm:ss"),
+ "HDeptName": getUserInfo()["HDeptName"],
+ "HDeptID": getUserInfo()["HDeptID"],
+ "HEmpName": getUserInfo().HEmpName,
+ "HEmpID": getUserInfo().HEmpID,
+ "HManagerName": getUserInfo().HSecManager,
+ "HManagerID": getUserInfo().HSecManagerID,
+ "HBarName": "",
+ "HMouldID": "0",
+ "HBarSpec": "",
+ "HBarModel": "",
+ "HMaker": getUserInfo()["Czymc"],
+ "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD hh:mm:ss"),
+ "HUpDater": "",
+ "HUpDateDate": "",
+ "HChecker": "",
+ "HCheckDate": "",
+ "HDeleteMan": "",
+ "HDeleteDate": "",
+ "lngBillKey": "",
+ "lngBillSubKey": "",
+ "HBillType": 3815,
+
+ }
+ }
+ },
+ computed: {
+
+
+ },
+ async onLoad(e) {
+ console.log(e, this.userInfo)
+ this.OperationType = e.OperationType
+ if (e.HInterID) {
+ this.HInterID_Temp = e.HInterID
+ // this.btnType = 1
+ this.RoadBillMain(e.HInterID)
+ this.barCodeFocus = true
+ } else {
+ this.getNewData()
+ this.HSourceBillNoFocus = true
+ this.refreshBarCodeState()
+ }
+
+ this.InitConkType()
+ this.InitConkReason()
+ this.InitDept()
+ this.InitEmp()
+ },
+ methods: {
+ searchModule() {
+ this.$refs['billListMould'].showPopup()
+ },
+ MouldBillHandler(mould) {
+ if(!mould.enableMultiSourceBill){
+ let val = mould.val[0]
+ this.hform.HBarCode = val['鏉＄爜缂栧彿']
+ this.getHBarCodeData(this.hform.HBarCode)
+ }
+ this.$refs['billListMould'].exit()
+ },
+ // 鏁呴殰绫诲埆
+ async InitConkType() { // 鍒濆鍖栨晠闅滅被鍒�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_ConkType/List_PDA',
+ data: {
+ sWhere: '',
+ user: getUserInfo()['Czymc']
+ }
+ })
+ let {
+ count,
+ code,
+ Message,
+ data
+ } = res.data
+ if (count == 1) {
+ this.ConkTypeList = data
+ this.ConkTypeNameList = Array.from(data).map(elem => elem['鏁呴殰绫诲埆鍚嶇О'])
+ } else {
+ CommonUtils.showTips({
+ title: '閿欒鎻愮ず',
+ message: "鍒濆鍖栨晠闅滅被鍨嬮敊璇�: " + Message,
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '閿欒鎻愮ず',
+ message: "鍒濆鍖栨晠闅滅被鍨嬮敊璇�: " + err,
+ })
+ }
+ },
+ ConkTypeNameChange(elem) { // 鏁呴殰绫诲埆鏀瑰彉 鍙ユ焺
+ let index = this.ConkTypeNameList.findIndex(e => e == elem)
+ if (index == -1) {
+ this.hform.HConkTypeName = ''
+ this.hform.HConkTypeID = 0
+ return
+ }
+
+ this.hform.HConkTypeName = this.ConkTypeList[index]['鏁呴殰绫诲埆鍚嶇О']
+ this.hform.HConkTypeID = this.ConkTypeList[index]['hitemid']
+
+ },
+
+ // 鏁呴殰鍘熷洜
+ async InitConkReason() { // 鍒濆鍖栨晠闅滃師鍥�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/PublicPageMethod/Gy_ConkReasonList_PDA',
+ data: {
+ sWhere: '',
+ }
+ })
+ let {
+ count,
+ code,
+ Message,
+ data
+ } = res.data
+ if (count == 1) {
+ this.ConkReasonList = data
+ this.ConkReasonNameList = Array.from(data).map(elem => elem['HName'])
+ } else {
+ CommonUtils.showTips({
+ title: '閿欒鎻愮ず',
+ message: "鍒濆鍖栨晠闅滃師鍥犻敊璇�: " + Message,
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '閿欒鎻愮ず',
+ message: "鍒濆鍖栨晠闅滃師鍥犻敊璇�: " + err,
+ })
+ }
+ },
+ ConkReasonChange(elem) { // 鏁呴殰鍘熷洜鏀瑰彉 鍙ユ焺
+ let index = this.ConkReasonNameList.findIndex(e => e == elem)
+
+ if (index == -1) {
+ this.hform.HConkReasonName = ''
+ this.hform.HConkReasonID = 0
+ return
+ }
+
+ this.hform.HConkReasonName = this.ConkReasonList[index]['HName']
+ this.hform.HConkReasonID = this.ConkReasonList[index]['HItemID']
+ },
+
+ // 閮ㄩ棬
+ async InitDept() { // 鍒濆鍖栭儴闂�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/PublicPageMethod/DeptList',
+ data: {
+ sWhere: 'where 1=1',
+ }
+ })
+ let {
+ count,
+ code,
+ Message,
+ data
+ } = res.data
+ if (count == 1) {
+ this.DeptList = data
+ this.DeptNameList = Array.from(data).map(elem => elem['HName'])
+ } else {
+ CommonUtils.showTips({
+ title: '閿欒鎻愮ず',
+ message: "鍒濆鍖栭儴闂ㄩ敊璇�: " + Message,
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '閿欒鎻愮ず',
+ message: "鍒濆鍖栭儴闂ㄩ敊璇�: " + err,
+ })
+ }
+ },
+ DeptChange(elem) { // 閮ㄩ棬鏀瑰彉 鍙ユ焺
+ let index = this.DeptNameList.findIndex(e => e == elem)
+
+ if (index == -1) {
+ this.hform.HDeptName = ''
+ this.hform.HDeptID = 0
+ return
+ }
+
+ this.hform.HDeptName = this.DeptList[index]['HName']
+ this.hform.HDeptID = this.DeptList[index]['HItemID']
+ },
+
+ // 鑱屽憳
+ async InitEmp() { // 鍒濆鍖栬亴鍛�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Web/GetEmployeeList_Json',
+ data: {
+ Employee: '',
+ HGroupID: 0,
+ }
+ })
+ let {
+ count,
+ code,
+ Message,
+ data
+ } = res.data
+ if (count == 1) {
+ this.EmpList = data
+ this.EmpNameList = Array.from(data).map(elem => elem['HName'])
+ } else {
+ CommonUtils.showTips({
+ title: '閿欒鎻愮ず',
+ message: "鍒濆鍖栬亴鍛橀敊璇�: " + Message,
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '閿欒鎻愮ず',
+ message: "鍒濆鍖栬亴鍛橀敊璇�: " + err,
+ })
+ }
+ },
+ EmpChange(elem) { // 鍙戠幇浜烘洿鏀�
+ let index = this.EmpNameList.findIndex(e => e == elem)
+
+ if (index == -1) {
+ this.hform.HEmpName = ''
+ this.hform.HEmpID = 0
+ return
+ }
+
+ this.hform.HEmpName = this.EmpList[index]['HName']
+ this.hform.HEmpID = this.EmpList[index]['HItemID']
+ },
+ ManagerChange(elem) { // 璐熻矗浜烘洿鏀�
+ let index = this.EmpNameList.findIndex(e => e == elem)
+
+ if (index == -1) {
+ this.hform.HManagerName = ''
+ this.hform.HManagerID = 0
+ return
+ }
+
+ this.hform.HManagerName = this.EmpList[index]['HName']
+ this.hform.HManagerID = this.EmpList[index]['HItemID']
+ },
+
+ async qrCodeDisplay() {
+ try {
+ this.$refs.barcodePopup.setCodeInfo(this.hform.HBillNo)
+ await this.$nextTick()
+ this.$refs.barcodePopup.open()
+ } catch (err) {
+ uni.showToast({
+ icon: 'none',
+ title: err
+ })
+ }
+ },
+ async refreshBarCodeState() {
+ this.barCodeFocus = false
+ await this.$nextTick(() => {
+ this.hform.HBarCode = ""
+ this.barCodeFocus = true
+ })
+ },
+ playSound(e) {
+ const innerAudioContext = uni.createInnerAudioContext();
+ if (e == 1) {
+ innerAudioContext.src = '/static/success.wav';
+ } else {
+ innerAudioContext.src = '/static/jingbao.wav';
+ }
+ innerAudioContext.play(); // 鎾斁闊抽
+ },
+ //鎵爜
+ toScanCode() {
+ var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+ mpaasScanModule.mpaasScan({
+ 'hideAlbum': true,
+ 'timeoutInterval': '10', //瓒呮椂鏃堕棿
+ 'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ }, (ret) => {
+ console.log(ret.resp_result)
+ if (this.hform.HBarCode == '*') {
+ this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+ } else {
+ this.hform.HBarCode = ret.resp_result
+ }
+
+ this.getHBarCodeData(this.hform.HBarCode)
+ })
+ },
+ //鏃ユ湡
+ HDateChange(e) {
+ console.log(e.detail.value)
+ this.hform.HDate = e.detail.value
+ },
+
+ // 鎵弿鏉＄爜
+ async getHBarCodeData(HBarCode) {
+ if (!HBarCode) {
+ CommonUtils.showTips({
+ message: '鏉″舰鐮佷笉鑳戒负绌�'
+ })
+ return
+ }
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/QJ_PDA_MouldDotCheckBill/txtHBarCode_KeyDown',
+ data: {
+ "HBarCode": HBarCode
+ }
+ })
+
+ let {
+ count,
+ data,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.hform.HMouldID = data[0].HInterID
+ this.hform.HBarName = data[0].HName
+ this.hform.HBarSpec = data[0].HModels
+ this.hform.HBarModel = data[0].HModel2
+ this.barcodeReadOnly = true
+ } else {
+ this.refreshBarCodeState()
+ return CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ } catch (err) {
+ this.refreshBarCodeState()
+ return CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: "鎺ュ彛璇锋眰澶辫触" + err
+ })
+ }
+
+ },
+ //鐗╂枡淇℃伅
+ DisBillEntryList() {
+ uni.request({
+ url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json',
+ data: {
+ HInterID: this.hform.HInterID,
+ HBillNo: this.hform.HBillNo,
+ HBillType: this.hform.HBillType,
+ HStockOrgID: this.hform.HStockOrgID
+ },
+ success: (res) => {
+ console.log('鐗╂枡', res.data)
+ if (res.data.count == 1) {
+ var data = res.data.data
+ this.materMeta = data.BarCodeDetailslist
+ this.Materlist = data.Materlist
+ if (/鍏磋揪/.test(uni.getStorageSync("Organization"))) {
+ // 鍏磋揪瀹㈡埛 甯﹀嚭 浠撳簱
+ console.log("鍏磋揪甯﹀嚭榛樿浠撳簱")
+ this.HWHNameChange(data.BarCodeDetailslist[0].HWHName)
+ }
+
+
+ if (!data.BarCodeDetailslist[0].HBarCode) {
+ this.hform.HMaterName_B = ''
+ this.hform.HMaterModel_B = ''
+ this.hform.HBatchNo_B = ''
+ this.hform.HUnitName_B = ''
+ this.hform.HQty_B = ''
+ this.hform.HTMQty_B = ''
+ this.hform.HWHName_B = ''
+ this.hform.HSPName_B = ''
+ } else {
+ this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
+ this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
+ this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
+ this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
+ this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
+ this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
+ this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
+ this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
+ }
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //鍒犻櫎鐗╂枡鐮�
+ delMater(item) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+ success: (res) => {
+ if (res.confirm) {
+ uni.request({
+ url: this.serverUrl +
+ '/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json',
+ data: {
+ HInterID: this.hform.HInterID,
+ HMaterID: item.HMaterID,
+ HAuxPropID: item.HAuxPropID,
+ HMTONo: item.HMTONo,
+ HSourceInterID: item.HSourceInterID,
+ HSourceEntryID: item.HSourceEntryID,
+ HBillType: this.hform.HBillType
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.DisBillEntryList()
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ }
+ }
+ });
+ },
+ // 鏂板鍥炶皟
+ addNew() {
+ uni.redirectTo({
+ url: '/pages/qijvguzhangdengji/mouldMistakeBill?OperationType=1'
+ })
+ },
+ //鏂板
+ getNewData() {
+ uni.request({
+ url: this.serverUrl + '/Web/GetMAXNum',
+ data: {
+ HBillType: this.hform.HBillType
+ },
+ success: (res) => {
+ // console.log(res.data)
+ if (res.data.count == 1) {
+ this.hform.HInterID = 0
+ this.hform.HBillNo = res.data.data[0].HBillNo
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //淇敼鍥炲～鏁版嵁
+ RoadBillMain(HInterID) {
+ uni.request({
+ url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json',
+ data: {
+ HInterID: HInterID,
+ HBillType: this.hform.HBillType
+ },
+ success: (res) => {
+ console.log(33, res.data.data[0]);
+ if (res.data.count == 1) {
+ var data = res.data.data[0]
+ this.hform.HInterID = data.HInterID
+ this.hform.HBillNo = data.HBillNo
+ this.hform.HMainSourceBillType = data.HSourceBillType
+ this.hform.HSourceBillNo = data.HSourceBillNo
+ if (data.HSourceBillType == 1105) {
+ this.hform.HMainSourceBillType = 1105
+ this.HMainSourceBillType = '閫�鏂欓�氱煡鍗�'
+ this.showHSupName = false
+ } else if (data.HSourceBillType == 1102) {
+ this.hform.HMainSourceBillType = 1102
+ this.HMainSourceBillType = '閲囪喘璁㈠崟'
+ this.showHSupName = false
+ } else if (data.HSourceBillType == 1201) {
+ this.hform.HMainSourceBillType = 1201
+ this.HMainSourceBillType = '閲囪喘鍏ュ簱鍗�'
+ this.showHSupName = false
+ } else {
+ this.hform.HMainSourceBillType = -1
+ this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+ }
+ this.showHMainSourceBillType = false
+
+ //闈炲婧愬崟妯″紡
+ if (data.HMulSourceBill == 0) {
+ this.showHSourceBillNo = false
+ }
+ this.hform.HDeptID = data.HDeptID
+ this.hform.HDeptName = data.HDeptName
+ this.hform.HSupID = data.HCusID
+ this.hform.HSupName = data.HSupName
+ this.DisBillEntryList()
+ this.tabs = 2
+ } else {
+ uni.showToast({
+ title: '鑾峰彇鏁版嵁鍥炲～澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ checkBillValidate() {
+ let message = ''
+
+ if (!this.hform.HConkTypeName) {
+ message = '鏈～鍐欐晠闅滅被鍒�'
+ } else if (!this.hform.HConkReasonName) {
+ message = '鏈～鍐欐晠闅滃師鍥�'
+ } else if (!this.hform.HDeptName) {
+ message = '鏈～鍐欓儴闂�'
+ } else if (!this.hform.HEmpName) {
+ message = '鏈～鍐欏彂鐜颁汉'
+ }
+ // else if (!this.hform.HManagerName) {
+ // message = '鏈～鍐欒礋璐ｄ汉'
+ // }
+
+ if (!message) {
+ return true
+ }
+
+ CommonUtils.showTips({
+ message: message
+ })
+ return false
+ },
+ async submit() {
+ if (!this.checkBillValidate()) {
+ return
+ }
+ let oMain = JSON.stringify(this.hform)
+ let sSubStr = JSON.stringify([{
+ "HConkReasonID": this.hform.HConkReasonID,
+ "HConkReasonCode": "",
+ "HConkReasonName": this.hform.HConkReasonName,
+ "HConkExplanation": this.hform.HExplanation,
+ "HManagerID": this.hform.HManagerID,
+ "HManagerCode": "",
+ "HManagerName": this.hform.HManagerName,
+ "HRemark": " "
+ }])
+ let sMainSub = `${oMain};${sSubStr};${getUserInfo()["Czymc"]};1`
+ try {
+ this.EnableSave = false
+ let res = await CommonUtils.doRequest2Sync({
+ url: '/Sc_MouldConkBookBill/SaveGetMouldConkBookBillList',
+ data: {
+ msg: sMainSub
+ },
+ method: 'POST'
+ })
+
+ if (!res) {
+ return
+ }
+
+ let {
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: '/pages/qijvguzhangdengji/mouldMistakeBill?OperationType=1'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ // setTimeout(() => {
+ // uni.navigateBack();
+ // }, 50)
+ }
+ }
+ });
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ this.EnableSave = true
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: err
+ })
+ this.EnableSave = true
+ }
+ },
+
+ goBack() {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.navigateBack()
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
+ });
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .form {
+ width: 668rpx;
+ margin: 20rpx auto;
+ padding-bottom: 240rpx;
+ }
+
+ .tab_area {
+ width: 100%;
+ height: 50rpx;
+ }
+
+ .other {
+ margin-top: 8rpx;
+ text-align: center;
+ font-size: 28rpx;
+ padding: 4rpx 18rpx;
+ color: #1890FF;
+ }
+
+ .tabs {
+ width: 100%;
+ display: flex;
+ border-bottom: 1px solid #ddd;
+ margin: 20rpx 0;
+
+ view {
+ width: 25%;
+ font-size: 30rpx;
+ color: #555;
+ text-align: center;
+ padding: 16rpx 0;
+ }
+
+ .on {
+ color: #3a78ff;
+ font-weight: bold;
+ border-bottom: 3px solid #3a78ff;
+ }
+ }
+
+ .form-item {
+ display: flex;
+ align-items: center;
+ font-size: inherit;
+ padding: 6rpx 0;
+ gap: 12rpx;
+
+ .title {
+ width: 200rpx;
+ font-size: 30rpx;
+
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
+
+ .right {
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ position: relative;
+ padding: 8rpx 16rpx;
+ display: flex;
+ font-size: 30rpx;
+
+ picker {
+ width: 100%;
+ }
+
+ .uni-combox {
+ width: 100%;
+ padding: 0;
+
+ ::v-deep .uni-combox__input {
+ font-size: 30rpx;
+ height: auto;
+ }
+ }
+ }
+
+ .righton {
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ padding: 8rpx 16rpx;
+ font-size: 30rpx;
+ }
+
+ input {
+ width: 100%;
+ font-size: 30rpx;
+ }
+
+ textarea {
+ width: 98%;
+ font-size: 30rpx;
+ }
+
+ }
+
+ .bottom-btn {
+ width: 100%;
+ box-sizing: border-box;
+ // 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 40rpx 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-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #acacac;
+ color: #fff;
+ // position: absolute;
+ // right: 120rpx;
+ }
+
+ .btn-d {
+ background-color: #ff8901;
+ color: #fff;
+ }
+ }
+
+ .list {
+ width: 100%;
+
+ .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;
+ }
+ }
+ }
+
+ .more {
+ color: #888;
+ font-size: 24rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ text-align: center;
+ }
+ }
+ }
+
+ .icon-wrapper {
+ background-color: #3A78FF;
+ width: 52rpx;
+ height: 52rpx;
+ border-radius: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ .uni-icons {
+ color: #fff !important;
+ }
+ }
+
+ .required {
+ position: relative;
+
+ }
+
+ .required::after {
+ content: "*";
+ position: relative;
+ color: red;
+ left: 0;
+ top: 0;
+ font-size: inherit;
+ }
+
+ .icon-wrapper[disabled] {
+ background-color: rgba(228, 228, 228, 1);
+ pointer-events: none;
+ touch-action: none;
+ }
+
+ .readonly {
+ background-color: #efefef4d;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/qitachuku_v2/OtherOutBill.vue b/pages/qitachuku_v2/OtherOutBill.vue
index e8b17ba..b2c20ed 100644
--- a/pages/qitachuku_v2/OtherOutBill.vue
+++ b/pages/qitachuku_v2/OtherOutBill.vue
@@ -2,7 +2,9 @@
<view>
<view class="form">
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.BarCode") == "Kf_OtherOutBill_PDA.BarCode" ? "鏉＄爜" : $t("Kf_OtherOutBill_PDA.BarCode") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.BarCode") == "Kf_OtherOutBill_PDA.BarCode" ? "鏉＄爜" : $t("Kf_OtherOutBill_PDA.BarCode") }}锛�
+ </view>
<view class="right" style="width: 380rpx;">
<input :focus="BarCodeFocus" v-model="hform.HBarCode" :placeholder="placeholder_BarCode"
@confirm="getCode(hform.HBarCode)" />
@@ -12,40 +14,59 @@
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Qty") == "Kf_OtherOutBill_PDA.Qty" ? "鏁伴噺" : $t("Kf_OtherOutBill_PDA.Qty") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Qty") == "Kf_OtherOutBill_PDA.Qty" ? "鏁伴噺" : $t("Kf_OtherOutBill_PDA.Qty") }}锛�
+ </view>
<view class="right">
<input v-model="hform.HQty" :placeholder="placeholder_Qty" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Warehouse") == "Kf_OtherOutBill_PDA.Warehouse" ? "浠撳簱" : $t("Kf_OtherOutBill_PDA.Warehouse") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Warehouse") == "Kf_OtherOutBill_PDA.Warehouse" ? "浠撳簱" : $t("Kf_OtherOutBill_PDA.Warehouse") }}锛�
+ </view>
<view class="right">
<uni-combox :candidates="arrayHWHName" :placeholder="placeholder_Warehouse" v-model="hform.HWHName"
@input="HWHNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.StockPlace") == "Kf_OtherOutBill_PDA.StockPlace" ? "浠撲綅" : $t("Kf_OtherOutBill_PDA.StockPlace") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.StockPlace") == "Kf_OtherOutBill_PDA.StockPlace" ? "浠撲綅" : $t("Kf_OtherOutBill_PDA.StockPlace") }}锛�
+ </view>
<view class="right" v-show="showHStockPlaceName">
<uni-combox :candidates="HStockPlaceNameListComputed" :placeholder="placeholder_StockPlace"
v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
</view>
<view class="righton" v-show="!showHStockPlaceName">
- <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" :placeholder="$t('Kf_OtherOutBill_PDA.disabledPlaceholder')" />
+ <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName"
+ :placeholder="$t('Kf_OtherOutBill_PDA.disabledPlaceholder')" />
</view>
</view>
<view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">{{ $t("Kf_OtherOutBill_PDA.selectSource") == "Kf_OtherOutBill_PDA.selectSource" ? "閫夋嫨婧愬崟" : $t("Kf_OtherOutBill_PDA.selectSource") }}</view>
- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">{{ $t("Kf_OtherOutBill_PDA.tableInfo") == "Kf_OtherOutBill_PDA.tableInfo" ? "琛ㄥご淇℃伅" : $t("Kf_OtherOutBill_PDA.tableInfo") }}</view>
- <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">{{ $t("Kf_OtherOutBill_PDA.materInfo") == "Kf_OtherOutBill_PDA.materInfo" ? "鐗╂枡淇℃伅" : $t("Kf_OtherOutBill_PDA.materInfo") }}</view>
- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">{{ $t("Kf_OtherOutBill_PDA.barInfo") == "Kf_OtherOutBill_PDA.barInfo" ? "鏉＄爜淇℃伅" : $t("Kf_OtherOutBill_PDA.barInfo") }}</view>
- <view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">{{ $t("Kf_OtherOutBill_PDA.removeShelvesInfo") == "Kf_OtherOutBill_PDA.removeShelvesInfo" ? "涓嬫灦淇℃伅" : $t("Kf_OtherOutBill_PDA.removeShelvesInfo") }}</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">
+ {{ $t("Kf_OtherOutBill_PDA.selectSource") == "Kf_OtherOutBill_PDA.selectSource" ? "閫夋嫨婧愬崟" : $t("Kf_OtherOutBill_PDA.selectSource") }}
+ </view>
+ <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">
+ {{ $t("Kf_OtherOutBill_PDA.tableInfo") == "Kf_OtherOutBill_PDA.tableInfo" ? "琛ㄥご淇℃伅" : $t("Kf_OtherOutBill_PDA.tableInfo") }}
+ </view>
+ <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">
+ {{ $t("Kf_OtherOutBill_PDA.materInfo") == "Kf_OtherOutBill_PDA.materInfo" ? "鐗╂枡淇℃伅" : $t("Kf_OtherOutBill_PDA.materInfo") }}
+ </view>
+ <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">
+ {{ $t("Kf_OtherOutBill_PDA.barInfo") == "Kf_OtherOutBill_PDA.barInfo" ? "鏉＄爜淇℃伅" : $t("Kf_OtherOutBill_PDA.barInfo") }}
+ </view>
+ <view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">
+ {{ $t("Kf_OtherOutBill_PDA.removeShelvesInfo") == "Kf_OtherOutBill_PDA.removeShelvesInfo" ? "涓嬫灦淇℃伅" : $t("Kf_OtherOutBill_PDA.removeShelvesInfo") }}
+ </view>
</view>
<view v-if="tabs == 0">
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.SourceBillType") == "Kf_OtherOutBill_PDA.SourceBillType" ? "婧愬崟绫诲瀷" : $t("Kf_OtherOutBill_PDA.SourceBillType") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.SourceBillType") == "Kf_OtherOutBill_PDA.SourceBillType" ? "婧愬崟绫诲瀷" : $t("Kf_OtherOutBill_PDA.SourceBillType") }}锛�
+ </view>
<view class="right" v-show="showHMainSourceBillType">
<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
@change="HMainSourceBillTypeChange">
@@ -60,54 +81,75 @@
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.SourceBillNo") == "Kf_OtherOutBill_PDA.SourceBillNo" ? "婧愬崟鍗曞彿" : $t("Kf_OtherOutBill_PDA.SourceBillNo") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.SourceBillNo") == "Kf_OtherOutBill_PDA.SourceBillNo" ? "婧愬崟鍗曞彿" : $t("Kf_OtherOutBill_PDA.SourceBillNo") }}锛�
+ </view>
<view class="right" v-show="showHSourceBillNo">
<input :focus="HSourceBillNoFocus" @confirm="onHSourceBillNoConfirmHandler" type="text"
- name="HSourceBillNo" v-model="hform.HSourceBillNo" :placeholder="placeholder_SourceBillNo" />
+ name="HSourceBillNo" v-model="hform.HSourceBillNo"
+ :placeholder="placeholder_SourceBillNo" />
</view>
+ <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+ <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
+ </view>
+
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType == -1">
<uni-icons :hidden="hform.HMainSourceBillType == -1" type="search" size="20"
@click="showBillList"></uni-icons>
</view>
<view class="righton" v-show="!showHSourceBillNo">
- <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" :placeholder="placeholder_SourceBillNo" />
+ <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo"
+ :placeholder="placeholder_SourceBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.BillSubType") == "Kf_OtherOutBill_PDA.BillSubType" ? "鍗曟嵁瀛愮被鍨�" : $t("Kf_OtherOutBill_PDA.BillSubType") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.BillSubType") == "Kf_OtherOutBill_PDA.BillSubType" ? "鍗曟嵁瀛愮被鍨�" : $t("Kf_OtherOutBill_PDA.BillSubType") }}锛�
+ </view>
<view class="right">
<picker :range="arrayHBillSubType" v-model="hform.HBillSubType" @change="HBillSubTypeChange">
- <input disabled name="HMainSourceBillType" v-model="HBillSubType" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_BillSubType')" />
+ <input disabled name="HMainSourceBillType" v-model="HBillSubType"
+ :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_BillSubType')" />
<view class="picker-overlay"></view>
</picker>
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.FIFOWarehouse") == "Kf_OtherOutBill_PDA.FIFOWarehouse" ? "鍏堣繘鍏堝嚭浠�" : $t("Kf_OtherOutBill_PDA.FIFOWarehouse") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.FIFOWarehouse") == "Kf_OtherOutBill_PDA.FIFOWarehouse" ? "鍏堣繘鍏堝嚭浠�" : $t("Kf_OtherOutBill_PDA.FIFOWarehouse") }}锛�
+ </view>
<view class="right">
- <uni-combox :candidates="arrayHWHName" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_FIFOWarehouse')" v-model="hform.HFIFOWHName"
- @input="HFIFOWHNameChange"></uni-combox>
+ <uni-combox :candidates="arrayHWHName"
+ :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_FIFOWarehouse')"
+ v-model="hform.HFIFOWHName" @input="HFIFOWHNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Date") == "Kf_OtherOutBill_PDA.Date" ? "鏃ユ湡" : $t("Kf_OtherOutBill_PDA.Date") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Date") == "Kf_OtherOutBill_PDA.Date" ? "鏃ユ湡" : $t("Kf_OtherOutBill_PDA.Date") }}锛�
+ </view>
<view class="right">
<picker mode="date" v-model="hform.HDate" @change="HDateChange">
<view class="picker-overlay"></view>
- <input disabled v-model="hform.HDate" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Date')" />
+ <input disabled v-model="hform.HDate"
+ :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Date')" />
</picker>
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Maker") == "Kf_OtherOutBill_PDA.Maker" ? "鍒跺崟浜�" : $t("Kf_OtherOutBill_PDA.Maker") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Maker") == "Kf_OtherOutBill_PDA.Maker" ? "鍒跺崟浜�" : $t("Kf_OtherOutBill_PDA.Maker") }}锛�
+ </view>
<view class="righton">
<input name="HMaker" disabled v-model="hform.HMaker" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.BillNo") == "Kf_OtherOutBill_PDA.BillNo" ? "鍗曟嵁鍙�" : $t("Kf_OtherOutBill_PDA.BillNo") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.BillNo") == "Kf_OtherOutBill_PDA.BillNo" ? "鍗曟嵁鍙�" : $t("Kf_OtherOutBill_PDA.BillNo") }}锛�
+ </view>
<view class="righton">
<input name="HBillNo" disabled v-model="hform.HBillNo" />
</view>
@@ -116,7 +158,9 @@
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.BillID") == "Kf_OtherOutBill_PDA.BillID" ? "鍗曟嵁ID" : $t("Kf_OtherOutBill_PDA.BillID") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.BillID") == "Kf_OtherOutBill_PDA.BillID" ? "鍗曟嵁ID" : $t("Kf_OtherOutBill_PDA.BillID") }}锛�
+ </view>
<view class="righton">
<input name="HInterID" disabled v-model="hform.HInterID" />
</view>
@@ -125,34 +169,48 @@
<view v-if="tabs == 1">
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Keeper") == "Kf_OtherOutBill_PDA.Keeper" ? "淇濈" : $t("Kf_OtherOutBill_PDA.Keeper") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Keeper") == "Kf_OtherOutBill_PDA.Keeper" ? "淇濈" : $t("Kf_OtherOutBill_PDA.Keeper") }}锛�
+ </view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Keeper')" v-model="hform.HKeeperName"
+ <uni-combox :candidates="arrayHEmpName"
+ :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Keeper')" v-model="hform.HKeeperName"
@input="HKeeperNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.SecManager") == "Kf_OtherOutBill_PDA.SecManager" ? "楠屾敹" : $t("Kf_OtherOutBill_PDA.SecManager") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.SecManager") == "Kf_OtherOutBill_PDA.SecManager" ? "楠屾敹" : $t("Kf_OtherOutBill_PDA.SecManager") }}锛�
+ </view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_SecManager')" v-model="hform.HSecManagerName"
- @input="HSecManagerNameChange"></uni-combox>
+ <uni-combox :candidates="arrayHEmpName"
+ :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_SecManager')"
+ v-model="hform.HSecManagerName" @input="HSecManagerNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Dept") == "Kf_OtherOutBill_PDA.Dept" ? "閮ㄩ棬" : $t("Kf_OtherOutBill_PDA.Dept") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Dept") == "Kf_OtherOutBill_PDA.Dept" ? "閮ㄩ棬" : $t("Kf_OtherOutBill_PDA.Dept") }}锛�
+ </view>
<view class="right">
- <uni-combox :candidates="arrayHDeptName" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Dept')" v-model="hform.HDeptName"
+ <uni-combox :candidates="arrayHDeptName"
+ :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Dept')" v-model="hform.HDeptName"
@input="HDeptNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Customer") == "Kf_OtherOutBill_PDA.Customer" ? "瀹㈡埛" : $t("Kf_OtherOutBill_PDA.Customer") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Customer") == "Kf_OtherOutBill_PDA.Customer" ? "瀹㈡埛" : $t("Kf_OtherOutBill_PDA.Customer") }}锛�
+ </view>
<view class="righton">
- <input name="HSupName" disabled v-model="hform.HSupName" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Customer')" />
+ <input name="HSupName" disabled v-model="hform.HSupName"
+ :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Customer')" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.StockOrg") == "Kf_OtherOutBill_PDA.StockOrg" ? "缁勭粐" : $t("Kf_OtherOutBill_PDA.StockOrg") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.StockOrg") == "Kf_OtherOutBill_PDA.StockOrg" ? "缁勭粐" : $t("Kf_OtherOutBill_PDA.StockOrg") }}锛�
+ </view>
<view class="righton">
<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
</view>
@@ -184,7 +242,9 @@
</view>
</uni-card>
</view>
- <view class="over" v-if="Materlist.length == 0">{{ $t("Kf_OtherOutBill_PDA.noData") == "Kf_OtherOutBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("Kf_OtherOutBill_PDA.noData") }}</view>
+ <view class="over" v-if="Materlist.length == 0">
+ {{ $t("Kf_OtherOutBill_PDA.noData") == "Kf_OtherOutBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("Kf_OtherOutBill_PDA.noData") }}
+ </view>
</view>
<view v-if="tabs == 4">
@@ -216,60 +276,80 @@
</view>
</uni-card>
</view>
- <view class="over" v-if="FIFOlist.length == 0">{{ $t("Kf_OtherOutBill_PDA.noData") == "Kf_OtherOutBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("Kf_OtherOutBill_PDA.noData") }}</view>
+ <view class="over" v-if="FIFOlist.length == 0">
+ {{ $t("Kf_OtherOutBill_PDA.noData") == "Kf_OtherOutBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("Kf_OtherOutBill_PDA.noData") }}
+ </view>
</view>
<view v-if="tabs == 3">
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.BarCode") == "Kf_OtherOutBill_PDA.BarCode" ? "鏉＄爜" : $t("Kf_OtherOutBill_PDA.BarCode") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.BarCode") == "Kf_OtherOutBill_PDA.BarCode" ? "鏉＄爜" : $t("Kf_OtherOutBill_PDA.BarCode") }}锛�
+ </view>
<view class="righton">
<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Material") == "Kf_OtherOutBill_PDA.Material" ? "鐗╂枡" : $t("Kf_OtherOutBill_PDA.Material") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Material") == "Kf_OtherOutBill_PDA.Material" ? "鐗╂枡" : $t("Kf_OtherOutBill_PDA.Material") }}锛�
+ </view>
<view class="righton">
<input disabled v-model="hform.HMaterName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.MaterModel") == "Kf_OtherOutBill_PDA.MaterModel" ? "瑙勬牸" : $t("Kf_OtherOutBill_PDA.MaterModel") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.MaterModel") == "Kf_OtherOutBill_PDA.MaterModel" ? "瑙勬牸" : $t("Kf_OtherOutBill_PDA.MaterModel") }}锛�
+ </view>
<view class="righton">
<input disabled v-model="hform.HMaterModel_B" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.BatchNo") == "Kf_OtherOutBill_PDA.BatchNo" ? "鎵规" : $t("Kf_OtherOutBill_PDA.BatchNo") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.BatchNo") == "Kf_OtherOutBill_PDA.BatchNo" ? "鎵规" : $t("Kf_OtherOutBill_PDA.BatchNo") }}锛�
+ </view>
<view class="righton">
<input disabled v-model="hform.HBatchNo_B" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Unit") == "Kf_OtherOutBill_PDA.Unit" ? "鍗曚綅" : $t("Kf_OtherOutBill_PDA.Unit") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Unit") == "Kf_OtherOutBill_PDA.Unit" ? "鍗曚綅" : $t("Kf_OtherOutBill_PDA.Unit") }}锛�
+ </view>
<view class="righton">
<input disabled v-model="hform.HUnitName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Qty") == "Kf_OtherOutBill_PDA.Qty" ? "鏁伴噺" : $t("Kf_OtherOutBill_PDA.Qty") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Qty") == "Kf_OtherOutBill_PDA.Qty" ? "鏁伴噺" : $t("Kf_OtherOutBill_PDA.Qty") }}锛�
+ </view>
<view class="righton">
<input disabled v-model="hform.HQty_B" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Capacity") == "Kf_OtherOutBill_PDA.Capacity" ? "瀹归噺" : $t("Kf_OtherOutBill_PDA.Capacity") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Capacity") == "Kf_OtherOutBill_PDA.Capacity" ? "瀹归噺" : $t("Kf_OtherOutBill_PDA.Capacity") }}锛�
+ </view>
<view class="righton">
<input disabled v-model="hform.HTMQty_B" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.Warehouse") == "Kf_OtherOutBill_PDA.Warehouse" ? "浠撳簱" : $t("Kf_OtherOutBill_PDA.Warehouse") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.Warehouse") == "Kf_OtherOutBill_PDA.Warehouse" ? "浠撳簱" : $t("Kf_OtherOutBill_PDA.Warehouse") }}锛�
+ </view>
<view class="righton">
<input disabled v-model="hform.HWHName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">{{ $t("Kf_OtherOutBill_PDA.StockPlace") == "Kf_OtherOutBill_PDA.StockPlace" ? "浠撲綅" : $t("Kf_OtherOutBill_PDA.StockPlace") }}锛�</view>
+ <view class="title">
+ {{ $t("Kf_OtherOutBill_PDA.StockPlace") == "Kf_OtherOutBill_PDA.StockPlace" ? "浠撲綅" : $t("Kf_OtherOutBill_PDA.StockPlace") }}锛�
+ </view>
<view class="righton">
<input disabled v-model="hform.HSPName_B" />
</view>
@@ -277,10 +357,13 @@
</view>
<view class="bottom-btn">
- <button class="btn-a" size="mini" @tap="submit">{{ $t("Kf_OtherOutBill_PDA.btnSubmit") == "Kf_OtherOutBill_PDA.btnSubmit" ? "鎻愪氦" : $t("Kf_OtherOutBill_PDA.btnSubmit") }}</button>
+ <button class="btn-a" size="mini"
+ @tap="submit">{{ $t("Kf_OtherOutBill_PDA.btnSubmit") == "Kf_OtherOutBill_PDA.btnSubmit" ? "鎻愪氦" : $t("Kf_OtherOutBill_PDA.btnSubmit") }}</button>
<view style="flex: 1;"></view>
- <button class="btn-a" size="mini" @tap="addNew">{{ $t("Kf_OtherOutBill_PDA.btnAdd") == "Kf_OtherOutBill_PDA.btnAdd" ? "鏂板" : $t("Kf_OtherOutBill_PDA.btnAdd") }}</button>
- <button class="btn-c" size="mini" @tap="goBack">{{ $t("Kf_OtherOutBill_PDA.btnExit") == "Kf_OtherOutBill_PDA.btnExit" ? "閫�鍑�" : $t("Kf_OtherOutBill_PDA.btnExit") }}</button>
+ <button class="btn-a" size="mini"
+ @tap="addNew">{{ $t("Kf_OtherOutBill_PDA.btnAdd") == "Kf_OtherOutBill_PDA.btnAdd" ? "鏂板" : $t("Kf_OtherOutBill_PDA.btnAdd") }}</button>
+ <button class="btn-c" size="mini"
+ @tap="goBack">{{ $t("Kf_OtherOutBill_PDA.btnExit") == "Kf_OtherOutBill_PDA.btnExit" ? "閫�鍑�" : $t("Kf_OtherOutBill_PDA.btnExit") }}</button>
</view>
</view>
<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
@@ -301,14 +384,24 @@
getUserStockRelation
} from '../../utils/userRelationManager';
import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+ import { MpaasScan } from '../../utils/mpaasScan';
export default {
data() {
return {
- placeholder_BarCode: this.$t("Kf_OtherOutBill_PDA.placeholder_BarCode") == "Kf_OtherOutBill_PDA.placeholder_BarCode" ? "璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" : this.$t("Kf_OtherOutBill_PDA.placeholder_BarCode"),
- placeholder_Qty: this.$t("Kf_OtherOutBill_PDA.placeholder_Qty") == "Kf_OtherOutBill_PDA.placeholder_Qty" ? "璇疯緭鍏ユ暟閲�" : this.$t("Kf_OtherOutBill_PDA.placeholder_Qty"),
- placeholder_Warehouse: this.$t("Kf_OtherOutBill_PDA.placeholder_Warehouse") == "Kf_OtherOutBill_PDA.placeholder_Warehouse" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" : this.$t("Kf_OtherOutBill_PDA.placeholder_Warehouse"),
- placeholder_StockPlace: this.$t("Kf_OtherOutBill_PDA.placeholder_StockPlace") == "Kf_OtherOutBill_PDA.placeholder_StockPlace" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" : this.$t("Kf_OtherOutBill_PDA.placeholder_StockPlace"),
- placeholder_SourceBillNo: this.$t("Kf_OtherOutBill_PDA.placeholder_SourceBillNo") == "Kf_OtherOutBill_PDA.placeholder_SourceBillNo" ? "璇疯緭鍏ユ簮鍗曞崟鍙�" : this.$t("Kf_OtherOutBill_PDA.placeholder_SourceBillNo"),
+ placeholder_BarCode: this.$t("Kf_OtherOutBill_PDA.placeholder_BarCode") ==
+ "Kf_OtherOutBill_PDA.placeholder_BarCode" ? "璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" : this.$t(
+ "Kf_OtherOutBill_PDA.placeholder_BarCode"),
+ placeholder_Qty: this.$t("Kf_OtherOutBill_PDA.placeholder_Qty") ==
+ "Kf_OtherOutBill_PDA.placeholder_Qty" ? "璇疯緭鍏ユ暟閲�" : this.$t("Kf_OtherOutBill_PDA.placeholder_Qty"),
+ placeholder_Warehouse: this.$t("Kf_OtherOutBill_PDA.placeholder_Warehouse") ==
+ "Kf_OtherOutBill_PDA.placeholder_Warehouse" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" : this.$t(
+ "Kf_OtherOutBill_PDA.placeholder_Warehouse"),
+ placeholder_StockPlace: this.$t("Kf_OtherOutBill_PDA.placeholder_StockPlace") ==
+ "Kf_OtherOutBill_PDA.placeholder_StockPlace" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" : this.$t(
+ "Kf_OtherOutBill_PDA.placeholder_StockPlace"),
+ placeholder_SourceBillNo: this.$t("Kf_OtherOutBill_PDA.placeholder_SourceBillNo") ==
+ "Kf_OtherOutBill_PDA.placeholder_SourceBillNo" ? "璇疯緭鍏ユ簮鍗曞崟鍙�" : this.$t(
+ "Kf_OtherOutBill_PDA.placeholder_SourceBillNo"),
userInfo: getUserInfo(),
serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
HModName: 'Kf_OtherOutBill_PDA',
@@ -419,8 +512,9 @@
},
onLoad(e) {
uni.setNavigationBarTitle({
- title: this.$t("Kf_OtherOutBill_PDA.title")
- });
+ title: this.$t("Kf_OtherOutBill_PDA.title") == 'Kf_OtherOutBill_PDA.title' ?
+ '鍏朵粬鍑哄簱鍗�' : this.$t("Kf_OtherOutBill_PDA.title")
+ });
console.log(e, this.userInfo)
this.OperationType = e.OperationType
if (e.HInterID) {
@@ -453,6 +547,11 @@
uni.$off('BillSelectComplete')
},
methods: {
+ toScanBillCode() {
+ MpaasScan.scanCode((res) => {
+ this.getHBarCodeData(res)
+ })
+ },
async HWHNameScan(e) {
// 鎵弿浠撳簱鐮�
console.log('浠撳簱鐮�: ', e);
@@ -470,7 +569,7 @@
// 鎵弿浠撲綅鐮�
console.log('浠撲綅鐮�: ', e);
let index = this.HStockPlaceNameList.findIndex(elem => elem['鏉＄爜缂栧彿'] == e.trim())
- // 涓嶅厛缃┖鐨勮瘽锛屾暟鎹啀娆℃壂鎻忕浉鍚岀殑浠撲綅鐮� 涓嶄細瑙﹀彂缁勪欢鍐呯殑鍒锋柊
+ // 涓嶅厛缃┖鐨勮瘽锛屾暟鎹啀娆℃壂鎻忕浉鍚岀殑浠撲綅鐮� 涓嶄細瑙﹀彂缁勪欢鍐呯殑鍒锋柊
this.hform.HStockPlaceID = 0
this.hform.HStockPlaceName = ''
await this.$nextTick()
@@ -1907,7 +2006,7 @@
font-weight: bold;
}
}
-
+
.right {
// width: 450rpx;
diff --git a/pages/qitaruku_v2/OtherInBill.vue b/pages/qitaruku_v2/OtherInBill.vue
index 2f1f286..d2d0819 100644
--- a/pages/qitaruku_v2/OtherInBill.vue
+++ b/pages/qitaruku_v2/OtherInBill.vue
@@ -74,6 +74,13 @@
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType == -1">
<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
</view>
+ <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+ <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
+ </view>
+
+ <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType == -1">
+ <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+ </view>
<view class="righton" v-show="!showHSourceBillNo">
<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" :placeholder="Kf_OtherInBill_PDA" />
@@ -312,6 +319,7 @@
import {
getUserStockRelation
} from '../../utils/userRelationManager';
+ import { MpaasScan } from '@/utils/mpaasScan';
export default {
data() {
return {
@@ -442,8 +450,9 @@
},
onLoad(e) {
uni.setNavigationBarTitle({
- title: this.$t("Kf_OtherInBill_PDA.title")
- })
+ title: this.$t("Kf_OtherInBill_PDA.title") == 'Kf_OtherInBill_PDA.title'
+ ? '鍏朵粬鍏ュ簱鍗�' : this.$t("Kf_OtherInBill_PDA.title")
+ })
console.log(e, this.userInfo)
this.OperationType = e.OperationType
if (e.HInterID) {
@@ -476,6 +485,11 @@
uni.$off('BillSelectComplete')
},
methods: {
+ toScanBillCode() {
+ MpaasScan.scanCode((res) => {
+ this.getHBarCodeData(res)
+ })
+ },
async HWHNameScan(e) {
// 鎵弿浠撳簱鐮�
console.log('浠撳簱鐮�: ', e);
diff --git a/pages/quyangdan/TakeSampleCheckBill.vue b/pages/quyangdan/TakeSampleCheckBill.vue
new file mode 100644
index 0000000..d483fd1
--- /dev/null
+++ b/pages/quyangdan/TakeSampleCheckBill.vue
@@ -0,0 +1,830 @@
+<template>
+ <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="right">
+ <input type="text" name="HBarCode" id="HBarCode" v-model="HBarCode" @confirm="getCode(HBarCode)" />
+ </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">宸ュ簭:</view>
+ <view class="right">
+ <uni-combox :candidates="HProcNameArray" name="HProcName" id="HProcName" placeholder="璇烽�夋嫨宸ュ簭鍙�"
+ v-model="hform.HProcName" @input="onHProcNameChangeHandler"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍙栨牱鏁伴噺:</view>
+ <view class="right">
+ <input type="number" name="HQty" id="HQty" v-model="hform.HQty" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐮村潖鎬у疄楠屾暟閲�:</view>
+ <view class="right">
+ <input type="number" name="HSampleDamageQty" id="HSampleDamageQty"
+ v-model="hform.HSampleDamageQty" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">閫佹祴绫诲瀷:</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="right">
+ <input type="text" name="HBadNote" id="HBadNote" v-model="hform.HBadNote" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">閮ㄩ棬:</view>
+ <view class="right">
+ <uni-combox :candidates="HDeptNameArray" name="HDeptName" id="HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬"
+ v-model="hform.HDeptName" @input="HDeptNameChangeHandler"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇鐝:</view>
+ <view class="right">
+ <uni-combox :candidates="HShiftsNameArray" name="HShiftsName" id="HShiftsName" placeholder="璇烽�夋嫨鐢熶骇鐝"
+ v-model="hform.HShiftsName" @input="HShiftsNameChangeHandler"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇鐝粍:</view>
+ <view class="right">
+ <uni-combox :candidates="HGroupNameArray" name="HShiftsName" id="HShiftsName" placeholder="璇烽�夋嫨鐢熶骇鐝粍"
+ v-model="hform.HGroupName" @input="HGroupNameChangeHandler"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍙栨牱鍛�:</view>
+ <view class="right">
+ <uni-combox :candidates="HCheckEmpNameArray" name="HCheckEmpName" id="HCheckEmpName"
+ placeholder="璇烽�夋嫨鍙栨牱鍛�" v-model="hform.HCheckEmpName"
+ @input="HCheckEmpNameChangeHandler"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇璧勬簮:</view>
+ <view class="right">
+ <uni-combox :candidates="HSourceNameArray" name="HSourceName" id="HSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬枡"
+ v-model="hform.HSourceName" @input="HSourceNameChangeHandler"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鏃ユ湡:</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="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="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="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="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="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="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="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="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="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 class="placeholder__view"></view>
+ <view><button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button></view>
+ </view>
+ </view>
+</template>
+
+<script>
+ import dayjs from 'dayjs'
+ import {
+ getUserInfo
+ } from '../../utils/auth'
+ import {
+ CommonUtils
+ } from '../../utils/common'
+
+ export default {
+ data() {
+ return {
+ pageMeta: {
+ scrollContentTop: 0,
+ bottomBtnTop: 0,
+ },
+ refSav: 'Add',
+ showMask: true,
+ TestTypeArray: ["棣栨", "宸℃", "鏈", "瀹為獙"],
+
+ HBillType: '7521',
+ HProcNameArray: [],
+ HProcNameArraySource: [],
+
+ HDeptNameArray: [],
+ HDeptNameArraySource: [],
+
+ HShiftsNameArray: [],
+ HShiftsNameArraySource: [],
+
+ HGroupNameArray: [],
+ HGroupNameArraySource: [],
+
+ HCheckEmpNameArray: [],
+ HCheckEmpNameSource: [],
+
+ HSourceNameArray: [],
+ HSourceNameSource: [],
+
+ HBarCode: '',
+ hform: {
+ HBarCode: '',
+ HProcName: '',
+ HProcID: 0,
+ HQty: '',
+ HSampleDamageQty: 0,
+ TestType: '棣栨',
+ HBadNote: '',
+ HDeptName: '',
+ HDeptID: 0,
+ HCenterID: 0,
+ HShiftsName: '',
+ HShiftsID: 0,
+ HGroupName: '',
+ HGroupID: 0,
+ HCheckEmpName: '',
+ HCheckEmp: '',
+ HSourceName: '',
+ HSourceID: 0,
+ HDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HBillNo: '',
+ HInterID: 0,
+ HICMOBillNo: '',
+ HICMOInterID: 0,
+ HICMOEntryID: 0,
+ HProcExchBillNo: '',
+ HProcExchInterID: 0,
+ HProcExchEntryID: 0,
+ HMainSourceBillNo: '',
+ HMainSourceInterID: 0,
+ HMainSourceBillType: '',
+ HMainSourceEntryID: 0,
+ HMaterCode: '',
+ HMaterID: 0,
+ HMaterName: '',
+ HMaterSpec: '',
+ HUnitName: '',
+ HUnitID: 0,
+ HBatchNo: '',
+ HProcExchQty: '',
+ HMaker: getUserInfo()['Czymc'],
+ HMakeDate: dayjs(new Date()).format("YYYY-MM-DD hh:mm:ss"),
+ HUpDater: '',
+ HUpDateDate: '',
+ HChecker: '',
+ HCheckDate: '',
+ HDeleteMan: '',
+ HDeleteDate: '',
+ }
+ }
+ },
+ computed: {
+ scrollContentHeight: {
+ get() {
+ return this.pageMeta.bottomBtnTop - this.pageMeta.scrollContentTop
+ }
+ }
+ },
+ onReady() {
+ // #ifndef MP-WEIXIN
+ let query = uni.createSelectorQuery().in(this)
+ query.select("#scroll-content").boundingClientRect((data) => {
+ this.pageMeta.scrollContentTop = data.top
+ }).exec()
+ query.select("#bottom-btn").boundingClientRect((data) => {
+ this.pageMeta.bottomBtnTop = data.top
+ }).exec()
+ // #endif
+ // #ifdef MP-WEIXIN
+ // 寰俊涓嶆敮鎸� uni.createSelectorQuery().in(this)
+ // #endif
+
+ },
+ async onLoad(e) {
+ let {
+ operationType
+ } = e
+ if (operationType == 0) {
+ this.getMaxNum()
+ this.refSav = 'Add'
+ } else {
+ this.refSav = 'Update'
+ }
+
+ this.getProcessList()
+ this.get_Gy_WorkShiftList()
+ this.GetGroupList()
+ this.GetEmployeeList()
+ this.getSourceList()
+ this.GetDepartmentList()
+ },
+ methods: {
+ HDeptNameChangeHandler() {
+ let index = this.HDeptNameArray.findIndex(item => item == e)
+
+ if (index != -1) {
+ this.hform.HDeptID = this.HDeptNameArraySource[index]["HItemID"]
+ this.hform.HDeptName = this.HDeptNameArraySource[index]["HName"]
+ }
+ },
+ GetDepartmentList() {
+ CommonUtils.doRequest2({
+ url: '/Web/GetDepartmentList_Json',
+ data: {
+ Department: '',
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message,
+ code
+ } = res.data
+ if (count == 1) {
+ this.HDeptNameArray = Array.from(data).map(item => item['HName'])
+ this.HDeptNameArraySource = data
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+ HSourceNameChangeHandler(e) {
+ let index = this.HSourceNameArray.findIndex(item => item == e)
+
+ if (index != -1) {
+ this.hform.HSourceID = this.HSourceNameArraySource[index]["HItemID"]
+ this.hform.HSourceName = this.HSourceNameArraySource[index]["鐢熶骇璧勬簮"]
+ }
+
+ console.log('this.hform: ', this.hform);
+ },
+ // 鑾峰彇鐢熶骇璧勬簮
+ getSourceList() {
+ CommonUtils.doRequest2({
+ url: '/api/newBill/getSourceList',
+ data: {
+ sWhere: '',
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ msg,
+ code
+ } = res.data
+ if (code == 1) {
+ let data1 = data.Gy_Source
+ this.HSourceNameArray = Array.from(data1).map(item => item['鐢熶骇璧勬簮'])
+ this.HSourceNameArraySource = data1
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+ HCheckEmpNameChangeHandler(e) {
+ let index = this.HCheckEmpNameArray.findIndex(item => item == e)
+
+ if (index != -1) {
+ this.hform.HCheckEmp = this.HCheckEmpNameArraySource[index]["HItemID"]
+ this.hform.HCheckEmpName = this.HCheckEmpNameArraySource[index]["HName"]
+ }
+ },
+ // 鑾峰彇鑱屽憳淇℃伅
+ GetEmployeeList() {
+ CommonUtils.doRequest2({
+ url: '/Web/GetEmployeeList_Json',
+ data: {
+ Employee: '',
+ HGroupID: this.hform.HGroupID
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HCheckEmpNameArray = Array.from(data).map(item => item['HName'])
+ this.HCheckEmpNameArraySource = data
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+ HGroupNameChangeHandler(e) {
+ let index = this.HGroupNameArray.findIndex(item => item == e)
+
+ if (index != -1) {
+ this.hform.HGroupID = this.HGroupNameArraySource[index]["HItemID"]
+ this.hform.HGroupName = this.HGroupNameArraySource[index]["HName"]
+ }
+ },
+ // 鑾峰彇鐢熶骇鐝粍
+ GetGroupList() {
+ CommonUtils.doRequest2({
+ url: '/WEBSController/GetGroupList_Json',
+ data: {
+ Group: '',
+ HStockOrgID: uni.getStorageSync('OrganizationID')
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HGroupNameArray = Array.from(data).map(item => item['HName'])
+ this.HGroupNameArraySource = data
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+
+ // 鑾峰彇鏈�鏂板崟鎹彿鍜孒InterID
+ getMaxNum() {
+ CommonUtils.doRequest2({
+ url: '/Web/GetMAXNum',
+ data: {
+ HBillType: this.HBillType
+ },
+ resFunction: (res) => {
+ let {
+ count,
+ data,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.hform.HBillNo = data[0].HBillNo
+ this.hform.HInterID = data[0].HInterID
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+ HShiftsNameChangeHandler(e) {
+ let index = this.HShiftsNameArray.findIndex(item => item == e)
+ if (index != -1) {
+ this.hform.HShiftsID = this.HShiftsNameArraySource[index]['HInterID']
+ this.hform.HShiftsName = this.HShiftsNameArraySource[index]['鐝鍚嶇О']
+ }
+ },
+ // 鍒濆鍖栫彮娆′俊鎭�
+ get_Gy_WorkShiftList() {
+ CommonUtils.doRequest2({
+ url: '/Gy_ShiftsController/Get_Gy_WorkShiftList',
+ data: {
+ sWhere: ` and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync('Organization')}' and 绂佺敤鏍囪='' and ISNULL(瀹℃牳浜� ,'') !=''`,
+ HMaker: getUserInfo()['Czymc']
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HShiftsNameArray = Array.from(data).map(item => item['鐝鍚嶇О'])
+ this.HShiftsNameArraySource = data
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+ // 鑾峰彇鐝
+ get_HWorkShift() {
+ CommonUtils.doRequest2({
+ url: '/Gy_ShiftsController/Get_HWorkShift',
+ data: {
+ "HDeptID": this.hform.HDeptID,
+ "HCenterID": this.hform.HCenterID
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+
+ this.hform.HShiftsID = data[0]['HInterID']
+ this.hform.HShiftsName = data[0]['鐝']
+ }
+ })
+ },
+ ProcessExchangeBillQuerySub() {
+ let HProcID = this.hform.HProcID
+ let HBarCode = this.hform.HProcExchInterID
+ let sWhere = ` ${HBarCode} and HProcID = ${HProcID} `
+ CommonUtils.doRequest2({
+ url: '/LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json',
+ data: {
+ sWhere: sWhere
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ if (count == 1 && data.length > 0) {
+ this.hform = Object.assign(this.hform, {
+ HProcID: data[0]['HProcID'],
+ HProcName: data[0]['宸ュ簭鍚嶇О'],
+ HSourceID: data[0]['HSourceID'] || 0,
+ HSourceName: data[0]['鐢熶骇璧勬簮'] || '',
+ HMainSourceEntryID: data[0]['hsubid'],
+ HProcExchEntryID: data[0]['hsubid'],
+ HProcExchQty: data[0]['娴佽浆鍗℃暟閲�'],
+ HCenterID: data[0]['HCenterID'] || getUserInfo()['HWorkCenterID'],
+ })
+
+ }
+ }
+ })
+ },
+ onHProcNameChangeHandler(e) {
+ let index = this.HProcNameArray.findIndex(item => item == e)
+ if (index != -1) {
+ this.hform.HProcName = this.HProcNameArraySource[index]['HName']
+ this.hform.HProcID = this.HProcNameArraySource[index]['HItemID']
+ this.ProcessExchangeBillQuerySub()
+ }
+ },
+ getProcessList() {
+ CommonUtils.doRequest2({
+ url: '/WEBSController/GetProcessList_Json',
+ data: {
+ Process: '',
+ HStockOrgID: uni.getStorageSync("OrganizationID")
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HProcNameArray = Array.from(data).map(item => item.HName)
+ this.HProcNameArraySource = data
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+ TestTypeChange(e) {
+ console.log('e: ', e);
+ },
+ toScanCode() {
+ var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+ mpaasScanModule.mpaasScan({
+ 'hideAlbum': true,
+ 'timeoutInterval': '10', //瓒呮椂鏃堕棿
+ 'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ }, (ret) => {
+ console.log(ret.resp_result)
+ if (this.hform.HBarCode == '*') {
+ this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+ } else {
+ this.HBarCode = ret.resp_result
+ this.hform.HBarCode = ret.resp_result
+ }
+
+ this.getCode(this.hform.HBarCode)
+ })
+ },
+ getCode(HBarCode) {
+ if (!HBarCode) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鏉″舰鐮佷笉鑳戒负绌�'
+ })
+ }
+ CommonUtils.doRequest2({
+ url: '/api/newBill/getHbarCodeDetail',
+ data: {
+ "sBillBarCode": HBarCode
+ },
+ resFunction: (res) => {
+ let {
+ code,
+ msg,
+ count,
+ data
+ } = res.data
+ if (code == 1) {
+ this.HBarCode = ''
+ let data1 = data.h_v_Sc_ProcessExchangeBillList
+ this.hform = Object.assign(this.hform, {
+ "HMaterID": data1[0].HMaterID, //浜у搧ID
+ "HMaterCode": data1[0].浜у搧浠ｇ爜, //浜у搧浠ｇ爜
+ "HMaterName": data1[0].浜у搧, //浜у搧鍚嶇О
+ "HMaterSpec": data1[0].瑙勬牸鍨嬪彿, //浜у搧瑙勬牸
+ "HUnitID": data1[0].HUnitID, //璁￠噺鍗曚綅id
+ "HUnitName": data1[0].鍗曚綅, //璁￠噺鍗曚綅
+ "HMainSourceBillNo": data1[0].鍗曟嵁鍙�, //婧愬崟鍗曞彿
+ "HMainSourceInterID": data1[0].hmainid, //婧愬崟涓诲唴鐮�
+ "HMainSourceBillType": 3772, //婧愬崟绫诲瀷
+ "HProcExchBillNo": data1[0].鍗曟嵁鍙�, //娴佽浆鍗″彿
+ "HProcExchInterID": data1[0].hmainid, //娴佽浆鍗′富鍐呯爜(鍙栧�糎InterID)
+ "HBatchNo": data1[0].鎵瑰彿, //娴佽浆鍗℃壒娆�
+ "HICMOInterID": data1[0].hicmointerid, //鐢熶骇璁㈠崟ID
+ "HICMOEntryID": data1[0].HICMOEntryID, //鐢熶骇璁㈠崟瀛怚D
+ "HICMOBillNo": data1[0].浠诲姟鍗曞彿, //鐢熶骇璁㈠崟
+ "HDeptID": data1[0].HWorkShopID, //杞﹂棿ID
+ "HDeptName": data1[0].鐢熶骇杞﹂棿, //杞﹂棿
+ })
+
+ uni.showToast({
+ icon: 'none',
+ title: msg
+ })
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: msg
+ })
+ }
+ }
+ })
+ },
+ submit() {
+ if (this.hform.HProcID == 0) {
+ return uni.showToast({
+ icon: 'none',
+ title: '宸ュ簭娌℃湁閫夋嫨'
+ })
+ }
+ if (this.hform.HQty == '') {
+ return uni.showToast({
+ icon: 'none',
+ title: '鍙栨牱鏁伴噺涓虹┖'
+ })
+ }
+ if (this.hform.HProcID == 0) {
+ return uni.showToast({
+ icon: 'none',
+ title: '宸ュ簭娌℃湁閫夋嫨'
+ })
+ }
+ if (this.hform.HDeptID == 0) {
+ return uni.showToast({
+ icon: 'none',
+ title: '閮ㄩ棬娌℃湁閫夋嫨'
+ })
+ }
+ if (this.hform.HShiftsID == 0) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鐝鏈�夋嫨'
+ })
+ }
+ if (this.hform.HGroupID == 0) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鐢熶骇鐝粍鏈�夋嫨'
+ })
+ }
+ if (this.hform.HCheckEmp == 0) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鍙栨牱鍛樻湭閫夋嫨'
+ })
+ }
+ if (this.hform.HSourceID == 0) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鐢熶骇璧勬簮鏈�夋嫨'
+ })
+ }
+
+ console.log('this.hform: ', this.hform);
+ let sMainStr = JSON.stringify(this.hform)
+ console.log('sMainStr: ', sMainStr);
+ let sMainSub = sMainStr + ';' + this.refSav + ';' + getUserInfo()['Czymc'];
+ CommonUtils.doRequest2({
+ method: 'POST',
+ url: '/QC_TakeSampleCheckBill/SaveQC_TakeSampleCheckBillMain',
+ data: {
+ msg: sMainSub
+ },
+ resFunction: (res) => {
+ let {
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ return uni.showToast({
+ icon: 'none',
+ title: "鎻愪氦鎴愬姛!"
+ })
+ } else {
+ return uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ },
+ onAddNewHandler() {
+ uni.redirectTo({
+ url: "/pages/quyangdan/TakeSampleCheckBillList?operationType=0"
+ })
+ },
+ goBack() {
+ uni.navigateBack()
+ },
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .scroll-content {
+ box-sizing: border-box;
+ padding: 20rpx;
+
+ ::v-deep .uni-scroll-view-content {
+ box-sizing: border-box;
+ padding: 0 40rpx;
+ display: flex;
+ flex-direction: column;
+ gap: 20rpx;
+ }
+
+ .form-item {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ gap: 20rpx;
+
+ input {
+ width: inherit;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+
+ .title {
+ width: 5em;
+ font-size: 30rpx;
+ flex-shrink: 0;
+ text-align: right;
+ }
+
+ .right {
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ }
+
+ .right-icon {
+ width: 54rpx;
+ height: 54rpx;
+ border-radius: 50%;
+ background-color: #3A78FF;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-shrink: 0;
+
+ }
+
+ .disabled {
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+ }
+ }
+
+ .bottom-btn {
+ 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: row;
+ gap: 20rpx;
+ justify-content: space-between;
+ width: 100%;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+
+ .btn-a {
+ background-color: #3A78FF;
+ color: #fff;
+ }
+
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #acacac;
+ color: #fff;
+ }
+ }
+
+ .placeholder__view {
+ flex: 1;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/quyangdan/TakeSampleCheckBillList.vue b/pages/quyangdan/TakeSampleCheckBillList.vue
new file mode 100644
index 0000000..99f0dfa
--- /dev/null
+++ b/pages/quyangdan/TakeSampleCheckBillList.vue
@@ -0,0 +1,594 @@
+<template>
+ <view>
+ <view class="page-header">
+ <view class="search-item">
+ <view class="left">鏃ユ湡闂撮殧</view>
+ <view class="right">
+ <picker mode="selector" :value="curDateGap" :range="dateRangePicker"
+ @change="onDateRangePickerChangeHandler">
+ <input disabled v-model="curDateGap" placeholder="璇烽�夋嫨鏃ユ湡闂撮殧" />
+ <view class="picker-overlay"></view>
+ </picker>
+
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">寮�濮嬫棩鏈�</view>
+ <view class="right">
+ <uni-datetime-picker :clear-icon="false" type="date" v-model="startDate"
+ :disabled="!enableCustomDateRange">
+ <view class="datetime-picker-inner"
+ :class="enableCustomDateRange?'font__enable':'font__disable'">
+ <text>{{ startDate }}</text>
+ </view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">缁撴潫鏃ユ湡</view>
+ <view class="right">
+ <uni-datetime-picker :clear-icon="false" type="date" v-model="endDate"
+ :disabled="!enableCustomDateRange">
+ <view class="datetime-picker-inner"
+ :class="enableCustomDateRange?'font__enable':'font__disable'">{{ endDate }}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">鍗曟嵁鍙�</view>
+ <view class="right">
+ <input type="text" auto-focus v-model="HBillNo" />
+ </view>
+ </view>
+
+ <view class="button-groups">
+ <button type="default" size="mini" class="btn-b" @tap.stop="onAddClickHandler">鏂板</button>
+ <button type="default" size="mini" class="btn-c" @tap.stop="onSearchClickHandler">鏌ヨ</button>
+ <button type="default" size="mini" class="btn-a" @tap.stop="onResetClickHandler">閲嶇疆</button>
+ </view>
+ </view>
+ <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+ <scroll-view id="pageContent" scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
+ <view v-for="(item,index) in listData" :key="index">
+ <uni-card :title="item['鍗曟嵁鍙�']" :extra="'No.'+item['sorderid']"
+ @tap="showDetail = showDetail==index?-1:index">
+ <view class="card-detail">
+ <view class="detail" v-if="item['鍗曟嵁鍙�']">
+ <text>鍗曟嵁鍙凤細</text>{{item['鍗曟嵁鍙�']}}
+ </view>
+ <view class="detail" v-if="item['鍗曟嵁鐘舵��']">
+ <text>鍗曟嵁鐘舵�侊細</text>{{item['鍗曟嵁鐘舵��']}}
+ </view>
+ <view class="detail" v-if="item['閮ㄩ棬']">
+ <text>閮ㄩ棬锛�</text>{{item['閮ㄩ棬']}}
+ </view>
+ <view class="detail" v-if="item['鐢熶骇璧勬簮']">
+ <text>鐢熶骇璧勬簮锛�</text>{{item['鐢熶骇璧勬簮']}}
+ </view>
+ <view class="detail" v-if="item['宸ュ簭']">
+ <text>宸ュ簭锛�</text>{{item['宸ュ簭']}}
+ </view>
+ <view class="detail" v-if="item['鐢熶骇璁㈠崟']">
+ <text>鐢熶骇璁㈠崟锛�</text>{{item['鐢熶骇璁㈠崟']}}
+ </view>
+ <view class="detail" v-if="item['娴佽浆鍗�']">
+ <text>娴佽浆鍗★細</text>{{item['娴佽浆鍗�']}}
+ </view>
+ <view class="detail" v-if="item['鍒跺崟浜�']">
+ <text>鍒跺崟浜猴細</text>{{item['鍒跺崟浜�']}}
+ </view>
+ <view class="detail" v-if="item['瀹℃牳浜�']">
+ <text>瀹℃牳浜猴細</text>{{item['瀹℃牳浜�']}}
+ </view>
+ <view class="detail" v-if="item['浜у搧缂栫爜']">
+ <text>浜у搧缂栫爜锛�</text>{{item['浜у搧缂栫爜']}}
+ </view>
+ <view class="detail" v-if="item['浜у搧鍚嶇О']">
+ <text>浜у搧鍚嶇О锛�</text>{{item['浜у搧鍚嶇О']}}
+ </view>
+ <view class="detail" v-if="item['瑙勬牸鍨嬪彿']">
+ <text>瑙勬牸鍨嬪彿锛�</text>{{item['瑙勬牸鍨嬪彿']}}
+ </view>
+ <view class="detail" v-if="item['璁￠噺鍗曚綅']">
+ <text>璁￠噺鍗曚綅锛�</text>{{item['璁￠噺鍗曚綅']}}
+ </view>
+ </view>
+ <view class="card-detail" v-if="showDetail == index">
+ <view class="detail" v-if="item['鍙栨牱鍛�']">
+ <text>鍙栨牱鍛橈細</text>{{item['鍙栨牱鍛�']}}
+ </view>
+ <view class="detail" v-if="item['鐢熶骇鐝粍']">
+ <text>鐢熶骇鐝粍锛�</text>{{item['鐢熶骇鐝粍']}}
+ </view>
+ <view class="detail" v-if="item['鐢熶骇鐝']">
+ <text>鐢熶骇鐝锛�</text>{{item['鐢熶骇鐝']}}
+ </view>
+ <view class="detail" v-if="item['鍙栨牱鏁伴噺']">
+ <text>鍙栨牱鏁伴噺锛�</text>{{item['鍙栨牱鏁伴噺']}}
+ </view>
+ <view class="detail" v-if="item['閫佹祴鍐呭']">
+ <text>閫佹祴鍐呭锛�</text>{{item['閫佹祴鍐呭']}}
+ </view>
+ <view class="detail" v-if="item['閫佹祴绫诲瀷']">
+ <text>閫佹祴绫诲瀷锛�</text>{{item['閫佹祴绫诲瀷']}}
+ </view>
+ <view class="detail" v-if="item['鏉ユ簮缁勭粐']">
+ <text>鏉ユ簮缁勭粐锛�</text>{{item['鏉ユ簮缁勭粐']}}
+ </view>
+ <view class="detail" v-if="item['鐮村潖鎬у疄楠屾暟閲�']">
+ <text>鐮村潖鎬у疄楠屾暟閲忥細</text>{{item['鐮村潖鎬у疄楠屾暟閲�']}}
+ </view>
+ <view class="detail" v-if="item['浜у搧鍗曢噸1']">
+ <text>浜у搧鍗曢噸1锛�</text>{{item['浜у搧鍗曢噸1']}}
+ </view>
+ <view class="detail" v-if="item['浜у搧鍗曢噸2']">
+ <text>浜у搧鍗曢噸2锛�</text>{{item['浜у搧鍗曢噸2']}}
+ </view>
+ <view class="detail" v-if="item['浜у搧鍗曢噸3']">
+ <text>浜у搧鍗曢噸3锛�</text>{{item['浜у搧鍗曢噸3']}}
+ </view>
+ <view class="detail" v-if="item['鍒跺崟鏃ユ湡']">
+ <text>鍒跺崟鏃ユ湡锛�</text>{{item['鍒跺崟鏃ユ湡']}}
+ </view>
+ <view class="detail" v-if="item['瀹℃牳鏃ユ湡']">
+ <text>瀹℃牳鏃ユ湡锛�</text>{{item['瀹℃牳鏃ユ湡']}}
+ </view>
+ <view class="detail" v-if="item['淇敼浜�']">
+ <text>淇敼浜猴細</text>{{item['淇敼浜�']}}
+ </view>
+ <view class="detail" v-if="item['淇敼鏃ユ湡']">
+ <text>淇敼鏃ユ湡锛�</text>{{item['淇敼鏃ユ湡']}}
+ </view>
+ <view class="detail" v-if="item['鍏抽棴浜�']">
+ <text>鍏抽棴浜猴細</text>{{item['鍏抽棴浜�']}}
+ </view>
+ <view class="detail" v-if="item['鍏抽棴鏃ユ湡']">
+ <text>鍏抽棴鏃ユ湡锛�</text>{{item['鍏抽棴鏃ユ湡']}}
+ </view>
+ <view class="detail" v-if="item['浣滃簾浜�']">
+ <text>浣滃簾浜猴細</text>{{item['浣滃簾浜�']}}
+ </view>
+ <view class="detail" v-if="item['浣滃簾鏃ユ湡']">
+ <text>浣滃簾鏃ユ湡锛�</text>{{item['浣滃簾鏃ユ湡']}}
+ </view>
+ </view>
+
+ <view class="more" v-if="showDetail == index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="more" v-if="showDetail != index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+
+ <view class="op" v-if="operations == index">
+ <!-- <button class="op1" size="mini" plain @tap.stop="">瀛愯〃淇℃伅</button> -->
+ <!-- <button class="op2" size="mini" plain @tap.stop="">鍙嶅鏍�</button> -->
+ <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+ <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+ </scroll-view>
+ <!-- 鍒嗛〉鍣� -->
+ <view class="page-footer">
+ <uni-pagination id="pagination" title="鏍囬鏂囧瓧" v-model="pageMeta.curPage" :pageSize="pageMeta.size"
+ :total="pageMeta.total" @change="onPageChangeHandler"></uni-pagination>
+ </view>
+ </view>
+</template>
+
+<script>
+ import dayjs from 'dayjs'
+ import {
+ CommonUtils
+ } from '@/utils/common.js'
+ import {
+ getUserInfo
+ } from '../../utils/auth'
+ export default {
+ data() {
+ return {
+ // 璁＄畻鍗＄墖鍒楄〃楂樺害
+ pagination_top: 0,
+ pageContent_top: 0,
+ // 鍒嗛〉鎺у埗
+ pageMeta: {
+ curPage: 1,
+ size: 50,
+ total: 0,
+ },
+ // 婊氬姩鎺у埗
+ scrollTop: 0,
+ old: {
+ scrollTop: 0
+ },
+
+ dateRangePicker: ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�",
+ "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"
+ ],
+ curDateGap: "杩戜竷澶�",
+ enableCustomDateRange: false,
+ startDate: dayjs(new Date()).subtract(7, 'day').format('YYYY-MM-DD'),
+ endDate: dayjs(new Date()).format('YYYY-MM-DD'),
+ HBillNo: '',
+
+ listData: [],
+ showDetail: -1,
+ operations: -1,
+ }
+ },
+ computed: {
+ pageContentHeight: {
+ get() {
+ return (this.pagination_top - this.pageContent_top)
+ }
+ },
+ },
+ onLoad() {
+ this.onSearchClickHandler()
+ },
+ onPullDownRefresh() {
+ this.onSearchClickHandler()
+ },
+ async onReady() {
+ // #ifndef MP-WEIXIN
+ let query = uni.createSelectorQuery().in(this)
+ query.select("#pagination")
+ .boundingClientRect((data) => {
+ if (data) {
+ this.pagination_top = data.top
+ } else {
+ console.log("鏈壘鍒�#pagination鑺傜偣");
+ }
+ })
+ .exec();
+ query.select("#pageContent")
+ .boundingClientRect((data) => {
+ if (data) {
+ this.pageContent_top = data.top
+ } else {
+ console.log("鏈壘鍒�#pageContent鑺傜偣");
+ }
+ })
+ .exec();
+ // #endif
+
+ },
+ methods: {
+ // 鏂板鍙栨牱鍗�
+ onAddClickHandler() {
+ uni.navigateTo({
+ url: "/pages/quyangdan/TakeSampleCheckBill?operationType=0"
+ })
+ },
+ del(item) {
+ uni.showModal({
+ title: '鍒犻櫎纭',
+ content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ CommonUtils.doRequest2({
+ url: '/QC_TakeSampleCheckBill/DeleteQC_TakeSampleCheckBillMain',
+ data: {
+ HInterID: item['hmainid'],
+ user: getUserInfo()['Czymc']
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ uni.showToast({
+ icon: 'none',
+ title: '鍒犻櫎鎴愬姛!'
+ })
+ this.onSearchClickHandler()
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
+ });
+ },
+ goTop: function(e) {
+ // 瑙ｅ喅view灞備笉鍚屾鐨勯棶棰�
+ this.scrollTop = this.old.scrollTop
+ this.$nextTick(function() {
+ this.scrollTop = 0
+ });
+ },
+ onDateRangePickerChangeHandler({
+ detail
+ }) {
+ this.enableCustomDateRange = false
+ this.curDateGap = this.dateRangePicker[detail.value]
+ let date = new Date()
+ switch (this.curDateGap) {
+ case "浠婂ぉ":
+ this.startDate = dayjs(date).format("YYYY-MM-DD")
+ break;
+ case "杩戜竴澶�":
+ this.startDate = dayjs(date).subtract(1, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜袱澶�":
+ this.startDate = dayjs(date).subtract(2, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜笁澶�":
+ this.startDate = dayjs(date).subtract(3, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戝洓澶�":
+ this.startDate = dayjs(date).subtract(4, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜簲澶�":
+ this.startDate = dayjs(date).subtract(5, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戝叚澶�":
+ this.startDate = dayjs(date).subtract(6, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜竷澶�":
+ this.startDate = dayjs(date).subtract(7, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩�30澶�":
+ this.startDate = dayjs(date).subtract(30, 'day').format("YYYY-MM-DD")
+ break;
+ }
+ if (this.curDateGap == '浠绘剰闂撮殧') {
+ this.enableCustomDateRange = true
+ }
+ },
+ onSearchClickHandler() {
+ let sWhere = ""
+ if (this.startDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.startDate + "'";
+ }
+ if (this.endDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.endDate + "'";
+ }
+ if (this.HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + this.HBillNo + "%'";
+ }
+ this.get_DisplayPage(sWhere);
+ },
+ clear() {
+ this.curDateGap = "杩戜竷澶�"
+ this.enableCustomDateRange = false
+ this.startDate = dayjs(new Date()).subtract(7, 'day').format('YYYY-MM-DD')
+ this.endDate = dayjs(new Date()).format('YYYY-MM-DD')
+ this.HBillNo = ''
+ },
+ async onResetClickHandler() {
+ this.clear()
+ await this.$nextTick()
+ this.onSearchClickHandler()
+ },
+ get_DisplayPage(sWhere) {
+ CommonUtils.doRequest2({
+ url: '/QC_TakeSampleCheckBill/getQC_TakeSampleCheckBillListPage',
+ data: {
+ "sWhere": sWhere,
+ "user": getUserInfo()["Czymc"],
+ "page": this.pageMeta.curPage,
+ "size": this.pageMeta.size
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ console.log('res.data: ', res.data);
+ this.listData = data;
+ this.pageMeta.total = count
+ uni.stopPullDownRefresh()
+ }
+ })
+ },
+ onPageChangeHandler() {
+ this.onSearchClickHandler()
+ this.goTop()
+ }
+ },
+ }
+</script>
+
+<style lang="scss">
+ .page-header {
+ display: flex;
+ box-sizing: border-box;
+ padding: 20rpx;
+ flex-direction: column;
+ gap: 10rpx;
+ font-size: 32rpx;
+
+ .search-item {
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: center;
+ align-items: center;
+
+ .left {
+ width: 4em;
+ }
+
+ .right {
+ flex: 1;
+ position: relative;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ display: flex;
+ padding: 4rpx 10rpx;
+
+ picker {
+ width: 100%;
+ }
+ }
+
+
+ }
+
+ input {
+ width: inherit;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+
+ .datetime-picker-inner {
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ display: flex;
+ align-items: center;
+ }
+
+ .font__enable {
+ color: #000;
+ }
+
+ .font__disable {
+ color: #cccccc;
+ }
+ }
+
+ .button-groups {
+ box-sizing: border-box;
+ padding: 10rpx 0 0 0;
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: space-between;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+
+ .btn-a {
+ background-color: #acacac;
+ color: #fff;
+ }
+
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
+
+ .page-content {
+ // height: 40vh;
+ box-sizing: border-box;
+ padding: 10rpx 0;
+
+ .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;
+ }
+ }
+ }
+
+ .more {
+ color: #888;
+ font-size: 24rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ text-align: center;
+ }
+ }
+
+ .op {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 20rpx;
+
+ button {
+ padding: 0;
+ width: 150rpx;
+ font-size: 25rpx;
+ }
+
+ .op1 {
+ border: 1px solid #41a863;
+ color: #41a863;
+ }
+
+ .op2 {
+ border: 1px solid #d98d00;
+ color: #d98d00;
+ }
+
+ .op3 {
+ border: 1px solid #3a78ff;
+ color: #3a78ff;
+ }
+
+ .op4 {
+ border: 1px solid #da0000;
+ color: #da0000;
+ }
+
+ .op5 {
+ border: 1px solid #888;
+ color: #888;
+ }
+ }
+ }
+
+ .page-footer {
+ position: fixed;
+ bottom: 0;
+ width: 100%;
+ box-sizing: border-box;
+ padding: 32rpx 10rpx;
+
+
+ }
+</style>
\ No newline at end of file
diff --git a/pages/shengchanrukushengdan/Kf_ProductInBill.vue b/pages/shengchanrukushengdan/Kf_ProductInBill.vue
index 13093c7..f48236f 100644
--- a/pages/shengchanrukushengdan/Kf_ProductInBill.vue
+++ b/pages/shengchanrukushengdan/Kf_ProductInBill.vue
@@ -73,6 +73,9 @@
:placeholder="placeholder_SourceBillNo" />
</view>
+ <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+ <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
+ </view>
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
</view>
@@ -305,7 +308,8 @@
getUserStockRelation
} from "@/utils/userRelationManager.js"
import BillSelectPopupXiaoWeiVue from '../../components/BillSelectPopupXiaoWei/BillSelectPopupXiaoWei.vue';
- export default {
+ import { MpaasScan } from '../../utils/mpaasScan';
+ export default {
data() {
return {
userInfo: getUserInfo(),
@@ -428,7 +432,7 @@
},
async onLoad(e) {
uni.setNavigationBarTitle({
- title: this.$t("Kf_ProductInBill_PDA.title")
+ title: this.$t("Kf_ProductInBill_PDA.title") == 'Kf_ProductInBill_PDA.title' ? '鐢熶骇鍏ュ簱鍗�' : this.$t("Kf_ProductInBill_PDA.title")
})
console.log(e, this.userInfo)
this.OperationType = e.OperationType
@@ -459,6 +463,11 @@
uni.$off('BillSelectComplete')
},
methods: {
+ toScanBillCode() {
+ MpaasScan.scanCode((res) => {
+ this.getHBarCodeData(res)
+ })
+ },
async HWHNameScan(e) {
return
// 鎵弿浠撳簱鐮�
diff --git a/pages/shengchantuiliao/MateOutBackBill.vue b/pages/shengchantuiliao/MateOutBackBill.vue
index 1811fbb..6631372 100644
--- a/pages/shengchantuiliao/MateOutBackBill.vue
+++ b/pages/shengchantuiliao/MateOutBackBill.vue
@@ -2,9 +2,9 @@
<view>
<view class="form">
<view class="form-item">
- <view class="title">鏉＄爜:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.BarCode") == "MateOutBackBill_PDA.BarCode" ? "鏉＄爜" : $t("MateOutBackBill_PDA.BarCode") }}:</view>
<view class="right">
- <input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜"
+ <input :focus="barCodeFocus" v-model="hform.HBarCode" :placeholder="placeholder_BarCode"
@confirm="getCode(hform.HBarCode)" />
</view>
<view class="icon-wrapper">
@@ -12,41 +12,41 @@
</view>
</view>
<view class="form-item">
- <view class="title">鏁伴噺:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.Qty") == "MateOutBackBill_PDA.Qty" ? "鏁伴噺" : $t("MateOutBackBill_PDA.Qty") }}:</view>
<view class="right">
- <input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
+ <input v-model="hform.HQty" :placeholder="placeholder_Qty" />
</view>
</view>
<view class="form-item">
- <view class="title">浠撳簱:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.Warehouse") == "MateOutBackBill_PDA.Warehouse" ? "浠撳簱" : $t("MateOutBackBill_PDA.Warehouse") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+ <uni-combox :candidates="arrayHWHName" :placeholder="placeholder_SCWarehouse" v-model="hform.HWHName"
@input="HWHNameChange" @confirm="HWHNameScan"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">浠撲綅:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.StockPlace") == "MateOutBackBill_PDA.StockPlace" ? "璋冧粨浣�" : $t("MateOutBackBill_PDA.StockPlace") }}:</view>
<view class="right" v-show="showHStockPlaceName">
- <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+ <uni-combox :candidates="HStockPlaceNameListComputed" :placeholder="placeholder_SCStockPlace"
v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
@confirm="HStockPlaceNameScan"></uni-combox>
</view>
<view class="righton" v-show="!showHStockPlaceName">
- <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="涓嶅彲鎿嶄綔" />
+ <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" :placeholder="unOperate" />
</view>
</view>
<view class="tabs">
- <view :class="tabs == 0 ? 'on' : ''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
- <view :class="tabs == 1 ? 'on' : ''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
- <view :class="tabs == 2 ? 'on' : ''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
- <view :class="tabs == 3 ? 'on' : ''" @tap="tabs = 3">鏉＄爜淇℃伅</view>
- <view :class="tabs == 4 ? 'on' : ''" @tap="tabs = 4">涓嬫灦淇℃伅</view>
+ <view :class="tabs == 0 ? 'on' : ''" @tap="tabs = 0">{{ $t("MateOutBackBill_PDA.selectSource") == "MateOutBackBill_PDA.selectSource" ? "閫夋嫨婧愬崟" : $t("MateOutBackBill_PDA.selectSource") }}</view>
+ <view :class="tabs == 1 ? 'on' : ''" @tap="tabs = 1">{{ $t("MateOutBackBill_PDA.tableInfo") == "MateOutBackBill_PDA.tableInfo" ? "琛ㄥご淇℃伅" : $t("MateOutBackBill_PDA.tableInfo") }}</view>
+ <view :class="tabs == 2 ? 'on' : ''" @tap="tabs = 2">{{ $t("MateOutBackBill_PDA.materInfo") == "MateOutBackBill_PDA.materInfo" ? "鐗╂枡淇℃伅" : $t("MateOutBackBill_PDA.materInfo") }}</view>
+ <view :class="tabs == 3 ? 'on' : ''" @tap="tabs = 3">{{ $t("MateOutBackBill_PDA.barInfo") == "MateOutBackBill_PDA.barInfo" ? "鏉＄爜淇℃伅" : $t("MateOutBackBill_PDA.barInfo") }}</view>
+ <view :class="tabs == 4 ? 'on' : ''" @tap="tabs = 4">{{ $t("MateOutBackBill_PDA.removeShelvesInfo") == "MateOutBackBill_PDA.removeShelvesInfo" ? "涓嬫灦淇℃伅" : $t("MateOutBackBill_PDA.removeShelvesInfo") }}</view>
</view>
<view v-if="tabs == 0">
<view class="form-item">
- <view class="title">婧愬崟绫诲瀷:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.SourceBillType") == "MateOutBackBill_PDA.SourceBillType" ? "婧愬崟绫诲瀷" : $t("MateOutBackBill_PDA.SourceBillType") }}:</view>
<view class="right" v-show="showHMainSourceBillType">
<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
@change="HMainSourceBillTypeChange">
@@ -62,13 +62,13 @@
</view>
</view>
<view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.SourceBillNo") == "MateOutBackBill_PDA.SourceBillNo" ? "婧愬崟鍗曞彿" : $t("MateOutBackBill_PDA.SourceBillNo") }}:</view>
<view class="right" v-show="showHSourceBillNo">
<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
<input type="text" :focus="HSourceBillNoFocus" name="HSourceBillNo"
@confirm="onHSourceBillNoConfirmHandler" v-model="hform.HSourceBillNo"
- placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ :placeholder="placeholder_SourceBillNo" />
</view>
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
@@ -76,7 +76,7 @@
</view>
<view class="righton" v-show="!showHSourceBillNo">
- <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" :placeholder="placeholder_SourceBillNo" />
</view>
</view>
<!-- <view class="form-item">
@@ -87,7 +87,7 @@
</view>
</view> -->
<view class="form-item">
- <view class="title">鏃ユ湡:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.Date") == "MateOutBackBill_PDA.Date" ? "鏃ユ湡" : $t("MateOutBackBill_PDA.Date") }}:</view>
<view class="right">
<picker mode="date" v-model="hform.HDate" @change="HDateChange">
<view class="picker-overlay"></view>
@@ -96,13 +96,13 @@
</view>
</view>
<view class="form-item">
- <view class="title">鍒跺崟浜�:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.Maker") == "MateOutBackBill_PDA.Maker" ? "鍒跺崟浜�" : $t("MateOutBackBill_PDA.Maker") }}:</view>
<view class="righton">
<input name="HMaker" disabled v-model="hform.HMaker" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.BillNo") == "MateOutBackBill_PDA.BillNo" ? "鍗曟嵁鍙�" : $t("MateOutBackBill_PDA.BillNo") }}:</view>
<view class="righton">
<input name="HBillNo" disabled v-model="hform.HBillNo" />
</view>
@@ -111,7 +111,7 @@
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁ID:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.BillID") == "MateOutBackBill_PDA.BillID" ? "鍗曟嵁ID" : $t("MateOutBackBill_PDA.BillID") }}:</view>
<view class="righton">
<input name="HInterID" disabled v-model="hform.HInterID" />
</view>
@@ -120,23 +120,23 @@
<view v-if="tabs == 1">
<view class="form-item">
- <view class="title">淇濈:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.Keeper") == "MateOutBackBill_PDA.Keeper" ? "淇濈" : $t("MateOutBackBill_PDA.Keeper") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
+ <uni-combox :candidates="arrayHEmpName" :placeholder="placeholder_Keeper" v-model="hform.HKeeperName"
@input="HKeeperNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">楠屾敹:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.SecManager") == "MateOutBackBill_PDA.SecManager" ? "楠屾敹" : $t("MateOutBackBill_PDA.SecManager") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
+ <uni-combox :candidates="arrayHEmpName" :placeholder="placeholder_SecManager" v-model="hform.HSecManagerName"
@input="HSecManagerNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">閮ㄩ棬:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.Dept") == "MateOutBackBill_PDA.Dept" ? "閮ㄩ棬" : $t("MateOutBackBill_PDA.Dept") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+ <uni-combox :candidates="arrayHDeptName" :placeholder="placeholder_Dept" v-model="hform.HDeptName"
@input="HDeptNameChange"></uni-combox>
</view>
</view>
@@ -151,7 +151,7 @@
</view>
</view> -->
<view class="form-item">
- <view class="title">缁勭粐:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.StockOrg") == "MateOutBackBill_PDA.StockOrg" ? "缁勭粐" : $t("MateOutBackBill_PDA.StockOrg") }}:</view>
<view class="righton">
<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
</view>
@@ -163,27 +163,27 @@
<uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠ｇ爜" style="margin: 10px;" @tap="delMater(item)">
<view class="card-detail">
<view class="detail">
- <text>婧愬崟鍗曞彿锛�</text>{{ item.婧愬崟鍗曞彿 }}
+ <text>{{ $t("MateOutBackBill_PDA.table_SourceBillNo") == "MateOutBackBill_PDA.table_SourceBillNo" ? "婧愬崟鍗曞彿" : $t("MateOutBackBill_PDA.table_SourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail">
- <text>婧愬崟鏁伴噺锛�</text>{{ item.婧愬崟鏁伴噺 }}
+ <text>{{ $t("MateOutBackBill_PDA.table_SourceBillQty") == "MateOutBackBill_PDA.table_SourceBillQty" ? "婧愬崟鏁伴噺" : $t("MateOutBackBill_PDA.table_SourceBillQty") }}锛�</text>{{item.婧愬崟鏁伴噺}}
</view>
<view class="detail">
- <text>鏁伴噺锛�</text>{{ item.鏁伴噺 }}
+ <text>{{ $t("MateOutBackBill_PDA.table_BarQty") == "MateOutBackBill_PDA.table_BarQty" ? "鏁伴噺" : $t("MateOutBackBill_PDA.table_BarQty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail">
- <text>鏉＄爜涓暟锛�</text>{{ item.鏉＄爜涓暟 }}
+ <text>{{ $t("MateOutBackBill_PDA.table_BarNum") == "MateOutBackBill_PDA.table_BarNum" ? "鏉＄爜涓暟" : $t("MateOutBackBill_PDA.table_BarNum") }}锛�</text>{{item.鏉＄爜涓暟}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{ item.瑙勬牸鍨嬪彿 }}
+ <text>{{ $t("MateOutBackBill_PDA.table_MaterModel") == "MateOutBackBill_PDA.table_MaterModel" ? "瑙勬牸鍨嬪彿" : $t("MateOutBackBill_PDA.table_MaterModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
<view class="detail" v-if="item.杈呭姪灞炴��">
- <text>杈呭姪灞炴�э細</text>{{ item.杈呭姪灞炴�� }}
+ <text>{{ $t("MateOutBackBill_PDA.table_Aux") == "MateOutBackBill_PDA.table_Aux" ? "杈呭姪灞炴��" : $t("MateOutBackBill_PDA.table_Aux") }}锛�</text>{{item.杈呭姪灞炴�}
</view>
</view>
</uni-card>
</view>
- <view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="Materlist.length == 0">{{ $t("MateOutBackBill_PDA.noData") == "MateOutBackBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("MateOutBackBill_PDA.noData") }}</view>
</view>
<view v-if="tabs == 4">
@@ -192,83 +192,83 @@
@tap="delMater(item)">
<view class="card-detail">
<view class="detail">
- <text>鏁伴噺锛�</text>{{ item.HQty }}
+ <text>{{ $t("MateOutBackBill_PDA.Qty") == "MateOutBackBill_PDA" ? "鏁伴噺" : $t("MateOutBackBill_PDA.Qty") }}锛�</text>{{item.HQty}}
</view>
<view class="detail">
- <text>涓嬫灦鏁伴噺锛�</text>{{ item.HQtyMust }}
+ <text>{{ $t("MateOutBackBill_PDA.PutawayQty") == "MateOutBackBill_PDA.PutawayQty" ? "涓嬫灦鏁伴噺" : $t("MateOutBackBill_PDA.PutawayQty") }}锛�</text>{{item.HQtyMust}}
</view>
<view class="detail">
- <text>浠撳簱锛�</text>{{ item.HWhName }}
+ <text>{{ $t("MateOutBackBill_PDA.Warehouse") == "MateOutBackBill_PDA.Warehouse" ? "浠撳簱" : $t("MateOutBackBill_PDA.Warehouse") }}锛�</text>{{item.HWhName}}
</view>
<view class="detail">
- <text>浠撲綅锛�</text>{{ item.HSPName }}
+ <text>{{ $t("MateOutBackBill_PDA.StockPlace") == "MateOutBackBill_PDA.StockPlace" ? "浠撲綅" : $t("MateOutBackBill_PDA.StockPlace") }}锛�</text>{{item.HSPName}}
</view>
<view class="detail">
- <text>瑙勬牸鍨嬪彿锛�</text>{{ item.HMaterModel }}
+ <text>{{ $t("MateOutBackBill_PDA.MaterModel") == "MateOutBackBill_PDA.MaterModel" ? "瑙勬牸鍨嬪彿" : $t("MateOutBackBill_PDA.MaterModel") }}锛�</text>{{item.HMaterModel}}
</view>
<view class="detail" v-if="item.HBatchNo">
- <text>鎵瑰彿锛�</text>{{ item.HBatchNo }}
+ <text>{{ $t("MateOutBackBill_PDA.BatchNo") == "MateOutBackBill_PDA.BatchNo" ? "鎵瑰彿" : $t("MateOutBackBill_PDA.BatchNo") }}锛�</text>{{item.HBatchNo}}
</view>
<view class="detail" v-if="item.HAuxPropName">
- <text>杈呭姪灞炴�э細</text>{{ item.HAuxPropName }}
+ <text>{{ $t("MateOutBackBill_PDA.table_Aux") == "MateOutBackBill_PDA.table_Aux" ? "杈呭姪灞炴��" : $t("MateOutBackBill_PDA.table_Aux") }}锛�</text>{{item.HAuxPropName}}
</view>
</view>
</uni-card>
</view>
- <view class="over" v-if="FIFOlist.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="FIFOlist.length == 0">{{ $t("MateOutBackBill_PDA.noData") == "MateOutBackBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("MateOutBackBill_PDA.noData") }}</view>
</view>
<view v-if="tabs == 3">
<view class="form-item">
- <view class="title">鏉＄爜:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.BarCode") == "MateOutBackBill_PDA.BarCode" ? "鏉＄爜" : $t("MateOutBackBill_PDA.BarCode") }}:</view>
<view class="righton">
<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鐗╂枡:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.Material") == "MateOutBackBill_PDA.Material" ? "鐗╂枡" : $t("MateOutBackBill_PDA.Material") }}:</view>
<view class="righton">
<input disabled v-model="hform.HMaterName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">瑙勬牸:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.MaterModel") == "MateOutBackBill_PDA.MaterModel" ? "瑙勬牸" : $t("MateOutBackBill_PDA.MaterModel") }}:</view>
<view class="righton">
<input disabled v-model="hform.HMaterModel_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鎵规:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.BatchNo") == "MateOutBackBill_PDA.BatchNo" ? "鎵规" : $t("MateOutBackBill_PDA.BatchNo") }}:</view>
<view class="righton">
<input disabled v-model="hform.HBatchNo_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曚綅:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.Unit") == "MateOutBackBill_PDA.Unit" ? "鍗曚綅" : $t("MateOutBackBill_PDA.Unit") }}:</view>
<view class="righton">
<input disabled v-model="hform.HUnitName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鏁伴噺:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.Qty") == "MateOutBackBill_PDA.Qty" ? "鏁伴噺" : $t("MateOutBackBill_PDA.Qty") }}:</view>
<view class="righton">
<input disabled v-model="hform.HQty_B" />
</view>
</view>
<view class="form-item">
- <view class="title">瀹归噺:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.Capacity") == "MateOutBackBill_PDA.Capacity" ? "瀹归噺" : $t("MateOutBackBill_PDA.Capacity") }}:</view>
<view class="righton">
<input disabled v-model="hform.HTMQty_B" />
</view>
</view>
<view class="form-item">
- <view class="title">浠撳簱:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.Warehouse") == "MateOutBackBill_PDA.Warehouse" ? "浠撳簱" : $t("MateOutBackBill_PDA.Warehouse") }}:</view>
<view class="righton">
<input disabled v-model="hform.HWHName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">浠撲綅:</view>
+ <view class="title">{{ $t("MateOutBackBill_PDA.StockPlace") == "MateOutBackBill_PDA.StockPlace" ? "浠撲綅" : $t("MateOutBackBill_PDA.DCStockPlace") }}:</view>
<view class="righton">
<input disabled v-model="hform.HSPName_B" />
</view>
@@ -276,10 +276,10 @@
</view>
<view class="bottom-btn">
- <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button class="btn-a" size="mini" @tap="submit">{{ $t("MateOutBackBill_PDA.btnSubmit") == "MateOutBackBill_PDA.btnSubmit" ? "鎻愪氦" : $t("MateOutBackBill_PDA.btnSubmit") }}</button>
<view style="flex: 1;"></view>
- <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
- <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ <button class="btn-a" size="mini" @tap="addNew">{{ $t("MateOutBackBill_PDA.btnAdd") == "MateOutBackBill_PDA.btnAdd" ? "鏂板" : $t("MateOutBackBill_PDA.btnAdd") }}</button>
+ <button class="btn-c" size="mini" @tap="goBack">{{ $t("MateOutBackBill_PDA.btnExit") == "MateOutBackBill_PDA.btnExit" ? "閫�鍑�" : $t("MateOutBackBill_PDA.btnExit") }}</button>
</view>
</view>
<BillSelectPopupXiaoWeiVue v-if="enableModule == 1" ref="billList" :HBillType="hform.HBillType"
@@ -391,7 +391,25 @@
HTMQty_B: '',
HWHName_B: '',
HSPName_B: '',
- }
+ },
+ placeholder_BarCode:this.$t("MateOutBackBill_PDA.placeholder_BarCode") == "MateOutBackBill_PDA.placeholder_BarCode" ? "璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" : this.$t("MateOutBackBill_PDA.placeholder_BarCode"),
+ placeholder_Qty:this.$t("MateOutBackBill_PDA.placeholder_Qty") == "MateOutBackBill_PDA.placeholder_Qty" ? "璇疯緭鍏ユ暟閲�" : this.$t("MateOutBackBill_PDA.placeholder_Qty"),
+ placeholder_DCWarehouse:this.$t("MateOutBackBill_PDA.placeholder_DCWarehouse") == "MateOutBackBill_PDA.placeholder_DCWarehouse" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" : this.$t("MateOutBackBill_PDA.placeholder_DCWarehouse"),
+ placeholder_DCStockPlace:this.$t("MateOutBackBill_PDA.placeholder_DCStockPlace") == "MateOutBackBill_PDA.placeholder_DCStockPlace" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" : this.$t("MateOutBackBill_PDA.placeholder_DCStockPlace"),
+ placeholder_SourceBillNo:this.$t("MateOutBackBill_PDA.placeholder_SourceBillNo") == "MateOutBackBill_PDA.placeholder_SourceBillNo" ? "璇疯緭鍏ユ簮鍗曞崟鍙�" : this.$t("MateOutBackBill_PDA.placeholder_SourceBillNo"),
+ placeholder_FIFOwarehouse:this.$t("MateOutBackBill_PDA.placeholder_FIFOwarehouse") == "MateOutBackBill_PDA.placeholder_FIFOwarehouse" ? "璇烽�夋嫨" : this.$t("MateOutBackBill_PDA.placeholder_FIFOwarehouse"),
+ placeholder_OutboundType:this.$t("MateOutBackBill_PDA.placeholder_OutboundType") == "MateOutBackBill_PDA.placeholder_OutboundType" ? "璇烽�夋嫨" : this.$t("MateOutBackBill_PDA.placeholder_OutboundType"),
+ placeholder_TransferDirection:this.$t("MateOutBackBill_PDA.placeholder_TransferDirection") == "MateOutBackBill_PDA.placeholder_TransferDirection" ? "璇烽�夋嫨璋冩嫧鏂瑰悜" : this.$t("MateOutBackBill_PDA.placeholder_TransferDirection"),
+ placeholder_TransferType:this.$t("MateOutBackBill_PDA.placeholder_TransferType") == "MateOutBackBill_PDA.placeholder_TransferType" ? "璇烽�夋嫨璋冩嫧绫诲瀷" : this.$t("MateOutBackBill_PDA.placeholder_TransferType"),
+ placeholder_SCWarehouse:this.$t("MateOutBackBill_PDA.placeholder_SCWarehouse") == "MateOutBackBill_PDA.placeholder_SCWarehouse" ? "璇烽�夋嫨璋冨嚭浠撳簱" : this.$t("MateOutBackBill_PDA.placeholder_SCWarehouse"),
+ placeholder_SCStockPlace:this.$t("MateOutBackBill_PDA.placeholder_SCStockPlace") == "MateOutBackBill_PDA.placeholder_SCStockPlace" ? "璇烽�夋嫨璋冨嚭浠撲綅" : this.$t("MateOutBackBill_PDA.placeholder_SCStockPlace"),
+ placeholder_SecManager:this.$t("MateOutBackBill_PDA.placeholder_SecManager") == "MateOutBackBill_PDA.placeholder_SecManager" ? "璇烽�夋嫨楠屾敹鍛�" : this.$t("MateOutBackBill_PDA.placeholder_SecManager"),
+ placeholder_Keeper:this.$t("MateOutBackBill_PDA.placeholder_Keeper") == "MateOutBackBill_PDA.placeholder_Keeper" ? "璇烽�夋嫨淇濈鍛�" : this.$t("MateOutBackBill_PDA.placeholder_Keeper"),
+ placeholder_Dept:this.$t("MateOutBackBill_PDA.placeholder_Dept") == "MateOutBackBill_PDA.placeholder_Dept" ? "璇烽�夋嫨閮ㄩ棬" : this.$t("MateOutBackBill_PDA.placeholder_Dept"),
+ placeholder_Supplier:this.$t("MateOutBackBill_PDA.placeholder_Supplier") == "MateOutBackBill_PDA.placeholder_Supplier" ? "璇烽�夋嫨渚涘簲鍟�" : this.$t("MateOutBackBill_PDA.placeholder_Supplier"),
+ placeholder_Customer:this.$t("MateOutBackBill_PDA.placeholder_Customer") == "MateOutBackBill_PDA.placeholder_Customer" ? "璇烽�夋嫨瀹㈡埛" : this.$t("MateOutBackBill_PDA.placeholder_Customer"),
+ unOperate:this.$t("MateOutBackBill_PDA.unOperate") == "MateOutBackBill_PDA.unOperate" ? "鏆傛棤鏁版嵁" : this.$t("MateOutBackBill_PDA.unOperate")
+
}
},
components: {
@@ -423,7 +441,10 @@
}
}
},
- onLoad(e) {
+ async onLoad(e) {
+ uni.setNavigationBarTitle({
+ title: this.$t("MateOutBackBill_PDA.title")
+ })
console.log(e, this.userInfo)
this.OperationType = e.OperationType
if (e.HInterID) {
diff --git a/pages/shengchantuiliao/MateOutBackBillList.vue b/pages/shengchantuiliao/MateOutBackBillList.vue
index f422e2d..5722994 100644
--- a/pages/shengchantuiliao/MateOutBackBillList.vue
+++ b/pages/shengchantuiliao/MateOutBackBillList.vue
@@ -1,33 +1,33 @@
<template>
<view class="content">
<view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
- <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸蹭笂浼犲垪琛�</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">{{ $t("MateOutBackBillList_PDA.cacheList") == "MateOutBackBillList_PDA.cacheList" ? "缂撳瓨鍒楄〃" : $t("MateOutBackBillList_PDA.cacheList") }}</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">{{ $t("MateOutBackBillList_PDA.updatedList") == "MateOutBackBillList_PDA.updatedList" ? "宸蹭笂浼犲垪琛�" : $t("MateOutBackBillList_PDA.updatedList") }}</view>
</view>
<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
<view class="form" v-if="tabs == 0">
<view class="buttons" @tap="add">
- <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
+ <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>{{ $t("MateOutBackBillList_PDA.btnAdd") == "MateOutBackBillList_PDA.btnAdd" ? "鏂板" : $t("MateOutBackBillList_PDA.btnAdd") }}
</view>
</view>
<view class="form" v-if="tabs == 1">
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("MateOutBackBillList_PDA.billNo") == "MateOutBackBillList_PDA.billNo" ? "鍗曟嵁鍙�" : $t("MateOutBackBillList_PDA.billNo") }}:</view>
<view class="right">
- <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ <input v-model="hform.HBillNo" :placeholder="billNoPlaceholder" />
</view>
</view>
<view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="title">{{ $t("MateOutBackBillList_PDA.sourceBillNo") == "MateOutBackBillList_PDA.sourceBillNo" ? "婧愬崟鍗曞彿" : $t("MateOutBackBillList_PDA.sourceBillNo") }}:</view>
<view class="right">
- <input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ <input v-model="hform.HSourceBillNo" :placeholder="sourceBillNoPlaceholder" />
</view>
</view>
<view class="buttons">
- <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
- <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+ <button class="btn-a" size="mini" type="default" @tap="clear">{{ $t("MateOutBackBillList_PDA.btn_Reset") == "MateOutBackBillList_PDA.btn_Reset" ? "閲嶇疆" : $t("MateOutBackBillList_PDA.btn_Reset") }}</button>
+ <button class="btn-c" size="mini" type="default" @tap="search">{{ $t("MateOutBackBillList_PDA.btn_Query") == "MateOutBackBillList_PDA.btn_Query" ? "鏌ヨ" : $t("MateOutBackBillList_PDA.btn_Query") }}</button>
</view>
</view>
@@ -37,28 +37,28 @@
<uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
<view class="detail" v-if="item.鍒跺崟浜�">
- <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
- </view>
- <view class="detail" v-if="item.鍗曟嵁鍐呯爜">
- <text>鍗曟嵁鍐呯爜锛�</text>{{item.鍗曟嵁鍐呯爜}}
- </view>
- <view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
- </view>
- <view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
- </view>
- <view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("MateOutBackBillList_PDA.table_Maker") == "MateOutBackBillList_PDA.table_Maker" ? "鍒跺崟浜�" : $t("MateOutBackBillList_PDA.table_Maker") }}锛�</text>{{item.鍒跺崟浜簘}
+ </view>
+ <view class="detail" v-if="item.鍗曟嵁鍐呯爜">
+ <text>{{ $t("MateOutBackBillList_PDA.table_BillID") == "MateOutBackBillList_PDA.table_BillID" ? "鍗曟嵁鍐呯爜" : $t("MateOutBackBillList_PDA.table_BillID") }}锛�</text>{{item.鍗曟嵁鍐呯爜}}
+ </view>
+ <view class="detail" v-if="item.鏁伴噺">
+ <text>{{ $t("MateOutBackBillList_PDA.table_Qty") == "MateOutBackBillList_PDA.table_Qty" ? "鏁伴噺" : $t("MateOutBackBillList_PDA.table_Qty") }}锛�</text>{{item.鏁伴噺}}
+ </view>
+ <view class="detail" v-if="item.婧愬崟鍗曞彿">
+ <text>{{ $t("MateOutBackBillList_PDA.table_SourceBillNo") == "MateOutBackBillList_PDA.table_SourceBillNo" ? "婧愬崟鍗曞彿" : $t("MateOutBackBillList_PDA.table_SourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
+ </view>
+ <view class="detail" v-if="item.缁勭粐">
+ <text>{{ $t("MateOutBackBillList_PDA.table_Org") == "MateOutBackBillList_PDA.table_Org" ? "缁勭粐" : $t("MateOutBackBillList_PDA.table_Org") }}锛�</text>{{item.缁勭粐}}
</view>
</view>
<view class="more">
<view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
- <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>缂栬緫
- </view>
- <view class="part" style="color: #da0000;" @tap.stop="del(item)">
- <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>鍒犻櫎
+ <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>{{ $t("MateOutBackBillList_PDA.btn_Edit") == "MateOutBackBillList_PDA.btn_Edit" ? "缂栬緫" : $t("MateOutBackBillList_PDA.btn_Edit") }}
+ </view>
+ <view class="part" style="color: #da0000;" @tap.stop="del(item)">
+ <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>{{ $t("MateOutBackBillList_PDA.btn_Del") == "MateOutBackBillList_PDA.btn_Del" ? "鍒犻櫎" : $t("MateOutBackBillList_PDA.btn_Del") }}
</view>
</view>
</uni-card>
@@ -67,45 +67,45 @@
<uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
<view class="detail" v-if="item.鐘舵��">
- <text>鐘舵�侊細</text>{{item.鐘舵�亇}
+ <text>{{ $t("MateOutBackBillList_PDA.table_Status") == "MateOutBackBillList_PDA.table_Status" ? "鐘舵��" : $t("MateOutBackBillList_PDA.table_Status") }}锛�</text>{{item.鐘舵�亇}
</view>
<view class="detail" v-if="item.鍒跺崟浜�">
- <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ <text>{{ $t("MateOutBackBillList_PDA.table_Maker") == "MateOutBackBillList_PDA.table_Maker" ? "鍒跺崟浜�" : $t("MateOutBackBillList_PDA.table_Maker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("MateOutBackBillList_PDA.table_Qty") == "MateOutBackBillList_PDA.table_Qty" ? "鏁伴噺" : $t("MateOutBackBillList_PDA.table_Qty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("MateOutBackBillList_PDA.sourceBillNo") == "MateOutBackBillList_PDA.sourceBillNo" ? "婧愬崟鍗曞彿" : $t("MateOutBackBillList_PDA.sourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.鐗╂枡浠ｇ爜">
- <text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
+ <text>{{ $t("MateOutBackBillList_PDA.table_MaterNumber") == "MateOutBackBillList_PDA.table_MaterNumber" ? "鐗╂枡浠ｇ爜" : $t("MateOutBackBillList_PDA.table_MaterNumber") }}锛�</text>{{item.鐗╂枡浠ｇ爜}}
</view>
<view class="detail" v-if="item.鐗╂枡鍚嶇О">
- <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+ <text>{{ $t("MateOutBackBillList_PDA.table_MaterName") == "MateOutBackBillList_PDA.table_MaterName" ? "鐗╂枡鍚嶇О" : $t("MateOutBackBillList_PDA.table_MaterName") }}锛�</text>{{item.鐗╂枡鍚嶇О}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ <text>{{ $t("MateOutBackBillList_PDA.table_MaterModel") == "MateOutBackBillList_PDA.table_MaterModel" ? "瑙勬牸鍨嬪彿" : $t("MateOutBackBillList_PDA.table_MaterModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("MateOutBackBillList_PDA.table_Org") == "MateOutBackBillList_PDA.table_Org" ? "缁勭粐" : $t("MateOutBackBillList_PDA.table_Org") }}锛�</text>{{item.缁勭粐}}
</view>
</view>
<view class="more">
<view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
- <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>鏄剧ず浜岀淮鐮�
+ <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>{{ $t("MateOutBackBillList_PDA.btn_DisplayCode") == "MateOutBackBillList_PDA.btn_DisplayCode" ? "鏄剧ず浜岀淮鐮�" : $t("MateOutBackBillList_PDA.btn_DisplayCode") }}
</view>
- <view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
- <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>鎾ら攢
+ <view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
+ <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>{{ $t("MateOutBackBillList_PDA.btn_Revoke") == "MateOutBackBillList_PDA.btn_Revoke" ? "鎾ら攢" : $t("MateOutBackBillList_PDA.btn_Revoke") }}
</view>
</view>
</uni-card>
</view>
- <view class="over" v-if="!listData || listData.length == 0">鏆傛棤鏁版嵁</view>
- <view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
- <view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+ <view class="over" v-if="!listData || listData.length == 0">{{ $t("MateOutBackBillList_PDA.noDate") == "MateOutBackBillList_PDA.noDate" ? "鏆傛棤鏁版嵁" : $t("MateOutBackBillList_PDA.noDate") }}</view>
+ <view class="over" v-if="listData.length != 0 && listData.length != showList.length">{{ $t("MateOutBackBillList_PDA.Loading") == "MateOutBackBillList_PDA.Loading" ? "鍔犺浇涓�..." : $t("MateOutBackBillList_PDA.Loading") }}</view>
+ <view class="over" v-if="listData.length != 0 && listData.length == showList.length">{{ $t("MateOutBackBillList_PDA.bottom") == "MateOutBackBillList_PDA.bottom" ? "宸插埌搴�" : $t("MateOutBackBillList_PDA.bottom") }}</view>
<BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
</view>
</template>
@@ -128,6 +128,8 @@
HMaker: uni.getStorageSync('HUserName'),
HStockOrgID: uni.getStorageSync('OrganizationID'),
},
+ billNoPlaceholder:this.$t("MoveStockBillList_PDA.billNoPlaceholder") == "MoveStockBillList_PDA.billNoPlaceholder" ? "璇疯緭鍏ュ崟鎹彿" : this.$t("MoveStockBillList_PDA.billNoPlaceholder"),
+ sourceBillNoPlaceholder:this.$t("MoveStockBillList.sourceBillNoPlaceholder") == "MoveStockBillList_PDA.sourceBillNoPlaceholder" ? "璇疯緭鍏ユ簮鍗曠紪鍙�" : this.$t("MoveStockBillList_PDA.sourceBillNoPlaceholder"),
sWhere:'',
listData:[],
showList:[],
@@ -137,6 +139,9 @@
}
},
onShow() {
+ uni.setNavigationBarTitle({
+ title: this.$t("MateOutBackBillList_PDA.title")
+ })
//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
this.CheckModRight()
this.changeTab(0)
diff --git a/pages/tiaomachaima/tiaomachaima.vue b/pages/tiaomachaima/tiaomachaima.vue
index 931a901..21d27a0 100644
--- a/pages/tiaomachaima/tiaomachaima.vue
+++ b/pages/tiaomachaima/tiaomachaima.vue
@@ -2,9 +2,10 @@
<view class="container">
<view class="header">
<view class="item">
- <view class="left">鏉＄爜缂栧彿锛�</view>
+ <view class="left">{{ $t("BarCodeSplit.barCodeNo") == "BarCodeSplit.barCodeNo" ? "鏉＄爜缂栧彿锛�" : $t("BarCodeSplit.barCodeNo") }}</view>
<view class="right">
- <input name="HBarCode" v-model="barCodeInfoMeta.barCodeNo" placeholder="璇锋壂鎻忔潯鐮�"
+ <input name="HBarCode" v-model="barCodeInfoMeta.barCodeNo"
+ :placeholder="$t('BarCodeSplit.barCodeNoPlaceholder') == 'BarCodeSplit.barCodeNoPlaceholder' ? '璇锋壂鎻忔潯鐮�' : $t('BarCodeSplit.barCodeNoPlaceholder')"
@confirm="searchbarCodeInfo" />
</view>
<view>
@@ -14,85 +15,88 @@
</view>
</view>
<view class="item">
- <view class="left">鎷嗙爜鏁伴噺锛�</view>
+ <view class="left">{{ $t("BarCodeSplit.splitNum") == "BarCodeSplit.splitNum" ? "鎷嗙爜鏁伴噺锛�" : $t("BarCodeSplit.splitNum") }}</view>
<view class="right">
- <input type="number" name="HSplitNum" v-model="barCodeInfoMeta.splitNum" placeholder="璇疯緭鍏ユ媶鐮佹暟閲�" />
+ <input type="number" name="HSplitNum" v-model="barCodeInfoMeta.splitNum"
+ :placeholder="$t('BarCodeSplit.splitNumPlaceholder') == 'BarCodeSplit.splitNumPlaceholder' ? '璇疯緭鍏ユ媶鐮佹暟閲�' : $t('BarCodeSplit.splitNumPlaceholder')" />
</view>
</view>
<view class="item">
- <view class="left">鍒跺崟浜猴細</view>
+ <view class="left">{{ $t("Gy.HMaker") == "Gy.HMaker" ? "鍒跺崟浜猴細" : $t("Gy.HMaker") }}</view>
<view class="right">
<input type="text" disabled name="HMaker" v-model="barCodeInfoMeta.billMaker"
- placeholder="璇疯緭鍏ュ埗鍗曚汉" />
+ :placeholder="$t('BarCodeSplit.makerPlaceholder') == 'BarCodeSplit.makerPlaceholder' ? '璇疯緭鍏ュ埗鍗曚汉' : $t('BarCodeSplit.makerPlaceholder')" />
</view>
</view>
<view class="operation-zone">
- <button class="btn-c" @click="searchbarCodeInfoMeta">鎷嗙爜</button>
+ <button class="btn-c" @click="searchbarCodeInfoMeta">{{ $t("BarCodeSplit.btnSplit") == "BarCodeSplit.btnSplit" ? "鎷嗙爜" : $t("BarCodeSplit.btnSplit") }}</button>
<button type="default" :class="cantGenerate?'':'btn-c'" @click="SaveBarCodeCreate"
- :disabled="cantGenerate">鐢熸垚</button>
+ :disabled="cantGenerate">{{ $t("BarCodeSplit.btnGenerate") == "BarCodeSplit.btnGenerate" ? "鐢熸垚" : $t("BarCodeSplit.btnGenerate") }}</button>
</view>
</view>
<view class="divide"></view>
<view class="content">
<view class="barcode-detail" v-show="CommonUtils.isEmpty(Object.assign(barCodeInfo, {})) === false">
- <view class="title">鏉＄爜淇℃伅</view>
+ <view class="title">{{ $t("BarCodeSplit.barCodeInfoTitle") == "BarCodeSplit.barCodeInfoTitle" ? "鏉＄爜淇℃伅" : $t("BarCodeSplit.barCodeInfoTitle") }}</view>
<uni-card>
<view class="detail">
- <text>鏉＄爜鍙凤細</text>{{barCodeInfo['鏉＄爜缂栧彿'] || ''}}
+ <text>{{ $t("Gy.HBarCode") == "Gy.HBarCode" ? "鏉＄爜鍙凤細" : $t("Gy.HBarCode") }}</text>{{barCodeInfo['鏉＄爜缂栧彿'] || ''}}
</view>
<view class="detail">
- <text>鍘熸暟閲忥細</text>{{barCodeInfo['鏁伴噺'] || '0'}}
+ <text>{{ $t("Gy.HQty") == "Gy.HQty" ? "鍘熸暟閲忥細" : $t("Gy.HQty") }}</text>{{barCodeInfo['鏁伴噺'] || '0'}}
</view>
<view class="dWetail">
- <text>鐗╂枡缂栫爜锛�</text>{{barCodeInfo['鐗╂枡浠ｇ爜'] || ''}}
+ <text>{{ $t("Gy.HNumber") == "Gy.HNumber" ? "鐗╂枡缂栫爜锛�" : $t("Gy.HNumber") }}</text>{{barCodeInfo['鐗╂枡浠ｇ爜'] || ''}}
</view>
<view class="detail">
- <text>鐗╂枡鍚嶇О锛�</text>{{barCodeInfo['鐗╂枡鍚嶇О'] || ''}}
+ <text>{{ $t("Gy.HName") == "Gy.HName" ? "鐗╂枡鍚嶇О锛�" : $t("Gy.HName") }}</text>{{barCodeInfo['鐗╂枡鍚嶇О'] || ''}}
</view>
<view class="detail">
- <text>瑙勬牸鍨嬪彿锛�</text>{{barCodeInfo['瑙勬牸鍨嬪彿'] || ''}}
+ <text>{{ $t("Gy.HModel") == "Gy.HModel" ? "瑙勬牸鍨嬪彿锛�" : $t("Gy.HModel") }}</text>{{barCodeInfo['瑙勬牸鍨嬪彿'] || ''}}
</view>
<view class="detail">
- <text>璁￠噺鍗曚綅锛�</text>{{barCodeInfo['璁￠噺鍗曚綅'] || ''}}
+ <text>{{ $t("Gy.HUnit") == "Gy.HUnit" ? "璁￠噺鍗曚綅锛�" : $t("Gy.HUnit") }}</text>{{barCodeInfo['璁￠噺鍗曚綅'] || ''}}
</view>
</uni-card>
</view>
<view class="divide"></view>
<view class="barcode-split" v-show="barCodeSplitInfo.length>0">
- <view class="title">鏉＄爜鎷嗙爜</view>
+ <view class="title">{{ $t("BarCodeSplit.barCodeSplitTitle") == "BarCodeSplit.barCodeSplitTitle" ? "鏉＄爜鎷嗙爜" : $t("BarCodeSplit.barCodeSplitTitle") }}</view>
<view class="barcode-split-list" v-for="(item,index) in barCodeSplitInfo" :key="index">
<uni-card @tap="ModityHQty(item)">
<view class="detail">
- <text>鏉＄爜缂栧彿锛�</text>{{item['HBarCode'] || ''}}
+ <text>{{ $t("Gy.HBarCode") == "Gy.HBarCode" ? "鏉＄爜缂栧彿锛�" : $t("Gy.HBarCode") }}</text>{{item['HBarCode'] || ''}}
</view>
<view class="detail">
- <text>鏉＄爜鏁伴噺锛�</text>{{item['HQty'] || '0'}}
+ <text>{{ $t("Gy.HQty") == "Gy.HQty" ? "鏉＄爜鏁伴噺锛�" : $t("Gy.HQty") }}</text>{{item['HQty'] || '0'}}
</view>
<view class="detail split-num">
- <text>鎷嗗垎鏁伴噺锛�</text>{{item['HSplitNum'] || '0'}}
+ <text>{{ $t("BarCodeSplit.splitNum") == "BarCodeSplit.splitNum" ? "鎷嗗垎鏁伴噺锛�" : $t("BarCodeSplit.splitNum") }}</text>{{item['HSplitNum'] || '0'}}
</view>
<view class="detail">
- <text>鐗╂枡浠ｇ爜锛�</text>{{item['HNumber'] || ''}}
+ <text>{{ $t("Gy.HNumber") == "Gy.HNumber" ? "鐗╂枡浠ｇ爜锛�" : $t("Gy.HNumber") }}</text>{{item['HNumber'] || ''}}
</view>
<view class="detail">
- <text>鐗╂枡鍚嶇О锛�</text>{{item['HName'] || ''}}
+ <text>{{ $t("Gy.HName") == "Gy.HName" ? "鐗╂枡鍚嶇О锛�" : $t("Gy.HName") }}</text>{{item['HName'] || ''}}
</view>
<view class="detail">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item['HModel'] || ''}}
+ <text>{{ $t("Gy.HModel") == "Gy.HModel" ? "瑙勬牸鍨嬪彿锛�" : $t("Gy.HModel") }}</text>{{item['HModel'] || ''}}
</view>
<view class="detail">
- <text>璁￠噺鍗曚綅锛�</text>{{barCodeInfo['璁￠噺鍗曚綅'] || ''}}
+ <text>{{ $t("Gy.HUnit") == "Gy.HUnit" ? "璁￠噺鍗曚綅锛�" : $t("Gy.HUnit") }}</text>{{barCodeInfo['璁￠噺鍗曚綅'] || ''}}
</view>
</uni-card>
</view>
</view>
</view>
- <view class="over" v-if="barCodeSplitInfo.length == 0">鏆傛棤鏁版嵁</view>
- <view class="over" v-if="barCodeSplitInfo.length != 0">宸插埌搴�</view>
+ <view class="over" v-if="barCodeSplitInfo.length == 0">{{ $t("BarCodeSplit.noData") == "BarCodeSplit.noData" ? "鏆傛棤鏁版嵁" : $t("BarCodeSplit.noData") }}</view>
+ <view class="over" v-if="barCodeSplitInfo.length != 0">{{ $t("BarCodeSplit.bottom") == "BarCodeSplit.bottom" ? "宸插埌搴�" : $t("BarCodeSplit.bottom") }}</view>
<view>
- <!-- 杈撳叆妗嗙ず渚� -->
<uni-popup ref="inputDialog" type="dialog">
- <uni-popup-dialog ref="inputClose" mode="input" title="璇疯緭鍏ユ媶鐮佹暟閲�" :value="dialogVal" placeholder="璇疯緭鍏ユ媶鐮佹暟閲�"
+ <uni-popup-dialog ref="inputClose" mode="input"
+ :title="$t('BarCodeSplit.dialogTitle') == 'BarCodeSplit.dialogTitle' ? '璇疯緭鍏ユ媶鐮佹暟閲�' : $t('BarCodeSplit.dialogTitle')"
+ :value="dialogVal"
+ :placeholder="$t('BarCodeSplit.dialogPlaceholder') == 'BarCodeSplit.dialogPlaceholder' ? '璇疯緭鍏ユ媶鐮佹暟閲�' : $t('BarCodeSplit.dialogPlaceholder')"
@confirm="dialogInputConfirm"></uni-popup-dialog>
</uni-popup>
</view>
@@ -130,7 +134,7 @@
methods: {
doRequest(url, data, resFunction, errFunction, method) {
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title: this.$t('BarCodeSplit.loading') == 'BarCodeSplit.loading' ? '鍔犺浇涓�...' : this.$t('BarCodeSplit.loading')
})
uni.request({
method: method || "GET",
@@ -148,7 +152,7 @@
fail: (err) => {
uni.showToast({
icon: "error",
- title: "鎺ュ彛璁块棶寮傚父!",
+ title: this.$t('BarCodeSplit.requestFailed') == 'BarCodeSplit.requestFailed' ? '鎺ュ彛璁块棶寮傚父!' : this.$t('BarCodeSplit.requestFailed'),
duration: 2000
})
if (typeof errFunction === 'function') {
@@ -167,19 +171,19 @@
if (CommonUtils.isEmpty(this.barCodeInfoMeta.barCodeNo) === true) {
return uni.showToast({
icon: 'none',
- title: '鏉＄爜缂栧彿涓嶅緱涓虹┖!'
+ title: this.$t('BarCodeSplit.barCodeNoEmpty') == 'BarCodeSplit.barCodeNoEmpty' ? '鏉＄爜缂栧彿涓嶅緱涓虹┖!' : this.$t('BarCodeSplit.barCodeNoEmpty')
});
}
if (CommonUtils.isEmpty(this.barCodeInfoMeta.splitNum, true) === true) {
return uni.showToast({
icon: 'none',
- title: '鎷嗗垎鏁伴噺涓嶅緱涓虹┖!'
+ title: this.$t('BarCodeSplit.splitNumEmpty') == 'BarCodeSplit.splitNumEmpty' ? '鎷嗗垎鏁伴噺涓嶅緱涓虹┖!' : this.$t('BarCodeSplit.splitNumEmpty')
});
}
- if (this.barCodeInfoMeta.splitNum > 10 || this.barCodeInfo.splitNum < 2) {
+ if (this.barCodeInfoMeta.splitNum > 10 || this.barCodeInfoMeta.splitNum < 2) {
return uni.showToast({
icon: 'none',
- title: '鎷嗗垎鏁伴噺蹇呴』鍦�2~10涔嬮棿!'
+ title: this.$t('BarCodeSplit.splitNumRange') == 'BarCodeSplit.splitNumRange' ? '鎷嗗垎鏁伴噺蹇呴』鍦�2~10涔嬮棿!' : this.$t('BarCodeSplit.splitNumRange')
});
}
this.doRequest(
@@ -208,7 +212,7 @@
if (data[0]["HQty"] < this.barCodeInfoMeta.splitNum) {
return uni.showToast({
icon: 'none',
- title: '鎷嗗垎鏁伴噺澶т簬鏉＄爜鏁伴噺!'
+ title: this.$t('BarCodeSplit.splitNumExceed') == 'BarCodeSplit.splitNumExceed' ? '鎷嗗垎鏁伴噺澶т簬鏉＄爜鏁伴噺!' : this.$t('BarCodeSplit.splitNumExceed')
});
}
let remainder = data[0]["HQty"] % this.barCodeInfoMeta.splitNum
@@ -227,7 +231,7 @@
} else {
uni.showToast({
icon: 'none',
- title: '娌℃湁鎵惧埌瀵瑰簲鐨勫崟鎹�'
+ title: this.$t('BarCodeSplit.noBillFound') == 'BarCodeSplit.noBillFound' ? '娌℃湁鎵惧埌瀵瑰簲鐨勫崟鎹�' : this.$t('BarCodeSplit.noBillFound')
});
}
},
@@ -244,7 +248,7 @@
if (CommonUtils.isEmpty(this.barCodeInfoMeta.barCodeNo) == true) {
return uni.showToast({
icon: "fail",
- title: "鏉＄爜缂栧彿涓嶈兘涓虹┖!"
+ title: this.$t('BarCodeSplit.barCodeNoEmpty') == 'BarCodeSplit.barCodeNoEmpty' ? '鏉＄爜缂栧彿涓嶈兘涓虹┖!' : this.$t('BarCodeSplit.barCodeNoEmpty')
})
}
this.doRequest(
@@ -291,7 +295,7 @@
if (sum > this.barCodeInfo["HQty"]) {
return uni.showToast({
icon: 'none',
- title: '鎷嗙爜鏁伴噺鍜屼笉寰楀ぇ浜庢潯鐮佹暟閲�'
+ title: this.$t('BarCodeSplit.sumExceed') == 'BarCodeSplit.sumExceed' ? '鎷嗙爜鏁伴噺鍜屼笉寰楀ぇ浜庢潯鐮佹暟閲�' : this.$t('BarCodeSplit.sumExceed')
});
}
let msg =
@@ -303,7 +307,7 @@
function(res) {
this.cantGenerate = true
uni.showToast({
- title: '鐢熸垚鎴愬姛!'
+ title: this.$t('BarCodeSplit.generateSuccess') == 'BarCodeSplit.generateSuccess' ? '鐢熸垚鎴愬姛!' : this.$t('BarCodeSplit.generateSuccess')
});
},
function(err) {
@@ -318,7 +322,7 @@
mpaasScanModule.mpaasScan({
'hideAlbum': true,
'timeoutInterval':'10', //瓒呮椂鏃堕棿
- 'timeoutText':'鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ 'timeoutText': this.$t('BarCodeSplit.timeoutText') == 'BarCodeSplit.timeoutText' ? '鏈瘑鍒埌浜岀淮鐮�' : this.$t('BarCodeSplit.timeoutText')
},(ret) => {
console.log(ret.resp_result)
if (this.CommonUtils.isEmpty(ret.resp_result) === false) {
diff --git a/pages/tiaomachaima/tiaomachaima2.vue b/pages/tiaomachaima/tiaomachaima2.vue
index 5c64f9f..fe3f7ad 100644
--- a/pages/tiaomachaima/tiaomachaima2.vue
+++ b/pages/tiaomachaima/tiaomachaima2.vue
@@ -2,9 +2,10 @@
<view class="container">
<view class="header">
<view class="item">
- <view class="left">鏉＄爜缂栧彿锛�</view>
+ <view class="left">{{ $t("BarCodeSplit2.barCodeNo") == "BarCodeSplit2.barCodeNo" ? "鏉＄爜缂栧彿锛�" : $t("BarCodeSplit2.barCodeNo") }}</view>
<view class="right">
- <input :focus="HBarCodeFocus" v-model="barCodeInfoMeta.barCodeNo" placeholder="璇锋壂鎻忔潯鐮�"
+ <input :focus="HBarCodeFocus" v-model="barCodeInfoMeta.barCodeNo"
+ :placeholder="$t('BarCodeSplit2.barCodeNoPlaceholder') == 'BarCodeSplit2.barCodeNoPlaceholder' ? '璇锋壂鎻忔潯鐮�' : $t('BarCodeSplit2.barCodeNoPlaceholder')"
@blur="searchbarCodeInfo" @confirm="searchbarCodeInfo" />
</view>
<view>
@@ -14,91 +15,95 @@
</view>
</view>
<view class="item">
- <view class="left">鎷嗙爜鏁伴噺锛�</view>
+ <view class="left">{{ $t("BarCodeSplit2.splitNumInput") == "BarCodeSplit2.splitNumInput" ? "鎷嗙爜鏁伴噺锛�" : $t("BarCodeSplit2.splitNumInput") }}</view>
<view class="right">
- <input type="number" name="HSplitNum" v-model="barCodeInfoMeta.splitNum" placeholder="璇疯緭鍏ユ媶鐮佹暟閲�" />
+ <input type="number" name="HSplitNum" v-model="barCodeInfoMeta.splitNum"
+ :placeholder="$t('BarCodeSplit2.splitNumPlaceholder') == 'BarCodeSplit2.splitNumPlaceholder' ? '璇疯緭鍏ユ媶鐮佹暟閲�' : $t('BarCodeSplit2.splitNumPlaceholder')" />
</view>
</view>
<view class="item">
- <view class="left">鍒跺崟浜猴細</view>
+ <view class="left">{{ $t("Gy.HMaker") == "Gy.HMaker" ? "鍒跺崟浜猴細" : $t("Gy.HMaker") }}</view>
<view class="right">
<input type="text" disabled name="HMaker" v-model="barCodeInfoMeta.billMaker"
- style="background-color: #e4e4e4;" placeholder="璇疯緭鍏ュ埗鍗曚汉" />
+ style="background-color: #e4e4e4;"
+ :placeholder="$t('BarCodeSplit2.makerPlaceholder') == 'BarCodeSplit2.makerPlaceholder' ? '璇疯緭鍏ュ埗鍗曚汉' : $t('BarCodeSplit2.makerPlaceholder')" />
</view>
</view>
<view class="operation-zone">
<button :class="cantSplit ? 'btn-disabled' : 'btn-c'" @click="searchbarCodeInfoMeta"
- :disabled="cantSplit">鎷嗙爜</button>
+ :disabled="cantSplit">{{ $t("BarCodeSplit2.btnSplit") == "BarCodeSplit2.btnSplit" ? "鎷嗙爜" : $t("BarCodeSplit2.btnSplit") }}</button>
<button type="default" :class="cantGenerate ? 'btn-disabled' : 'btn-c'" @click="SaveBarCodeCreate"
- :disabled="cantGenerate">鐢熸垚</button>
+ :disabled="cantGenerate">{{ $t("BarCodeSplit2.btnGenerate") == "BarCodeSplit2.btnGenerate" ? "鐢熸垚" : $t("BarCodeSplit2.btnGenerate") }}</button>
<button type="default" :class="cantPrint ? 'btn-disabled' : 'btn-c'" @click="PrintHBarCode"
- :disabled="cantPrint">鎵撳嵃</button>
+ :disabled="cantPrint">{{ $t("BarCodeSplit2.btnPrint") == "BarCodeSplit2.btnPrint" ? "鎵撳嵃" : $t("BarCodeSplit2.btnPrint") }}</button>
</view>
</view>
<view class="divide"></view>
<view class="content">
<view class="barcode-detail" v-show="CommonUtils.isEmpty(Object.assign(barCodeInfo, {})) === false">
- <view class="title">鏉＄爜淇℃伅</view>
+ <view class="title">{{ $t("BarCodeSplit2.barCodeInfoTitle") == "BarCodeSplit2.barCodeInfoTitle" ? "鏉＄爜淇℃伅" : $t("BarCodeSplit2.barCodeInfoTitle") }}</view>
<uni-card>
<view class="detail" style="display: none;">
- <text>鏉＄爜ID锛�</text>{{barCodeInfo['HItemID'] || '0'}}
+ <text>{{ $t("BarCodeSplit2.barCodeID") == "BarCodeSplit2.barCodeID" ? "鏉＄爜ID锛�" : $t("BarCodeSplit2.barCodeID") }}</text>{{barCodeInfo['HItemID'] || '0'}}
</view>
<view class="detail">
- <text>鏉＄爜缂栧彿锛�</text>{{barCodeInfo['鏉＄爜缂栧彿'] || ''}}
+ <text>{{ $t("Gy.HBarCode") == "Gy.HBarCode" ? "鏉＄爜缂栧彿锛�" : $t("Gy.HBarCode") }}</text>{{barCodeInfo['鏉＄爜缂栧彿'] || ''}}
</view>
<view class="detail">
- <text>鏉＄爜鍘熸暟閲忥細</text>{{barCodeInfo['鏁伴噺'] || '0'}}
+ <text>{{ $t("BarCodeSplit2.originalQty") == "BarCodeSplit2.originalQty" ? "鏉＄爜鍘熸暟閲忥細" : $t("BarCodeSplit2.originalQty") }}</text>{{barCodeInfo['鏁伴噺'] || '0'}}
</view>
<view class="detail">
- <text>鍓╀綑鏁伴噺锛�</text>{{barCodeInfo['鍓╀綑鏁伴噺'] || '0'}}
+ <text>{{ $t("BarCodeSplit2.remainingQty") == "BarCodeSplit2.remainingQty" ? "鍓╀綑鏁伴噺锛�" : $t("BarCodeSplit2.remainingQty") }}</text>{{barCodeInfo['鍓╀綑鏁伴噺'] || '0'}}
</view>
<view class="dWetail">
- <text>鐗╂枡缂栫爜锛�</text>{{barCodeInfo['鐗╂枡浠ｇ爜'] || ''}}
+ <text>{{ $t("Gy.HNumber") == "Gy.HNumber" ? "鐗╂枡缂栫爜锛�" : $t("Gy.HNumber") }}</text>{{barCodeInfo['鐗╂枡浠ｇ爜'] || ''}}
</view>
<view class="detail">
- <text>鐗╂枡鍚嶇О锛�</text>{{barCodeInfo['鐗╂枡鍚嶇О'] || ''}}
+ <text>{{ $t("Gy.HName") == "Gy.HName" ? "鐗╂枡鍚嶇О锛�" : $t("Gy.HName") }}</text>{{barCodeInfo['鐗╂枡鍚嶇О'] || ''}}
</view>
<view class="detail">
- <text>瑙勬牸鍨嬪彿锛�</text>{{barCodeInfo['瑙勬牸鍨嬪彿'] || ''}}
+ <text>{{ $t("Gy.HModel") == "Gy.HModel" ? "瑙勬牸鍨嬪彿锛�" : $t("Gy.HModel") }}</text>{{barCodeInfo['瑙勬牸鍨嬪彿'] || ''}}
</view>
<view class="detail">
- <text>璁￠噺鍗曚綅锛�</text>{{barCodeInfo['璁￠噺鍗曚綅'] || ''}}
+ <text>{{ $t("Gy.HUnit") == "Gy.HUnit" ? "璁￠噺鍗曚綅锛�" : $t("Gy.HUnit") }}</text>{{barCodeInfo['璁￠噺鍗曚綅'] || ''}}
</view>
</uni-card>
</view>
<view class="divide"></view>
<view class="barcode-split" v-show="barCodeSplitInfo.length>0">
- <view class="title">鏉＄爜鎷嗙爜</view>
+ <view class="title">{{ $t("BarCodeSplit2.barCodeSplitTitle") == "BarCodeSplit2.barCodeSplitTitle" ? "鏉＄爜鎷嗙爜" : $t("BarCodeSplit2.barCodeSplitTitle") }}</view>
<view class="barcode-split-list" v-for="(item,index) in barCodeSplitInfo" :key="index">
<uni-card @tap="ModityHQty(item)">
<view class="detail">
- <text>鏉＄爜缂栧彿锛�</text>{{item['HBarCode'] || ''}}
+ <text>{{ $t("Gy.HBarCode") == "Gy.HBarCode" ? "鏉＄爜缂栧彿锛�" : $t("Gy.HBarCode") }}</text>{{item['HBarCode'] || ''}}
</view>
<view class="detail split-num">
- <text>鎷嗗垎鏁伴噺锛�</text>{{item['HSplitNum'] || '0'}}
+ <text>{{ $t("BarCodeSplit2.splitNumLabel") == "BarCodeSplit2.splitNumLabel" ? "鎷嗗垎鏁伴噺锛�" : $t("BarCodeSplit2.splitNumLabel") }}</text>{{item['HSplitNum'] || '0'}}
</view>
<view class="detail">
- <text>鐗╂枡浠ｇ爜锛�</text>{{item['HNumber'] || ''}}
+ <text>{{ $t("Gy.HNumber") == "Gy.HNumber" ? "鐗╂枡浠ｇ爜锛�" : $t("Gy.HNumber") }}</text>{{item['HNumber'] || ''}}
</view>
<view class="detail">
- <text>鐗╂枡鍚嶇О锛�</text>{{item['HName'] || ''}}
+ <text>{{ $t("Gy.HName") == "Gy.HName" ? "鐗╂枡鍚嶇О锛�" : $t("Gy.HName") }}</text>{{item['HName'] || ''}}
</view>
<view class="detail">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item['HModel'] || ''}}
+ <text>{{ $t("Gy.HModel") == "Gy.HModel" ? "瑙勬牸鍨嬪彿锛�" : $t("Gy.HModel") }}</text>{{item['HModel'] || ''}}
</view>
<view class="detail">
- <text>璁￠噺鍗曚綅锛�</text>{{barCodeInfo['璁￠噺鍗曚綅'] || ''}}
+ <text>{{ $t("Gy.HUnit") == "Gy.HUnit" ? "璁￠噺鍗曚綅锛�" : $t("Gy.HUnit") }}</text>{{barCodeInfo['璁￠噺鍗曚綅'] || ''}}
</view>
</uni-card>
</view>
</view>
</view>
- <view class="over" v-if="barCodeSplitInfo.length == 0">鏆傛棤鏁版嵁</view>
- <view class="over" v-if="barCodeSplitInfo.length != 0">宸插埌搴�</view>
+ <view class="over" v-if="barCodeSplitInfo.length == 0">{{ $t("BarCodeSplit2.noData") == "BarCodeSplit2.noData" ? "鏆傛棤鏁版嵁" : $t("BarCodeSplit2.noData") }}</view>
+ <view class="over" v-if="barCodeSplitInfo.length != 0">{{ $t("BarCodeSplit2.bottom") == "BarCodeSplit2.bottom" ? "宸插埌搴�" : $t("BarCodeSplit2.bottom") }}</view>
<view>
- <!-- 杈撳叆妗嗙ず渚� -->
<uni-popup ref="inputDialog" type="dialog">
- <uni-popup-dialog ref="inputClose" mode="input" title="璇疯緭鍏ユ媶鐮佹暟閲�" :value="dialogVal" placeholder="璇疯緭鍏ユ媶鐮佹暟閲�"
+ <uni-popup-dialog ref="inputClose" mode="input"
+ :title="$t('BarCodeSplit2.dialogTitle') == 'BarCodeSplit2.dialogTitle' ? '璇疯緭鍏ユ媶鐮佹暟閲�' : $t('BarCodeSplit2.dialogTitle')"
+ :value="dialogVal"
+ :placeholder="$t('BarCodeSplit2.dialogPlaceholder') == 'BarCodeSplit2.dialogPlaceholder' ? '璇疯緭鍏ユ媶鐮佹暟閲�' : $t('BarCodeSplit2.dialogPlaceholder')"
@confirm="dialogInputConfirm"></uni-popup-dialog>
</uni-popup>
</view>
@@ -155,11 +160,12 @@
barCodeSplitInfo: [],
dialogVal: 0,
itemCache: {},
- cantGenerate: true, // 鐢熸垚鎸夐挳鍒濆绂佺敤
- cantPrint: true, // 鎵撳嵃鎸夐挳鍒濆绂佺敤
- cantSplit: false, // 鎷嗙爜鎸夐挳鍒濆鍙敤
+ cantGenerate: true,
+ cantPrint: true,
+ cantSplit: false,
HBarCodeFocus: false,
- printInfo: "" //鎵撳嵃
+ printInfo: "",
+ isPrinting: false // 鎵撳嵃鐘舵��
};
},
components: {
@@ -168,7 +174,7 @@
methods: {
doRequest(url, data, resFunction, errFunction, method) {
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title: this.$t('BarCodeSplit2.loading') == 'BarCodeSplit2.loading' ? '鍔犺浇涓�...' : this.$t('BarCodeSplit2.loading')
})
uni.request({
method: method || "GET",
@@ -186,7 +192,7 @@
fail: (err) => {
uni.showToast({
icon: "error",
- title: "鎺ュ彛璁块棶寮傚父!",
+ title: this.$t('BarCodeSplit2.requestFailed') == 'BarCodeSplit2.requestFailed' ? '鎺ュ彛璁块棶寮傚父!' : this.$t('BarCodeSplit2.requestFailed'),
duration: 2000
})
if (typeof errFunction === 'function') {
@@ -208,7 +214,7 @@
} else {
innerAudioContext.src = '/static/jingbao.wav';
}
- innerAudioContext.play(); // 鎾斁闊抽
+ innerAudioContext.play();
},
//鍏夋爣
async refreshBarCodeState() {
@@ -229,9 +235,10 @@
`/Gy_BarCodeBillList/page?sWhere= and 鏉＄爜缂栧彿=''${this.barCodeInfoMeta.barCodeNo}''&user=${getUserInfo()["Czymc"]}&page=1&size=1`
.toString()
if (CommonUtils.isEmpty(this.barCodeInfoMeta.barCodeNo) == true) {
+ this.barCodeCall = false
return uni.showToast({
icon: "fail",
- title: "鏉＄爜缂栧彿涓嶈兘涓虹┖!"
+ title: this.$t('BarCodeSplit2.barCodeNoEmpty') == 'BarCodeSplit2.barCodeNoEmpty' ? '鏉＄爜缂栧彿涓嶈兘涓虹┖!' : this.$t('BarCodeSplit2.barCodeNoEmpty')
})
}
this.doRequest(
@@ -246,9 +253,10 @@
if (count > 0) {
this.barCodeInfo = data[0]
this.barCodeSplitInfo = []
- // 鎵弿鏉＄爜鍚庨噸缃寜閽姸鎬�
this.resetButtonState();
this.barCodeCall = false
+ } else {
+ this.barCodeCall = false
}
},
(err) => {
@@ -260,38 +268,29 @@
dialogInputConfirm(val) {
this.itemCache["HSplitNum"] = val
-
- // 鍏抽棴绐楀彛鍚庯紝鎭㈠榛樿鍐呭
this.$refs.inputDialog.close()
-
},
//鎷嗙爜鎸夐挳璋冪敤
async searchbarCodeInfoMeta() {
this.cantGenerate = true
this.cantPrint = true
- this.cantSplit = false // 鎷嗙爜鍓嶇‘淇濇媶鐮佹寜閽彲鐢�
+ this.cantSplit = false
if (CommonUtils.isEmpty(this.barCodeInfoMeta.barCodeNo) === true) {
return uni.showToast({
icon: 'none',
- title: '鏉＄爜缂栧彿涓嶅緱涓虹┖!'
+ title: this.$t('BarCodeSplit2.barCodeNoEmpty') == 'BarCodeSplit2.barCodeNoEmpty' ? '鏉＄爜缂栧彿涓嶅緱涓虹┖!' : this.$t('BarCodeSplit2.barCodeNoEmpty')
});
}
if (CommonUtils.isEmpty(this.barCodeInfoMeta.splitNum, true) === true) {
return uni.showToast({
icon: 'none',
- title: '鎷嗗垎鏁伴噺涓嶅緱涓虹┖!'
- });
- }
- if (CommonUtils.isEmpty(this.barCodeInfoMeta.splitNum, true) === true) {
- return uni.showToast({
- icon: 'none',
- title: '鎷嗗垎鏁伴噺涓嶅緱涓虹┖!'
+ title: this.$t('BarCodeSplit2.splitNumEmpty') == 'BarCodeSplit2.splitNumEmpty' ? '鎷嗗垎鏁伴噺涓嶅緱涓虹┖!' : this.$t('BarCodeSplit2.splitNumEmpty')
});
}
if (parseFloat(this.barCodeInfoMeta.splitNum) > parseFloat(this.barCodeInfo['鏁伴噺'])) {
return uni.showToast({
icon: 'none',
- title: '鎷嗗垎鏁伴噺涓嶈兘澶т簬鏉＄爜鍘熸暟閲�!'
+ title: this.$t('BarCodeSplit2.splitNumExceed') == 'BarCodeSplit2.splitNumExceed' ? '鎷嗗垎鏁伴噺涓嶈兘澶т簬鏉＄爜鍘熸暟閲�!' : this.$t('BarCodeSplit2.splitNumExceed')
});
}
this.doRequest(
@@ -305,13 +304,11 @@
if (res.data.data.length < 1) {
return uni.showToast({
icon: 'none',
- title: Message
+ title: res.data.Message || this.$t('BarCodeSplit2.noBillFound')
});
}
- //鎷嗗垎鏉＄爜锛氭暟閲忎负 splitNum
let barCodeItem1 = JSON.parse(JSON.stringify(res.data.data.SubBarCodes[0]));
- let HSplitNum = this.barCodeInfoMeta.splitNum;
this.barCodeSplitInfo.push({
HSplitNum: this.barCodeInfoMeta.splitNum,
HBarCode: res.data.data.NextBarCode,
@@ -320,17 +317,15 @@
HModel: barCodeItem1.HModel
});
- //鏇存柊鍘熷厛鏉＄爜鏁伴噺
this.barCodeInfo['鍓╀綑鏁伴噺'] = this.barCodeInfo['鏁伴噺'] - this.barCodeInfoMeta.splitNum;
- // 鎷嗙爜鎴愬姛锛岀鐢ㄦ媶鐮佹寜閽紝鏀惧紑鐢熸垚鎸夐挳
this.cantSplit = true;
this.cantGenerate = false;
this.cantPrint = true;
} else {
uni.showToast({
icon: 'none',
- title: '娌℃湁鎵惧埌瀵瑰簲鐨勫崟鎹�'
+ title: res.data.Message || this.$t('BarCodeSplit2.noBillFound')
});
}
},
@@ -341,7 +336,6 @@
},
//淇濆瓨鏂规硶
SaveBarCodeCreate() {
- // 鏍￠獙鎷嗙爜鏁伴噺
let sum = this.barCodeSplitInfo.reduce((acc, obj) => {
return acc + obj["HSplitNum"]
}, 0)
@@ -349,7 +343,7 @@
if (sum > this.barCodeInfo["HQty"]) {
return uni.showToast({
icon: 'none',
- title: '鎷嗙爜鏁伴噺鍜屼笉寰楀ぇ浜庢潯鐮佹暟閲�'
+ title: this.$t('BarCodeSplit2.sumExceed') == 'BarCodeSplit2.sumExceed' ? '鎷嗙爜鏁伴噺鍜屼笉寰楀ぇ浜庢潯鐮佹暟閲�' : this.$t('BarCodeSplit2.sumExceed')
});
}
let msg =
@@ -360,12 +354,11 @@
},
(res) => {
if (res.data.code == 1) {
- // 鐢熸垚鎴愬姛锛岀鐢ㄧ敓鎴愭寜閽紝鏀惧紑鎵撳嵃鎸夐挳
this.cantGenerate = true;
this.cantPrint = false;
this.cantSplit = true;
uni.showToast({
- title: '鐢熸垚鎴愬姛!'
+ title: this.$t('BarCodeSplit2.generateSuccess') == 'BarCodeSplit2.generateSuccess' ? '鐢熸垚鎴愬姛!' : this.$t('BarCodeSplit2.generateSuccess')
});
} else {
this.cantGenerate = false;
@@ -373,27 +366,23 @@
title: res.data.Message
});
}
-
},
(err) => {
console.err(err)
},
"POST"
)
-
},
//鎵撳嵃鎸夐挳
- // 鐖剁粍浠朵腑鐨勬墦鍗版柟娉�
async PrintHBarCode() {
if (this.$printer.isConnected() === false) {
this.$refs.labelPrinter.openPopup();
return;
}
- // 闃叉閲嶅鐐瑰嚮
if (this.isPrinting) {
uni.showToast({
- title: '鎵撳嵃涓紝璇风◢鍊�...',
+ title: this.$t('BarCodeSplit2.printingMessage') == 'BarCodeSplit2.printingMessage' ? '鎵撳嵃涓紝璇风◢鍊�...' : this.$t('BarCodeSplit2.printingMessage'),
icon: 'none'
});
return;
@@ -405,13 +394,11 @@
let HBarCodeNoStr = `${this.barCodeSplitInfo[0]['HBarCode']}`;
console.log('鑾峰彇鏁版嵁', HBarCodeNoStr);
- // 鏄剧ず鎵撳嵃涓姸鎬�
uni.showLoading({
- title: '鎵撳嵃涓�...',
+ title: this.$t('BarCodeSplit2.loadingPrint') == 'BarCodeSplit2.loadingPrint' ? '鎵撳嵃涓�...' : this.$t('BarCodeSplit2.loadingPrint'),
mask: true
});
- // 鑾峰彇鎵撳嵃鏁版嵁
const printData = await new Promise((resolve, reject) => {
uni.request({
url: this.serverUrl + '/Sc_BarCode/GetSplitBarCode_SubList',
@@ -422,17 +409,16 @@
if (res.data.count == 1) {
resolve(res.data.data[0]);
} else {
- reject(new Error(res.data.Message || '鏈壘鍒版墦鍗版暟鎹�'));
+ reject(new Error(res.data.Message || this.$t('BarCodeSplit2.printNoData')));
}
},
fail: (err) => {
- reject(new Error('鎺ュ彛璇锋眰澶辫触'));
+ reject(new Error(this.$t('BarCodeSplit2.requestFailed')));
}
});
});
const item = printData;
- // 鍑礉濂堢壒鎵撳嵃妯℃澘
this.printInfo = `! 0 200 200 400 1
PAGE-WIDTH 800
SETQRVER 2
@@ -464,24 +450,20 @@
console.log('printInfo: ', this.printInfo);
- // 绛夊緟鎵撳嵃缁勪欢鏇存柊
await this.$nextTick();
- // 鎵ц鎵撳嵃锛屽苟绛夊緟鎵撳嵃瀹屾垚
const printResult = await this.$refs.labelPrinter.execPrint();
console.log('鎵撳嵃缁撴灉:', printResult);
- // 鎵撳嵃鎴愬姛鍚庨噸缃姸鎬�
uni.hideLoading();
this.isPrinting = false;
uni.showToast({
- title: '鎵撳嵃瀹屾垚',
+ title: this.$t('BarCodeSplit2.printSuccess') == 'BarCodeSplit2.printSuccess' ? '鎵撳嵃瀹屾垚' : this.$t('BarCodeSplit2.printSuccess'),
icon: 'success',
duration: 2000
});
- // 鎾斁鎴愬姛鎻愮ず闊�
CommonUtils.playSound(1);
} catch (error) {
@@ -490,7 +472,7 @@
this.isPrinting = false;
uni.showToast({
- title: error.message || '鎵撳嵃澶辫触',
+ title: error.message || this.$t('BarCodeSplit2.printFailed'),
icon: 'error',
duration: 2000
});
@@ -501,28 +483,25 @@
var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
mpaasScanModule.mpaasScan({
'hideAlbum': true,
- 'timeoutInterval': '10', //瓒呮椂鏃堕棿
- 'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ 'timeoutInterval': '10',
+ 'timeoutText': this.$t('BarCodeSplit2.timeoutText') == 'BarCodeSplit2.timeoutText' ? '鏈瘑鍒埌浜岀淮鐮�' : this.$t('BarCodeSplit2.timeoutText')
}, (ret) => {
console.log(ret.resp_result)
if (this.CommonUtils.isEmpty(ret.resp_result) === false) {
console.log('鏉＄爜鍐呭锛�' + ret.resp_result);
this.barCodeInfoMeta.barCodeNo = ret.resp_result
-
this.searchbarCodeInfo()
}
})
},
- // 閲嶇疆鎸夐挳鐘舵�佹柟娉�
resetButtonState() {
- this.cantSplit = false; // 鎷嗙爜鎸夐挳鍙敤
- this.cantGenerate = true; // 鐢熸垚鎸夐挳绂佺敤
- this.cantPrint = true; // 鎵撳嵃鎸夐挳绂佺敤
+ this.cantSplit = false;
+ this.cantGenerate = true;
+ this.cantPrint = true;
}
},
onLoad() {
this.HBarCodeFocus = true;
- // 椤甸潰鍒濆鍖栨椂璁剧疆鎸夐挳鐘舵��
this.resetButtonState();
}
}
@@ -562,8 +541,6 @@
padding: 0 10rpx;
gap: 20rpx;
font-size: 30rpx;
- // height: 1.5rem;
- // justify-content: center;
align-items: center;
.left {
@@ -577,7 +554,6 @@
padding: 6rpx 0;
border-radius: 22rpx;
border: 1px solid #e4e4e4;
- //background-color: #e4e4e4;
>input {
height: auto;
diff --git a/pages/weixiujilu/mouldRepairRecordBill.vue b/pages/weixiujilu/mouldRepairRecordBill.vue
new file mode 100644
index 0000000..b6e167a
--- /dev/null
+++ b/pages/weixiujilu/mouldRepairRecordBill.vue
@@ -0,0 +1,1348 @@
+<template>
+ <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>
+
+ <view v-if="tabs == 0">
+ <view class="form-item">
+ <view class="title">妯″叿鏉＄爜</view>
+ <view class="right">
+ <input type="text" name="HBarCode" v-model="hform.HBarCode"
+ @confirm="getHBarCodeData(hform.HBarCode)" />
+ </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="righton" style="width: 350rpx;">
+ <input 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="right" v-show="showHMainSourceBillType">
+ <picker :range="arrayHMainSourceBillType"
+ @change="HMainSourceBillTypeChange">
+
+ <input disabled name="HMainSourceBillType" v-model="HMainSourceBillType"
+ placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ <view class="picker-overlay"></view>
+ </picker>
+ </view>
+ <view class="righton" v-show="!showHMainSourceBillType">
+ <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+ placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title required">鏁呴殰鐧昏鍗�</view>
+ <view class="right" v-show="hform.HMainSourceBillType != 1">
+ <input type="text" name="HBarCode" v-model="hform.HMainSourceBillNo" />
+ </view>
+ <view class="icon-wrapper" v-show="hform.HMainSourceBillType != 1"
+ :disabled="hform.HMainSourceBillType == -1">
+ <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+ </view>
+ <view class="righton" v-show="hform.HMainSourceBillType == 1">
+ <input type="text" disabled name="HBarCode" v-model="hform.HMainSourceBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨寮�濮�</view>
+ <view class="right">
+ <uni-datetime-picker type="datetime" v-model="hform.HRepairBeginDate">
+ <view style="font-size: 30rpx;">{{hform.HRepairBeginDate}}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨缁撴潫</view>
+ <view class="right">
+ <uni-datetime-picker type="datetime" v-model="hform.HRepairEndDate">
+ <view style="font-size: 30rpx;">{{hform.HRepairEndDate}}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨鍙楃悊鏃ユ湡</view>
+ <view class="right">
+ <uni-datetime-picker type="datetime" v-model="hform.HRepairAccepDate">
+ <view style="font-size: 30rpx;">{{hform.HRepairAccepDate}}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨鍐呭</view>
+ <view class="right">
+ <textarea v-model="hform.HRepairContent" style="height: 6em;" maxlength="2000"
+ placeholder="璇疯緭鍏ョ淮淇唴瀹�..." />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title required">璁″垝缁翠慨宸ユ椂</view>
+ <view class="right">
+ <input type="number" name="HPlanTimes" v-model="hform.HPlanTimes"
+ @focus="hform.HPlanTimes = ''" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title required">瀹為檯缁翠慨宸ユ椂</view>
+ <view class="right">
+ <input type="number" name="HTimes" v-model="hform.HTimes" @focus="hform.HTimes = ''" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�</view>
+ <view class="righton">
+ <input name="HInterID" disabled v-model="hform.HBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鏃ユ湡</view>
+ <view class="right">
+ <uni-datetime-picker type="datetime" v-model="hform.HDate">
+ <view style="font-size: 30rpx;">{{hform.HDate}}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title required">閮ㄩ棬</view>
+ <view class="right">
+ <uni-combox :candidates="DeptNameList" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+ @input="DeptChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title required">缁翠慨浜�</view>
+ <view class="right">
+ <uni-combox :candidates="EmpNameList" placeholder="璇烽�夋嫨鍙戠幇浜�" v-model="hform.HEmpName"
+ @input="EmpChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title required">璐熻矗浜�</view>
+ <view class="right">
+ <uni-combox :candidates="EmpNameList" placeholder="璇烽�夋嫨璐熻矗浜�" v-model="hform.HManagerName"
+ @input="ManagerChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title required">缁翠慨椤圭洰</view>
+ <view class="right">
+ <uni-combox :candidates="RepairNameNameList" placeholder="璇烽�夋嫨缁翠慨椤圭洰" v-model="hform.HRepairName"
+ @input="RepairNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨瑕佹眰</view>
+ <view class="right">
+ <textarea v-model="hform.HExplanation" style="height: 6em;" maxlength="2000"
+ placeholder="璇疯緭鍏ョ淮淇姹�..." />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">渚涘簲鍟�</view>
+ <view class="right">
+ <uni-combox :candidates="SupplierNameList" placeholder="璇烽�夋嫨渚涘簲鍟�" v-model="hform.HSupName"
+ @input="SupplierChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨绫诲瀷</view>
+ <view class="right">
+ <picker :range="arrayRepairType" v-model="hform.HRepairType" @change="HRepairTypeChange">
+
+ <input disabled name="HRepairType" v-model="hform.HRepairType" placeholder="璇烽�夋嫨缁翠慨绫诲瀷" />
+ <view class="picker-overlay"></view>
+ </picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨鍚庢柊瑙�</view>
+ <view class="right">
+ <textarea v-model="hform.HNewModel" style="height: 6em;" maxlength="2000"
+ placeholder="璇疯緭鍏ョ淮淇悗鏂拌..." />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鏂拌璁″鍛�</view>
+ <view class="right">
+ <input v-model="hform.HNewDesignLife"
+ placeholder="璇疯緭鍏ユ柊璁捐瀵垮懡..." />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍣ㄥ叿鍚嶇О</view>
+ <view class="righton">
+ <input disabled type="text" v-model="hform.HBarName" placeholder="璇疯緭鍏ュ櫒鍏峰悕绉�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍣ㄥ叿瑙勬牸</view>
+ <view class="righton">
+ <input disabled type="text" v-model="hform.HBarSpec" placeholder="璇疯緭鍏ュ櫒鍏疯鏍�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍣ㄥ叿鍨嬪彿</view>
+ <view class="righton">
+ <input disabled type="text" v-model="hform.HBarModel" placeholder="璇疯緭鍏ュ櫒鍏峰瀷鍙�" />
+ </view>
+ </view>
+ </view>
+
+ <view v-if="tabs == 1">
+ <view class="form-item">
+ <view class="title">鍒涘缓浜�:</view>
+ <view class="righton">
+ <input type="text" v-model="hform.HMaker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍒涘缓鏃ユ湡:</view>
+ <view class="righton">
+ <input type="text" v-model="hform.HMakeDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼浜�:</view>
+ <view class="righton">
+ <input type="text" v-model="hform.HUpDater" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼鏃ユ湡:</view>
+ <view class="righton">
+ <input type="text" v-model="hform.HUpDateDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳浜�:</view>
+ <view class="righton">
+ <input type="text" v-model="hform.HChecker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳鏃ユ湡:</view>
+ <view class="righton">
+ <input type="text" v-model="hform.HCheckDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾浜�:</view>
+ <view class="righton">
+ <input type="text" v-model="hform.HDeleteMan" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾鏃ユ湡:</view>
+ <view class="righton">
+ <input type="text" v-model="hform.HDeleteDate" disabled />
+ </view>
+ </view>
+ </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>
+ </view>
+ <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType"
+ :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
+ </BillListPopupMouldConkBookBillVue>
+ <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+ <BillListPopupMouldVue @BillSelectComplete="MouldBillHandler" ref="billListMould"></BillListPopupMouldVue>
+ </view>
+</template>
+<script>
+ import getDateTime from '@/utils/getdateTime.js';
+ import {
+ getUserInfo
+ } from "@/utils/auth.js";
+ import {
+ CommonUtils
+ } from '../../utils/common';
+ import {
+ getUserStockRelation
+ } from '../../utils/userRelationManager';
+ import BillListPopupMouldConkBookBillVue from '../../components/BillListPopup/BillListPopupMouldConkBookBill.vue';
+ import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+ import BillListPopupMouldVue from '../../components/BillListPopup/BillListPopup_Mould.vue';
+ import dayjs from 'dayjs';
+ export default {
+ components: {
+ BarCodePopupVue,
+ BillListPopupMouldConkBookBillVue,
+ BillListPopupMouldVue,
+ },
+
+ data() {
+ return {
+ HSourceBillNoFocus: false,
+ barCodeFocus: false,
+
+ userInfo: getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ HModName: 'Kf_POStockInBackBill_PDA',
+ ModRightName: 'CE_POStockInBack',
+ OperationType: 1,
+ HInterID_Temp: '',
+
+ showHStockPlaceName: false,
+ showHMainSourceBillType: true,
+ showHSourceBillNo: true,
+ reHSourceBillNo: true,
+ showHSupName: true,
+ barCodeFocus: false,
+
+ tabs: 0,
+ HMainSourceBillType: '鎵嬪伐褰曞叆',
+ arrayHMainSourceBillType: ['鎵嬪伐褰曞叆', '妯″叿鏁呴殰鐧昏鍗�'],
+ arrayHMainSourceBillTypeID: ['1', '3815'],
+ arrayRepairType: ["鍐呴儴缁翠慨", "濮斿缁翠慨"],
+
+ linterid: '',
+ HBillNo: '',
+ btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
+ showmore: false,
+
+
+ materMeta: [],
+ arrayHWHName: [], //浠撳簱
+ HWHNameList: [],
+ arrayHStockPlaceName: [], //浠撲綅
+ HStockPlaceNameList: [],
+ arrayHSourceBillNo: [], //婧愬崟鍗曞彿
+ HSourceBillNoList: [],
+
+ // 渚涘簲鍟嗗垪琛�
+ SupplierNameList: [],
+ SupplierList: [],
+ // 閮ㄩ棬鍒楄〃
+ DeptNameList: [],
+ DeptList: [],
+ // 鑱屽憳鍒楄〃(鍚屾椂浣滀负鍙戠幇浜哄拰璐熻矗浜虹殑鍙�夋嫨瀵硅薄)
+ EmpNameList: [],
+ EmpList: [],
+ // 缁翠慨椤圭洰
+ RepairNameNameList: [],
+ RepairNameList: [],
+
+ Materlist: [],
+ hform: {
+ "HBillType": 3807,
+ "HBarCode": "",
+ "HMainSourceBillType": "1",
+ "HMainSourceBillNo": "",
+ "HMainSourceInterID": "0",
+ "HMainSourceEntryID": "0",
+ "XDHList": "",
+ "HRepairBeginDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ "HRepairEndDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ "HRepairAccepDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ "HRepairContent": "",
+ "HPlanTimes": "0",
+ "HTimes": "0",
+ "HBillNo": "",
+ "HInterID": "0",
+ "HDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ "HDeptName": getUserInfo()["HDeptName"],
+ "HDeptID": getUserInfo()["HDeptID"],
+ "HEmpName": getUserInfo().HEmpName,
+ "HEmpID": getUserInfo().HEmpID,
+ "HManagerName": getUserInfo().HSecManager,
+ "HManagerID": getUserInfo().HSecManagerID,
+ "HRepairName": "",
+ "HRepairID": "0",
+ "HRepairList": "",
+ "HExplanation": "",
+ "HSupName": "",
+ "HSupID": "0",
+ "HSupIDList": "",
+ "HRepairType": "鍐呴儴缁翠慨",
+ "HNewModel": "",
+ "HNewDesignLife": "0",
+ "HBarName": "",
+ "HMouldID": "0",
+ "HBarSpec": "",
+ "HBarModel": "",
+ "HMaker": getUserInfo()['Czymc'],
+ "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ "HUpDater": "",
+ "HUpDateDate": "",
+ "HChecker": "",
+ "HCheckDate": "",
+ "HDeleteMan": "",
+ "HDeleteDate": "",
+ "toolbarDemo": "",
+ "xuhao": "",
+ "barDemo": "",
+ "lngBillKey": "",
+ "lngBillSubKey": "",
+ "HStockOrgID": uni.getStorageSync("OrganizationID")
+
+ }
+ }
+ },
+ computed: {},
+ onLoad(e) {
+ console.log(e, this.userInfo)
+ this.OperationType = e.OperationType
+ if (e.HInterID) {
+ this.HInterID_Temp = e.HInterID
+ // this.btnType = 1
+ this.RoadBillMain(e.HInterID)
+ this.barCodeFocus = true
+ } else {
+ this.getNewData()
+ this.HSourceBillNoFocus = true
+ }
+
+ this.InitDept()
+ this.InitEmp()
+ this.InitSupplier()
+ this.InitRepairName()
+ this.loadCache()
+ uni.$on('BillSelectComplete', (e) => {
+ console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
+ this.hform.HMainSourceInterID = e.HInterID
+ this.hform.HMainSourceBillNo = e.HBillNo
+ this.hform.HMainSourceEntryID = e.HEntryID
+ this.hform.HMouldID = e.HMouldID
+ this.hform.HBarName = e.HMouldName
+ this.hform.HBarSpec = e.HMouldSpec
+ this.hform.HBarModel = e.HMouldModel
+ this.$refs.billList.exit()
+ })
+ },
+ onUnload() {
+ uni.$off('BillSelectComplete')
+ },
+ methods: {
+ searchModule() {
+ this.$refs['billListMould'].showPopup()
+ },
+ MouldBillHandler(mould) {
+ if(!mould.enableMultiSourceBill){
+ let val = mould.val[0]
+ this.hform.HBarCode = val['鏉＄爜缂栧彿']
+ this.getHBarCodeData(this.hform.HBarCode)
+ }
+ this.$refs['billListMould'].exit()
+ },
+ // 缁翠慨椤圭洰
+ async InitRepairName() { // 鍒濆鍖栫淮淇」鐩�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/PublicPageMethod/Gy_RepairList_PDA',
+ data: {
+ sWhere: ''
+ }
+ })
+
+ let {
+ count,
+ data,
+ code,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.RepairNameList = data
+ this.RepairNameNameList = Array.from(data).map(elem => elem["HName"])
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: '缁翠慨椤圭洰鍒濆鍖栧け璐�: ' + Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: '缁翠慨椤圭洰鍒濆鍖栧け璐�: ' + err
+ })
+ }
+ },
+ RepairNameChange(elem) {
+ let index = this.RepairNameNameList.findIndex(e => e == elem)
+
+ if (index == -1) {
+ this.hform.HRepairName = ''
+ this.hform.HRepairID = 0
+ return
+ }
+
+ this.hform.HRepairName = this.RepairNameList[index]['HName']
+ this.hform.HRepairID = this.RepairNameList[index]['HItemID']
+ },
+ // 缁翠慨绫诲瀷 鏇存敼 鍙ユ焺
+ HRepairTypeChange(e) {
+ let index = e.detail.value
+ if (index == NaN || index == -1) {
+ this.hform.HRepairType = '鍐呴儴缁翠慨'
+ return
+ }
+ this.hform.HRepairType = this.arrayRepairType[index]
+ },
+ // 渚涘簲鍟�
+ async InitSupplier() { // 鍒濆鍖栦緵搴斿晢\
+ let HOtherOrgID = this.hform.HStockOrgID || 0
+
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/WEBSController/GetSupplierList_Json',
+ data: {
+ Supplier: '',
+ HStockOrgID: HOtherOrgID
+ }
+ })
+
+ let {
+ count,
+ data,
+ code,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.SupplierList = data
+ this.SupplierNameList = Array.from(data).map(elem => elem["HName"])
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: '渚涘簲鍟嗗垵濮嬪寲澶辫触: ' + Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: '渚涘簲鍟嗗垵濮嬪寲澶辫触: ' + err
+ })
+ }
+ },
+ SupplierChange(elem) { // 渚涘簲鍟嗘洿鏀� 鍙ユ焺
+ let index = this.SupplierNameList.findIndex(e => e == elem)
+
+ if (index == -1) {
+ this.hform.HSupName = ''
+ this.hform.HSupID = 0
+ return
+ }
+
+ this.hform.HSupName = this.SupplierList[index]['HName']
+ this.hform.HSupID = this.SupplierList[index]['HItemID']
+ },
+ // 閮ㄩ棬
+ async InitDept() { // 鍒濆鍖栭儴闂�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/PublicPageMethod/DeptList',
+ data: {
+ sWhere: 'where 1=1',
+ }
+ })
+ let {
+ count,
+ code,
+ Message,
+ data
+ } = res.data
+ if (count == 1) {
+ this.DeptList = data
+ this.DeptNameList = Array.from(data).map(elem => elem['HName'])
+ } else {
+ CommonUtils.showTips({
+ title: '閿欒鎻愮ず',
+ message: "鍒濆鍖栭儴闂ㄩ敊璇�: " + Message,
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '閿欒鎻愮ず',
+ message: "鍒濆鍖栭儴闂ㄩ敊璇�: " + err,
+ })
+ }
+ },
+ DeptChange(elem) { // 閮ㄩ棬鏀瑰彉 鍙ユ焺
+ let index = this.DeptNameList.findIndex(e => e == elem)
+
+ if (index == -1) {
+ this.hform.HDeptName = ''
+ this.hform.HDeptID = 0
+ return
+ }
+
+ this.hform.HDeptName = this.DeptList[index]['HName']
+ this.hform.HDeptID = this.DeptList[index]['HItemID']
+ },
+ // 鑱屽憳
+ async InitEmp() { // 鍒濆鍖栬亴鍛�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Web/GetEmployeeList_Json',
+ data: {
+ Employee: '',
+ HGroupID: 0,
+ }
+ })
+ let {
+ count,
+ code,
+ Message,
+ data
+ } = res.data
+ if (count == 1) {
+ this.EmpList = data
+ this.EmpNameList = Array.from(data).map(elem => elem['HName'])
+ } else {
+ CommonUtils.showTips({
+ title: '閿欒鎻愮ず',
+ message: "鍒濆鍖栬亴鍛橀敊璇�: " + Message,
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '閿欒鎻愮ず',
+ message: "鍒濆鍖栬亴鍛橀敊璇�: " + err,
+ })
+ }
+ },
+ EmpChange(elem) { // 缁翠慨浜烘洿鏀�
+ let index = this.EmpNameList.findIndex(e => e == elem)
+
+ if (index == -1) {
+ this.hform.HEmpName = ''
+ this.hform.HEmpID = 0
+ return
+ }
+
+ this.hform.HEmpName = this.EmpList[index]['HName']
+ this.hform.HEmpID = this.EmpList[index]['HItemID']
+ },
+ ManagerChange(elem) { // 璐熻矗浜烘洿鏀�
+ let index = this.EmpNameList.findIndex(e => e == elem)
+
+ if (index == -1) {
+ this.hform.HManagerName = ''
+ this.hform.HManagerID = 0
+ return
+ }
+
+ this.hform.HManagerName = this.EmpList[index]['HName']
+ this.hform.HManagerID = this.EmpList[index]['HItemID']
+ },
+
+
+ async qrCodeDisplay() {
+ try {
+ this.$refs.barcodePopup.setCodeInfo(this.hform.HBillNo)
+ await this.$nextTick()
+ this.$refs.barcodePopup.open()
+ } catch (err) {
+ uni.showToast({
+ icon: 'none',
+ title: err
+ })
+ }
+ },
+ async getRelationStore() {
+ let {
+ data,
+ count
+ } = await getUserStockRelation()
+ if (count == 1) {
+ let WHIDList = []
+
+ Array.from(data).forEach(elem => {
+ WHIDList.push(elem.HItemID)
+ })
+
+ let sWhere = ` and HItemID in (${WHIDList.join(",")})`
+ this.getHBaseList({
+ sWhere: sWhere
+ })
+
+ } else {
+ this.getHBaseList()
+ }
+ },
+ showBillList() {
+ this.$refs.billList.showPopup()
+ },
+ async refreshHSourceBillState() {
+ this.HSourceBillNoFocus = false
+ await this.$nextTick(() => {
+ this.hform.HSourceBillNo = ""
+ this.HSourceBillNoFocus = true
+
+ })
+ },
+ async refreshBarCodeState() {
+ this.barCodeFocus = false
+ await this.$nextTick(() => {
+ this.hform.HBarCode = ""
+ this.barCodeFocus = true
+ })
+ },
+ playSound(e) {
+ const innerAudioContext = uni.createInnerAudioContext();
+ if (e == 1) {
+ innerAudioContext.src = '/static/success.wav';
+ } else {
+ innerAudioContext.src = '/static/jingbao.wav';
+ }
+ innerAudioContext.play(); // 鎾斁闊抽
+ },
+ onSourceBillBlurHandler() {
+ if (this.hform.HMainSourceBillType == -1) {
+ CommonUtils.playSound(1)
+ this.barCodeFocus = true
+ return
+ }
+ let inputVal = ''
+ if (this.$refs.uniComboxSourceBill) {
+ inputVal = this.$refs.uniComboxSourceBill.inputVal || this.hform.HSourceBillNo
+ } else {
+ inputVal = this.hform.HSourceBillNo
+ }
+ if (inputVal == '') {
+ CommonUtils.playSound(0)
+ return uni.showToast({
+ icon: 'none',
+ Message: '婧愬崟鍗曞彿涓嶅緱涓虹┖...'
+ })
+ }
+ this.getHBarCodeData(inputVal)
+ },
+ //鎵爜
+ toScanCode() {
+ var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+ mpaasScanModule.mpaasScan({
+ 'hideAlbum': true,
+ 'timeoutInterval': '10', //瓒呮椂鏃堕棿
+ 'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ }, (ret) => {
+ console.log(ret.resp_result)
+ if (this.hform.HBarCode == '*') {
+ this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+ } else {
+ this.hform.HBarCode = ret.resp_result
+ }
+
+ this.getHBarCodeData(this.hform.HBarCode)
+ })
+ },
+ //鏃ユ湡
+ HDateChange(e) {
+ console.log(e.detail.value)
+ this.hform.HDate = e.detail.value
+ },
+ //閫夋嫨婧愬崟绫诲瀷
+ HMainSourceBillTypeChange(e) {
+ if (e.detail.value == -1 || e.detail.value == NaN) {
+ this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+ this.hform.HMainSourceBillType = -1
+ return
+ }
+ console.log(e.detail.value)
+ console.log(e)
+ this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+ this.hform.HMainSourceBillType = this.arrayHMainSourceBillTypeID[e.detail.value]
+ const pages = getCurrentPages()
+ // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+ const currentPage = pages[pages.length - 1]
+ // 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
+ uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
+ HSourceBillTypeName: this.HMainSourceBillType,
+ HSourceBillType: this.hform.HMainSourceBillType
+ })
+ },
+ // 璇诲彇缂撳瓨
+ loadCache() {
+ const pages = getCurrentPages()
+ // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+ const currentPage = pages[pages.length - 1]
+ let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
+ if (HBillTypeCache) {
+ this.HMainSourceBillType = HBillTypeCache.HSourceBillTypeName
+ this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
+ }
+ },
+ // 鎵弿妯″叿鏉＄爜
+ async getHBarCodeData(HBarCode) {
+ if (!HBarCode) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: '鏉＄爜涓嶈兘涓虹┖'
+ })
+ return;
+ }
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/QJ_PDA_MouldDotCheckBill/txtHBarCode_KeyDown',
+ data: {
+ HBarCode: HBarCode
+ }
+ })
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.hform.HMouldID = data[0].HInterID;
+ this.hform.HBarName = data[0].HName;
+ this.hform.HBarSpec = data[0].HModels;
+ this.hform.HBarModel = data[0].HModel2;
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: err
+ })
+ }
+
+
+ },
+ //鐗╂枡淇℃伅
+ DisBillEntryList() {
+ uni.request({
+ url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json',
+ data: {
+ HInterID: this.hform.HInterID,
+ HBillNo: this.hform.HBillNo,
+ HBillType: this.hform.HBillType,
+ HStockOrgID: this.hform.HStockOrgID
+ },
+ success: (res) => {
+ console.log('鐗╂枡', res.data)
+ if (res.data.count == 1) {
+ var data = res.data.data
+ this.materMeta = data.BarCodeDetailslist
+ this.Materlist = data.Materlist
+ if (/鍏磋揪/.test(uni.getStorageSync("Organization"))) {
+ // 鍏磋揪瀹㈡埛 甯﹀嚭 浠撳簱
+ console.log("鍏磋揪甯﹀嚭榛樿浠撳簱")
+ this.HWHNameChange(data.BarCodeDetailslist[0].HWHName)
+ }
+
+
+ if (!data.BarCodeDetailslist[0].HBarCode) {
+ this.hform.HMaterName_B = ''
+ this.hform.HMaterModel_B = ''
+ this.hform.HBatchNo_B = ''
+ this.hform.HUnitName_B = ''
+ this.hform.HQty_B = ''
+ this.hform.HTMQty_B = ''
+ this.hform.HWHName_B = ''
+ this.hform.HSPName_B = ''
+ } else {
+ this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
+ this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
+ this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
+ this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
+ this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
+ this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
+ this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
+ this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
+ }
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //鍒犻櫎鐗╂枡鐮�
+ delMater(item) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+ success: (res) => {
+ if (res.confirm) {
+ uni.request({
+ url: this.serverUrl +
+ '/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json',
+ data: {
+ HInterID: this.hform.HInterID,
+ HMaterID: item.HMaterID,
+ HAuxPropID: item.HAuxPropID,
+ HMTONo: item.HMTONo,
+ HSourceInterID: item.HSourceInterID,
+ HSourceEntryID: item.HSourceEntryID,
+ HBillType: this.hform.HBillType
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.DisBillEntryList()
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ }
+ }
+ });
+ },
+ // 鏂板鍥炶皟
+ addNew() {
+ uni.redirectTo({
+ url: '/pages/weixiujilu/mouldRepairRecordBill?OperationType=1'
+ })
+ },
+ //鏂板
+ getNewData() {
+ uni.request({
+ url: this.serverUrl + '/Web/GetMAXNum',
+ data: {
+ HBillType: this.hform.HBillType
+ },
+ success: (res) => {
+ // console.log(res.data)
+ if (res.data.count == 1) {
+ this.hform.HInterID = 0
+ this.hform.HBillNo = res.data.data[0].HBillNo
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //淇敼鍥炲～鏁版嵁
+ RoadBillMain(HInterID) {
+ uni.request({
+ url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json',
+ data: {
+ HInterID: HInterID,
+ HBillType: this.hform.HBillType
+ },
+ success: (res) => {
+ console.log(33, res.data.data[0]);
+ if (res.data.count == 1) {
+ var data = res.data.data[0]
+ this.hform.HInterID = data.HInterID
+ this.hform.HBillNo = data.HBillNo
+ this.hform.HMainSourceBillType = data.HSourceBillType
+ this.hform.HSourceBillNo = data.HSourceBillNo
+ if (data.HSourceBillType == 1105) {
+ this.hform.HMainSourceBillType = 1105
+ this.HMainSourceBillType = '閫�鏂欓�氱煡鍗�'
+ this.showHSupName = false
+ } else if (data.HSourceBillType == 1102) {
+ this.hform.HMainSourceBillType = 1102
+ this.HMainSourceBillType = '閲囪喘璁㈠崟'
+ this.showHSupName = false
+ } else if (data.HSourceBillType == 1201) {
+ this.hform.HMainSourceBillType = 1201
+ this.HMainSourceBillType = '閲囪喘鍏ュ簱鍗�'
+ this.showHSupName = false
+ } else {
+ this.hform.HMainSourceBillType = -1
+ this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+ }
+ this.showHMainSourceBillType = false
+
+ //闈炲婧愬崟妯″紡
+ if (data.HMulSourceBill == 0) {
+ this.showHSourceBillNo = false
+ }
+ this.hform.HDeptID = data.HDeptID
+ this.hform.HDeptName = data.HDeptName
+ this.hform.HSupID = data.HCusID
+ this.hform.HSupName = data.HSupName
+ this.DisBillEntryList()
+ this.tabs = 2
+ } else {
+ uni.showToast({
+ title: '鑾峰彇鏁版嵁鍥炲～澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ checkBillValidate() {
+ let message = ''
+
+ if (!this.hform.HMainSourceBillNo && this.hform.HMainSourceBillType != '1') {
+ message = '鏈～鍐欐晠闅滅櫥璁板崟'
+ } else if (!this.hform.HDeptName) {
+ message = '鏈～鍐欓儴闂�'
+ } else if (!this.hform.HEmpName) {
+ message = '鏈～鍐欑淮淇汉浜�'
+ } else if (!this.hform.HManagerName) {
+ message = '鏈～鍐欒礋璐ｄ汉'
+ } else if (!this.hform.HRepairName) {
+ message = '鏈～鍐欑淮淇」鐩�'
+ }
+
+ if (!message) {
+ return true
+ }
+
+ CommonUtils.showTips({
+ message: message
+ })
+ return false
+ },
+ async submit() {
+ if (!this.checkBillValidate()) {
+ return
+ }
+ let oMain = JSON.stringify(this.hform)
+ let sSubStr = JSON.stringify(
+ [{
+ "HRepairID": this.hform.HRepairID,
+ "HRepairCode": "",
+ "HRepairName": "",
+ "HManagerID": this.hform.HManagerID,
+ "HManagerCode": "",
+ "HManagerName": "",
+ "HRepairExplanation": this.hform.HExplanation,
+ "HRemark": "",
+ "HMoney": 0,
+ "HSourceInterID": this.hform.HMainSourceInterID,
+ "HSourceEntryID": this.hform.HMainSourceEntryID,
+ "HSourceBillNo": this.hform.HMainSourceBillNo
+ }]
+ )
+ let sMainSub = `${oMain};${sSubStr};${getUserInfo()["Czymc"]};`
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: '/Sb_MouldRepairWorkBill/SaveGetMouldRepairWorkBill_PDA',
+ data: {
+ "msg": sMainSub
+ },
+ method: 'POST'
+ })
+
+ if (!res) {
+ return
+ }
+ let {
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: '/pages/weixiujilu/mouldRepairRecordBill?OperationType=1'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ // setTimeout(() => {
+ // uni.navigateBack();
+ // }, 50)
+ }
+ }
+ });
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: err
+ })
+ this.EnableSave = true
+ }
+ },
+
+ goBack() {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.navigateBack()
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
+ });
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .page {
+ height: auto;
+ }
+
+ .form {
+ width: 668rpx;
+ padding: 0rpx 20rpx;
+ padding-bottom: 240rpx;
+ }
+
+ .tab_area {
+ width: 100%;
+ height: 50rpx;
+ }
+
+ .other {
+ margin-top: 8rpx;
+ text-align: center;
+ font-size: 28rpx;
+ padding: 4rpx 18rpx;
+ color: #1890FF;
+ }
+
+ .tabs {
+ width: 100%;
+ display: flex;
+ border-bottom: 1px solid #ddd;
+ margin: 20rpx 0;
+
+ view {
+ width: 25%;
+ font-size: 30rpx;
+ color: #555;
+ text-align: center;
+ padding: 16rpx 0;
+ }
+
+ .on {
+ color: #3a78ff;
+ font-weight: bold;
+ border-bottom: 3px solid #3a78ff;
+ }
+ }
+
+ .form-item {
+ display: flex;
+ align-items: center;
+ font-size: inherit;
+ padding: 6rpx 0;
+ gap: 12rpx;
+
+ .title {
+ width: 200rpx;
+ font-size: 30rpx;
+
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
+
+ .right {
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ position: relative;
+ padding: 8rpx 16rpx;
+ display: flex;
+
+ picker {
+ width: 100%;
+ }
+
+ .uni-combox {
+ width: 100%;
+ padding: 0;
+
+ ::v-deep .uni-combox__input {
+ font-size: 30rpx;
+ height: auto;
+ }
+ }
+ }
+
+ .righton {
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ padding: 8rpx 16rpx;
+ }
+
+ input {
+ width: 100%;
+ font-size: 30rpx;
+ }
+
+ textarea {
+ width: 98%;
+ font-size: 30rpx;
+ }
+
+ }
+
+ .bottom-btn {
+ width: 100%;
+ box-sizing: border-box;
+ // 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 40rpx 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-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #acacac;
+ color: #fff;
+ // position: absolute;
+ // right: 120rpx;
+ }
+
+ .btn-d {
+ background-color: #ff8901;
+ color: #fff;
+ }
+ }
+
+ .list {
+ width: 100%;
+
+ .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;
+ }
+ }
+ }
+
+ .more {
+ color: #888;
+ font-size: 24rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ text-align: center;
+ }
+ }
+ }
+
+ .icon-wrapper {
+ background-color: #3A78FF;
+ width: 52rpx;
+ height: 52rpx;
+ border-radius: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ .uni-icons {
+ color: #fff !important;
+ }
+ }
+
+ .required {
+ position: relative;
+
+ }
+
+ .required::after {
+ content: "*";
+ position: relative;
+ color: red;
+ left: 0;
+ top: 0;
+ font-size: inherit;
+ }
+
+ .icon-wrapper[disabled] {
+ background-color: rgba(228, 228, 228, 1);
+ pointer-events: none;
+ touch-action: none;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/weixiujilu/mouldRepairRecordBillList.vue b/pages/weixiujilu/mouldRepairRecordBillList.vue
new file mode 100644
index 0000000..694bd21
--- /dev/null
+++ b/pages/weixiujilu/mouldRepairRecordBillList.vue
@@ -0,0 +1,587 @@
+<template>
+ <view class="page" id="pageContent">
+ <view class="search-condition-zone">
+ <view class="form-item">
+ <view class="left">
+ 鏃ユ湡:
+ </view>
+ <view class="daterange" style="flex: 1;">
+ <view class="right general">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
+ <view>{{hform.HBeginDate}}</view>
+ </uni-datetime-picker>
+ </view>
+ <view>鈥�</view>
+ <view class="right general">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HEndDate">
+ <view>{{hform.HEndDate}}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">
+ 鍣ㄥ叿缂栫爜:
+ </view>
+ <view class="right general">
+ <input type="text" v-model="hform.HMoNumber" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">
+ 鍣ㄥ叿鍚嶇О:
+ </view>
+ <view class="right general">
+ <input type="text" v-model="hform.HMoName" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">
+ 鍗曟嵁鍙�:
+ </view>
+ <view class="right general">
+ <input type="text" v-model="hform.HBillNo" />
+ </view>
+ </view>
+ </view>
+ <view class="button-zone">
+ <button type="default" class="btn-a" size="mini" @tap="cmdAdd">鏂板</button>
+ <button type="default" class="btn-a" size="mini" @tap="cmdSearch">鏌ヨ</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="card-item" v-for="(item, index) in listDataShow">
+ <uni-card :title="item['鍗曟嵁鍙�']" :extra="'鏃ユ湡:' + item['鏃ユ湡'].split('T')[0]"
+ @tap="showDetail = showDetail==index?-1:index">
+ <view class="card-detail">
+ <view class="detail" v-if="item['浜у搧妯″叿浠ｇ爜']">
+ <text>浜у搧鍣ㄥ叿浠ｇ爜锛�</text>{{item['浜у搧妯″叿浠ｇ爜']}}
+ </view>
+ <view class="detail" v-if="item['浜у搧妯″叿']">
+ <text>浜у搧鍣ㄥ叿锛�</text>{{item['浜у搧妯″叿']}}
+ </view>
+ <view class="detail" v-if="item['璁惧浠ｇ爜']">
+ <text>璁惧浠ｇ爜锛�</text>{{item['璁惧浠ｇ爜']}}
+ </view>
+ <view class="detail" v-if="item['璁惧']">
+ <text>璁惧锛�</text>{{item['璁惧']}}
+ </view>
+ <view class="detail" v-if="item['缁翠慨椤圭洰浠ｇ爜']">
+ <text>缁翠慨椤圭洰浠ｇ爜锛�</text>{{item['缁翠慨椤圭洰浠ｇ爜']}}
+ </view>
+ <view class="detail" v-if="item['缁翠慨椤圭洰']">
+ <text>缁翠慨椤圭洰锛�</text>{{item['缁翠慨椤圭洰']}}
+ </view>
+ <view class="detail" v-if="item['缁翠慨寮�濮嬫棩鏈�']">
+ <text>缁翠慨寮�濮嬫棩鏈燂細</text>{{item['缁翠慨寮�濮嬫棩鏈�'].split("T")[0]}}
+ </view>
+ <view class="detail" v-if="item['缁翠慨缁撴潫鏃ユ湡']">
+ <text>缁翠慨缁撴潫鏃ユ湡锛�</text>{{item['缁翠慨缁撴潫鏃ユ湡'].split("T")[0]}}
+ </view>
+ <view class="detail" v-if="item['缁翠慨鍐呭']">
+ <text>缁翠慨鍐呭锛�</text>{{item['缁翠慨鍐呭']}}
+ </view>
+
+ </view>
+ <view class="card-detail" v-if="showDetail == index">
+ <view class="detail" v-if="item['鏃堕棿鍗曚綅']">
+ <text>鏃堕棿鍗曚綅锛�</text>{{item['鏃堕棿鍗曚綅']}}
+ </view>
+ <view class="detail" v-if="item['璁″垝缁翠慨宸ユ椂']">
+ <text>璁″垝缁翠慨宸ユ椂锛�</text>{{item['璁″垝缁翠慨宸ユ椂']}}
+ </view>
+ <view class="detail" v-if="item['瀹為檯缁翠慨宸ユ椂']">
+ <text>瀹為檯缁翠慨宸ユ椂锛�</text>{{item['瀹為檯缁翠慨宸ユ椂']}}
+ </view>
+ <view class="detail" v-if="item['缁翠慨浜轰唬鐮�']">
+ <text>缁翠慨浜轰唬鐮侊細</text>{{item['缁翠慨浜轰唬鐮�']}}
+ </view>
+ <view class="detail" v-if="item['缁翠慨浜�']">
+ <text>缁翠慨浜猴細</text>{{item['缁翠慨浜�']}}
+ </view>
+ <view class="detail" v-if="item['璐熻矗浜轰唬鐮�']">
+ <text>璐熻矗浜轰唬鐮侊細</text>{{item['璐熻矗浜轰唬鐮�']}}
+ </view>
+ <view class="detail" v-if="item['璐熻矗浜�']">
+ <text>璐熻矗浜猴細</text>{{item['璐熻矗浜�']}}
+ </view>
+ <view class="detail" v-if="item['缁翠慨閮ㄩ棬浠ｇ爜']">
+ <text>缁翠慨閮ㄩ棬浠ｇ爜锛�</text>{{item['缁翠慨閮ㄩ棬浠ｇ爜']}}
+ </view>
+ <view class="detail" v-if="item['缁翠慨閮ㄩ棬']">
+ <text>缁翠慨閮ㄩ棬锛�</text>{{item['缁翠慨閮ㄩ棬']}}
+ </view>
+ <view class="detail" v-if="item['渚涘簲鍟嗕唬鐮�']">
+ <text>渚涘簲鍟嗕唬鐮侊細</text>{{item['渚涘簲鍟嗕唬鐮�']}}
+ </view>
+ <view class="detail" v-if="item['渚涘簲鍟�']">
+ <text>渚涘簲鍟嗭細</text>{{item['渚涘簲鍟�']}}
+ </view>
+ <view class="detail" v-if="item['缁翠慨绫诲瀷']">
+ <text>缁翠慨绫诲瀷锛�</text>{{item['缁翠慨绫诲瀷']}}
+ </view>
+ <view class="detail" v-if="item['缁翠慨鍚庢柊瑙勬牸']">
+ <text>缁翠慨鍚庢柊瑙勬牸锛�</text>{{item['缁翠慨鍚庢柊瑙勬牸']}}
+ </view>
+ <view class="detail" v-if="item['鏂拌璁″鍛�']">
+ <text>鏂拌璁″鍛斤細</text>{{item['鏂拌璁″鍛�']}}
+ </view>
+ <view class="detail" v-if="item['缁翠慨瑕佹眰']">
+ <text>缁翠慨瑕佹眰锛�</text>{{item['缁翠慨瑕佹眰']}}
+ </view>
+ <view class="detail" v-if="item['鍐呴儴鍗曟嵁鍙�']">
+ <text>鍐呴儴鍗曟嵁鍙凤細</text>{{item['鍐呴儴鍗曟嵁鍙�']}}
+ </view>
+ <view class="detail" v-if="item['鍒跺崟浜�']">
+ <text>鍒跺崟浜猴細</text>{{item['鍒跺崟浜�']}}
+ </view>
+ <view class="detail" v-if="item['鍒跺崟鏃ユ湡']">
+ <text>鍒跺崟鏃ユ湡锛�</text>{{item['鍒跺崟鏃ユ湡'].split("T")[0]}}
+ </view>
+ <view class="detail" v-if="item['瀹℃牳浜�']">
+ <text>瀹℃牳浜猴細</text>{{item['瀹℃牳浜�']}}
+ </view>
+ <view class="detail" v-if="item['瀹℃牳鏃ユ湡']">
+ <text>瀹℃牳鏃ユ湡锛�</text>{{item['瀹℃牳鏃ユ湡'].split("T")[0]}}
+ </view>
+ <view class="detail" v-if="item['淇敼浜�']">
+ <text>淇敼浜猴細</text>{{item['淇敼浜�']}}
+ </view>
+ <view class="detail" v-if="item['淇敼鏃ユ湡']">
+ <text>淇敼鏃ユ湡锛�</text>{{item['淇敼鏃ユ湡'].split("T")[0]}}
+ </view>
+ <view class="detail" v-if="item['婧愬崟鍗曞彿']">
+ <text>婧愬崟鍗曞彿锛�</text>{{item['婧愬崟鍗曞彿']}}
+ </view>
+ <view class="detail" v-if="item['婧愬崟绫诲瀷']">
+ <text>婧愬崟绫诲瀷锛�</text>{{item['婧愬崟绫诲瀷']}}
+ </view>
+ </view>
+ <view class="more" v-if="showDetail == index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="more" v-if="showDetail != index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="op" v-if="operations == index">
+ <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+ <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="listDataShow.length == 0">鏆傛棤鏁版嵁</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'
+ import dayjs, {
+ Dayjs
+ } from 'dayjs'
+ export default {
+ data() {
+ return {
+ navHeight: 0,
+ scrollTop: 0,
+
+ showDetail: -1,
+ operations: -1,
+
+ hform: {
+ HBeginDate: dayjs(new Date).subtract(30, 'd').format('YYYY-MM-DD'),
+ HEndDate: dayjs(new Date).format('YYYY-MM-DD'),
+ HMoNumber: '',
+ HMoName: '',
+ HBillNo: ''
+ },
+
+ 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()
+ },
+ cmdAdd() {
+ uni.navigateTo({
+ url: "/pages/weixiujilu/mouldRepairRecordBill?operationType=1"
+ })
+ },
+ async cmdSearch() {
+ let sWhere = ''
+ if (this.hform.HBeginDate != "" && this.hform.HEndDate != "") {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) between '" + this.hform.HBeginDate + "' and '" +
+ this.hform.HEndDate + "' ";
+ }
+ if (this.hform.HMoNumber != "") {
+ sWhere += " and 浜у搧妯″叿浠ｇ爜 like '%" + this.hform.HMoNumber + "%'"
+ }
+ if (this.hform.HMoName != "") {
+ sWhere += " and 浜у搧妯″叿 like '%" + this.hform.HMoName + "%'"
+ }
+ if (this.hform.HBillNo != "") {
+ sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'"
+ }
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: '/Sb_MouldRepairWorkBill/GetMouldRepairWorkBill_PDA',
+ data: {
+ "sWhere": sWhere,
+ "user": getUserInfo()["Czymc"]
+ },
+ })
+
+ if (!res) {
+ return
+ }
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count > 0) {
+ this.listData = data
+ this.paginationMeta.total = data.length
+ this.onPaginationChangeHandler({
+ current: 1
+ })
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ } catch (err) {
+ console.warn(err);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触:' + err,
+ icon: 'none'
+ })
+ }
+ },
+ async onPaginationChangeHandler({
+ current
+ }) {
+ this.listDataShow =
+ this.listData.slice((current - 1) * this.paginationMeta.pageSize,
+ current * this.paginationMeta.pageSize)
+
+ },
+ async del(item) {
+ console.log("delItem: ", item);
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+ success: async (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: '/Sb_MouldRepairWorkBill/DeltetMouldRepairWorkBill',
+ data: {
+ "HInterID": item.hmainid,
+ "user": getUserInfo()["Czymc"]
+ }
+ })
+
+ if (!res) {
+ return
+ }
+
+ let {
+ count,
+ code,
+ Message
+ } = res.data
+ if (count == 0) {
+ return uni.showModal({
+ title: '閿欒鎻愮ず',
+ content: `鍒犻櫎閿欒: ${Message}`,
+ showCancel: false
+ })
+ }
+ uni.showToast({
+ title: '鍒犻櫎鎴愬姛',
+ icon: 'none'
+ })
+ this.cmdSearch()
+ } catch (err) {
+ uni.showModal({
+ title: '閿欒鎻愮ず',
+ content: `鎺ュ彛璇锋眰澶辫触: ${err}`,
+ showCancel: false
+ })
+ }
+ }
+ },
+ })
+
+
+ },
+ edit(item) {
+ console.log("editItem:", item)
+ uni.navigateTo({
+ url: `/pages/weixiujilu/mouldRepairRecordBill?operationType=2&linterid=${item.hmainid}&hsubid=${item.hsubid}`
+ })
+ }
+ },
+ onLoad() {
+
+ this.$nextTick(() => {
+ this.cmdSearch()
+ })
+ },
+ onReady() {
+ // #ifndef MP-WEIXIN
+ let query = uni.createSelectorQuery().in(this)
+ query.select("#scroll-content").boundingClientRect((data) => {
+ this.pageMeta.scrollContentTop = data.top
+ }).exec()
+ query.select("#pagination-zone").boundingClientRect((data) => {
+ this.pageMeta.bottomBtnTop = data.top
+ }).exec()
+ // #endif
+ // #ifdef MP-WEIXIN
+ // 寰俊涓嶆敮鎸� uni.createSelectorQuery().in(this)
+ // #endif
+
+ },
+ }
+</script>
+
+<style lang="scss" scoped>
+ .page {
+ box-sizing: border-box;
+ display: flex;
+ flex-direction: column;
+ gap: 20rpx;
+ 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;
+ }
+ }
+ }
+ }
+ }
+
+ .daterange {
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: center;
+ align-items: center;
+ }
+
+ .more {
+ color: #888;
+ font-size: 24rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ text-align: center;
+ }
+ }
+
+ .op {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 20rpx;
+
+ button {
+ padding: 0;
+ width: 150rpx;
+ font-size: 25rpx;
+ }
+
+ .op1 {
+ border: 1px solid #41a863;
+ color: #41a863;
+ }
+
+ .op2 {
+ border: 1px solid #d98d00;
+ color: #d98d00;
+ }
+
+ .op3 {
+ border: 1px solid #3a78ff;
+ color: #3a78ff;
+ }
+
+ .op4 {
+ border: 1px solid #da0000;
+ color: #da0000;
+ }
+
+ .op5 {
+ border: 1px solid #888;
+ color: #888;
+ }
+ }
+
+ .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: 20rpx 40rpx 20rpx 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/xiaoshouchuku/SellOutBill.vue b/pages/xiaoshouchuku/SellOutBill.vue
index 650f4b7..d9129c8 100644
--- a/pages/xiaoshouchuku/SellOutBill.vue
+++ b/pages/xiaoshouchuku/SellOutBill.vue
@@ -2,9 +2,9 @@
<view>
<view class="form">
<view class="form-item">
- <view class="title">鏉＄爜:</view>
+ <view class="title">{{ $t("SellOutBill_PDA.BarCode") == "SellOutBill_PDA.BarCode" ? "鏉＄爜" : $t("SellOutBill_PDA.BarCode") }}:</view>
<view class="right" style="width: 380rpx;">
- <input :focus="BarCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜"
+ <input :focus="BarCodeFocus" v-model="hform.HBarCode" :placeholder="placeholder_BarCode"
@confirm="getCode(hform.HBarCode)" />
</view>
<uni-icons type="scan"
@@ -12,42 +12,42 @@
size="20" @click="toScanCode"></uni-icons>
</view>
<view class="form-item">
- <view class="title">鏁伴噺:</view>
+ <view class="title">{{ $t("SellOutBill_PDA.Qty") == "SellOutBill_PDA.Qty" ? "鏁伴噺" : $t("SellOutBill_PDA.Qty") }}:</view>
<view class="right">
- <input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
+ <input v-model="hform.HQty" :placeholder="placeholder_Qty" />
</view>
</view>
<view class="form-item">
- <view class="title">浠撳簱:</view>
+ <view class="title">{{ $t("SellOutBill_PDA.Warehouse") == "SellOutBill_PDA.Warehouse" ? "浠撳簱" : $t("SellOutBill_PDA.Warehouse") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+ <uni-combox :candidates="arrayHWHName" :placeholder="placeholder_Warehouse" v-model="hform.HWHName"
@input="HWHNameChange" @confirm="HWHNameScan"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">浠撲綅:</view>
+ <view class="title">{{ $t("SellOutBill_PDA.StockPlace") == "SellOutBill_PDA.StockPlace" ? "浠撲綅" : $t("SellOutBill_PDA.StockPlace") }}:</view>
<!-- 鍥涚淮灏斿惎鐢ㄤ粨浣嶆壂鐮� 鍏朵粬瀹㈡埛鎸夐渶鍚敤鎺у埗 -->
<view class="right" >
- <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+ <uni-combox :candidates="HStockPlaceNameListComputed" :placeholder="placeholder_SCStockPlace"
v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
@confirm="HStockPlaceNameScan"></uni-combox>
</view>
-<!-- <view class="righton" v-show="!showHStockPlaceName">
+ <!-- <view class="righton" v-show="!showHStockPlaceName">
<input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="涓嶅彲鎿嶄綔" />
</view> -->
</view>
<view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
- <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鏉＄爜淇℃伅</view>
- <view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">涓嬫灦淇℃伅</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">{{ $t("SellOutBill_PDA.selectSource") == "SellOutBill_PDA.selectSource" ? "閫夋嫨婧愬崟" : $t("SellOutBill_PDA.selectSource") }}</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">{{ $t("SellOutBill_PDA.tableInfo") == "SellOutBill_PDA.tableInfo" ? "琛ㄥご淇℃伅" : $t("SellOutBill_PDA.tableInfo") }}</view>
+ <view :class="tabs == 2 ? 'on' : ''" @tap="tabs = 2">{{ $t("SellOutBill_PDA.materInfo") == "SellOutBill_PDA.materInfo" ? "鐗╂枡淇℃伅" : $t("SellOutBill_PDA.materInfo") }}</view>
+ <view :class="tabs == 3 ? 'on' : ''" @tap="tabs = 3">{{ $t("SellOutBill_PDA.barInfo") == "SellOutBill_PDA.barInfo" ? "鏉＄爜淇℃伅" : $t("SellOutBill_PDA.barInfo") }}</view>
+ <view :class="tabs == 4 ? 'on' : ''" @tap="tabs = 4">{{ $t("SellOutBill_PDA.removeShelvesInfo") == "SellOutBill_PDA.removeShelvesInfo" ? "涓嬫灦淇℃伅" : $t("SellOutBill_PDA.removeShelvesInfo") }}</view>
</view>
<view v-if="tabs == 0">
<view class="form-item">
- <view class="title">婧愬崟绫诲瀷:</view>
+ <view class="title">{{ $t("SellOutBill_PDA.SourceBillType") == "SellOutBill_PDA.SourceBillType" ? "婧愬崟绫诲瀷" : $t("SellOutBill_PDA.SourceBillType") }}:</view>
<view class="right" v-show="showHMainSourceBillType">
<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
@change="HMainSourceBillTypeChange">
@@ -62,7 +62,7 @@
</view>
</view>
<view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="title">{{ $t("SellOutBill_PDA.SourceBillNo") == "SellOutBill_PDA.SourceBillNo" ? "婧愬崟鍗曞彿" : $t("SellOutBill_PDA.SourceBillNo") }}:</view>
<!-- <view class="right" v-show="showHSourceBillNo">
<uni-combox v-if="reHSourceBillNo" :isFocus="HSourceBillNoFocus" ref="uniComboxSourceBill"
:confirm-call="onSourceBillConfirmHandler" :candidates="arrayHSourceBillNo"
@@ -76,26 +76,30 @@
<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
<input :focus="HSourceBillNoFocus" type="text" @confirm="onSourceBillConfirmHandler"
- name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ name="HSourceBillNo" v-model="hform.HSourceBillNo" :placeholder="placeholder_SourceBillNo" />
</view>
+ <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+ <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
+ </view>
+
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
</view>
<view class="righton" v-show="!showHSourceBillNo">
- <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" :placeholder="placeholder_SourceBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">鍏堣繘鍏堝嚭浠�:</view>
+ <view class="title">{{ $t("SellOutBill_PDA.FIFOwarehouse") == "SellOutBill_PDA.FIFOwarehouse" ? "鍏堣繘鍏堝嚭浠�" : $t("SellOutBill_PDA.FIFOwarehouse") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨" v-model="hform.HFIFOWHName"
+ <uni-combox :candidates="arrayHWHName" :placeholder="placeholder_FIFOwarehouse" v-model="hform.HFIFOWHName"
@input="HFIFOWHNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">鏃ユ湡:</view>
+ <view class="title">{{ $t("SellOutBill_PDA.Date") == "SellOutBill_PDA.Date" ? "鏃ユ湡" : $t("SellOutBill_PDA.Date") }}:</view>
<view class="right">
<picker mode="date" v-model="hform.HDate" @change="HDateChange">
<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
@@ -104,13 +108,13 @@
</view>
</view>
<view class="form-item">
- <view class="title">鍒跺崟浜�:</view>
+ <view class="title">{{ $t("SellOutBill_PDA.Maker") == "SellOutBill_PDA.Maker" ? "鍒跺崟浜�" : $t("SellOutBill_PDA.Maker") }}:</view>
<view class="righton">
<input name="HMaker" disabled v-model="hform.HMaker" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("SellOutBill_PDA.BillNo") == "SellOutBill_PDA.BillNo" ? "鍗曟嵁鍙�" : $t("SellOutBill_PDA.BillNo") }}:</view>
<view class="righton">
<input name="HBillNo" disabled v-model="hform.HBillNo" />
</view>
@@ -119,7 +123,7 @@
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁ID:</view>
+ <view class="title">{{ $t("SellOutBill_PDA.BillID") == "SellOutBill_PDA.BillID" ? "鍗曟嵁ID" : $t("SellOutBill_PDA.BillID") }}:</view>
<view class="righton">
<input name="HInterID" disabled v-model="hform.HInterID" />
</view>
@@ -128,38 +132,38 @@
<view v-if="tabs == 1">
<view class="form-item">
- <view class="title">淇濈:</view>
+ <view class="title">{{ $t("SellOutBill_PDA.Keeper") == "SellOutBill_PDA.Keeper" ? "淇濈" : $t("SellOutBill_PDA.Keeper") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
+ <uni-combox :candidates="arrayHEmpName" :placeholder="placeholder_Keeper" v-model="hform.HKeeperName"
@input="HKeeperNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">楠屾敹:</view>
+ <view class="title">{{ $t("SellOutBill_PDA.SecManager") == "SellOutBill_PDA.SecManager" ? "楠屾敹" : $t("SellOutBill_PDA.SecManager") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
+ <uni-combox :candidates="arrayHEmpName" :placeholder="placeholder_SecManager" v-model="hform.HSecManagerName"
@input="HSecManagerNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">閮ㄩ棬:</view>
+ <view class="title">{{ $t("SellOutBill_PDA.Dept") == "SellOutBill_PDA.Dept" ? "閮ㄩ棬" : $t("SellOutBill_PDA.Dept") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+ <uni-combox :candidates="arrayHDeptName" :placeholder="placeholder_Dept" v-model="hform.HDeptName"
@input="HDeptNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">瀹㈡埛:</view>
+ <view class="title">{{ $t("SellOutBill_PDA.Customer") == "SellOutBill_PDA.Customer" ? "瀹㈡埛" : $t("SellOutBill_PDA.Customer") }}:</view>
<!-- <view class="right" v-show="showHSupName">
<uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨瀹㈡埛" v-model="hform.HSupName"
@input="HSupNameChange"></uni-combox>
</view> -->
<view class="righton">
- <input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
+ <input name="HSupName" disabled v-model="hform.HSupName" :placeholder="placeholder_Customer" />
</view>
</view>
<view class="form-item">
- <view class="title">缁勭粐:</view>
+ <view class="title">{{ $t("SellOutBill_PDA.StockOrg") == "SellOutBill_PDA.StockOrg" ? " 缁勭粐" : $t("SellOutBill_PDA.StockOrg") }}:</view>
<view class="righton">
<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
</view>
@@ -171,22 +175,22 @@
<uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠ｇ爜" style="margin: 10px;" @tap="delMater(item)">
<view class="card-detail">
<view class="detail">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("SellOutBill_PDA.table_SourceBillNo") == "SellOutBill_PDA.table_SourceBillNo" ? "婧愬崟鍗曞彿" : $t("SellOutBill_PDA.table_SourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail">
- <text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
+ <text>{{ $t("SellOutBill_PDA.table_SourceBillQty") == "SellOutBill_PDA.table_SourceBillQty" ? "婧愬崟鏁伴噺" : $t("SellOutBill_PDA.table_SourceBillQty") }}锛�</text>{{item.婧愬崟鏁伴噺}}
</view>
<view class="detail">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("SellOutBill_PDA.table_BarQty") == "SellOutBill_PDA.table_BarQty" ? "鏁伴噺" : $t("SellOutBill_PDA.table_BarQty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail">
- <text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
+ <text>{{ $t("SellOutBill_PDA.table_BarNum") == "SellOutBill_PDA.table_BarNum" ? "鏉＄爜涓暟" : $t("SellOutBill_PDA.table_BarNum") }}锛�</text>{{item.鏉＄爜涓暟}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ <text>{{ $t("SellOutBill_PDA.table_MaterModel") == "SellOutBill_PDA.table_MaterModel" ? "瑙勬牸鍨嬪彿" : $t("SellOutBill_PDA.table_MaterModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
<view class="detail" v-if="item.杈呭姪灞炴��">
- <text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+ <text>{{ $t("SellOutBill_PDA.table_Aux") == "SellOutBill_PDA.table_Aux" ? "杈呭姪灞炴��" : $t("SellOutBill_PDA.table_Aux") }}锛�</text>{{item.杈呭姪灞炴�}
</view>
<!-- 鍏磋揪瀹㈡埛 鍔熻兘 -->
<view class="detail" v-if="materMeta[0].HWHName && /鍏磋揪/.test(hform.HStockOrgName
@@ -196,7 +200,7 @@
</view>
</uni-card>
</view>
- <view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="Materlist.length == 0">{{ $t("SellOutBill_PDA.noData") == "SellOutBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("SellOutBill_PDA.noData") }}</view>
</view>
<view v-if="tabs == 4">
@@ -205,83 +209,83 @@
@tap="delMater(item)">
<view class="card-detail">
<view class="detail">
- <text>鏁伴噺锛�</text>{{item.HQty}}
+ <text>{{ $t("SellOutBill_PDA.Qty") == "SellOutBill_PDA" ? "鏁伴噺" : $t("SellOutBill_PDA.Qty") }}锛�</text>{{item.HQty}}
</view>
<view class="detail">
- <text>涓嬫灦鏁伴噺锛�</text>{{item.HQtyMust}}
+ <text>{{ $t("SellOutBill_PDA.PutawayQty") == "SellOutBill_PDA.PutawayQty" ? "涓嬫灦鏁伴噺" : $t("SellOutBill_PDA.PutawayQty") }}锛�</text>{{item.HQtyMust}}
</view>
<view class="detail">
- <text>浠撳簱锛�</text>{{item.HWhName}}
+ <text>{{ $t("SellOutBill_PDA.Warehouse") == "SellOutBill_PDA.Warehouse" ? "浠撳簱" : $t("SellOutBill_PDA.Warehouse") }}锛�</text>{{item.HWhName}}
</view>
<view class="detail">
- <text>浠撲綅锛�</text>{{item.HSPName}}
+ <text>{{ $t("SellOutBill_PDA.StockPlace") == "SellOutBill_PDA.StockPlace" ? "浠撲綅" : $t("SellOutBill_PDA.StockPlace") }}锛�</text>{{item.HSPName}}
</view>
<view class="detail">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.HMaterModel}}
+ <text>{{ $t("SellOutBill_PDA.MaterModel") == "SellOutBill_PDA.MaterModel" ? "瑙勬牸鍨嬪彿" : $t("SellOutBill_PDA.MaterModel") }}锛�</text>{{item.HMaterModel}}
</view>
<view class="detail" v-if="item.HBatchNo">
- <text>鎵瑰彿锛�</text>{{item.HBatchNo}}
+ <text>{{ $t("SellOutBill_PDA.BatchNo") == "SellOutBill_PDA.BatchNo" ? "鎵瑰彿" : $t("SellOutBill_PDA.BatchNo") }}锛�</text>{{item.HBatchNo}}
</view>
<view class="detail" v-if="item.HAuxPropName">
- <text>杈呭姪灞炴�э細</text>{{item.HAuxPropName}}
+ <text>{{ $t("SellOutBill_PDA.table_Aux") == "SellOutBill_PDA.table_Aux" ? "杈呭姪灞炴��" : $t("SellOutBill_PDA.table_Aux") }}锛�</text>{{item.HAuxPropName}}
</view>
</view>
</uni-card>
</view>
- <view class="over" v-if="FIFOlist.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="FIFOlist.length == 0">{{ $t("SellOutBill_PDA.noData") == "SellOutBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("SellOutBill_PDA.noData") }}</view>
</view>
<view v-if="tabs == 3">
<view class="form-item">
- <view class="title">鏉＄爜:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.BarCode") == "MoveStockBill_PDA.BarCode" ? "鏉＄爜" : $t("MoveStockBill_PDA.BarCode") }}:</view>
<view class="righton">
<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鐗╂枡:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.Material") == "MoveStockBill_PDA.Material" ? "鐗╂枡" : $t("MoveStockBill_PDA.Material") }}:</view>
<view class="righton">
<input disabled v-model="hform.HMaterName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">瑙勬牸:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.MaterModel") == "MoveStockBill_PDA.MaterModel" ? "瑙勬牸" : $t("MoveStockBill_PDA.MaterModel") }}:</view>
<view class="righton">
<input disabled v-model="hform.HMaterModel_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鎵规:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.BatchNo") == "MoveStockBill_PDA.BatchNo" ? "鎵规" : $t("MoveStockBill_PDA.BatchNo") }}:</view>
<view class="righton">
<input disabled v-model="hform.HBatchNo_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曚綅:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.Unit") == "MoveStockBill_PDA.Unit" ? "鍗曚綅" : $t("MoveStockBill_PDA.Unit") }}:</view>
<view class="righton">
<input disabled v-model="hform.HUnitName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鏁伴噺:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.Qty") == "MoveStockBill_PDA.Qty" ? "鏁伴噺" : $t("MoveStockBill_PDA.Qty") }}:</view>
<view class="righton">
<input disabled v-model="hform.HQty_B" />
</view>
</view>
<view class="form-item">
- <view class="title">瀹归噺:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.Capacity") == "MoveStockBill_PDA.Capacity" ? "瀹归噺" : $t("MoveStockBill_PDA.Capacity") }}:</view>
<view class="righton">
<input disabled v-model="hform.HTMQty_B" />
</view>
</view>
<view class="form-item">
- <view class="title">浠撳簱:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.arehouse") == "MoveStockBill_PDA.Warehouse" ? "浠撳簱" : $t("MoveStockBill_PDA.Warehouse") }}:</view>
<view class="righton">
<input disabled v-model="hform.HWHName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">浠撲綅:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.StockPlace") == "MoveStockBill_PDA.StockPlace" ? "浠撲綅" : $t("MoveStockBill_PDA.StockPlace") }}:</view>
<view class="righton">
<input disabled v-model="hform.HSPName_B" />
</view>
@@ -289,10 +293,10 @@
</view>
<view class="bottom-btn">
- <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button class="btn-a" size="mini" @tap="submit">{{ $t("MoveStockBill_PDA.btnSubmit") == "MoveStockBill_PDA.btnSubmit" ? "鎻愪氦" : $t("MoveStockBill_PDA.btnSubmit") }}</button>
<view style="flex: 1;"></view>
- <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
- <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ <button class="btn-a" size="mini" @tap="addNew">{{ $t("MoveStockBill_PDA.btnAdd") == "MoveStockBill_PDA.btnAdd" ? "鏂板" : $t("MoveStockBill_PDA.btnAdd") }}</button>
+ <button class="btn-c" size="mini" @tap="goBack">{{ $t("MoveStockBill_PDA.btnExit") == "MoveStockBill_PDA.btnExit" ? "閫�鍑�" : $t("MoveStockBill_PDA.btnExit") }}</button>
</view>
</view>
<PushSeOutStockBillPopupVue v-if="enableModule == 1" ref="billList" :HBillType="hform.HBillType"
@@ -316,6 +320,7 @@
CommonUtils
} from '../../utils/common';
import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+ import { MpaasScan } from '../../utils/mpaasScan';
export default {
data() {
return {
@@ -403,7 +408,23 @@
HTMQty_B: '',
HWHName_B: '',
HSPName_B: '',
- }
+ },
+ placeholder_BarCode:this.$t("MoveStockBill_PDA.placeholder_BarCode") == "MoveStockBill_PDA.placeholder_BarCode" ? "璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" : this.$t("MoveStockBill_PDA.placeholder_BarCode"),
+ placeholder_Qty:this.$t("MoveStockBill_PDA.placeholder_Qty") == "MoveStockBill_PDA.placeholder_Qty" ? "璇疯緭鍏ユ暟閲�" : this.$t("MoveStockBill_PDA.placeholder_Qty"),
+ placeholder_Warehouse:this.$t("MoveStockBill_PDA.placeholder_Warehouse") == "MoveStockBill_PDA.placeholder_Warehouse" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" : this.$t("MoveStockBill_PDA.placeholder_Warehouse"),
+ placeholder_StockPlace:this.$t("MoveStockBill_PDA.placeholder_StockPlace") == "MoveStockBill_PDA.placeholder_StockPlace" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" : this.$t("MoveStockBill_PDA.placeholder_StockPlace"),
+ placeholder_SourceBillNo:this.$t("MoveStockBill_PDA.placeholder_SourceBillNo") == "MoveStockBill_PDA.placeholder_SourceBillNo" ? "璇疯緭鍏ユ簮鍗曞崟鍙�" : this.$t("MoveStockBill_PDA.placeholder_SourceBillNo"),
+ placeholder_FIFOwarehouse:this.$t("MoveStockBill_PDA.placeholder_FIFOwarehouse") == "MoveStockBill_PDA.placeholder_FIFOwarehouse" ? "璇烽�夋嫨" : this.$t("MoveStockBill_PDA.placeholder_FIFOwarehouse"),
+ placeholder_OutboundType:this.$t("MoveStockBill_PDA.placeholder_OutboundType") == "MoveStockBill_PDA.placeholder_OutboundType" ? "璇烽�夋嫨" : this.$t("MoveStockBill_PDA.placeholder_OutboundType"),
+ placeholder_TransferDirection:this.$t("MoveStockBill_PDA.placeholder_TransferDirection") == "MoveStockBill_PDA.placeholder_TransferDirection" ? "璇烽�夋嫨璋冩嫧鏂瑰悜" : this.$t("MoveStockBill_PDA.placeholder_TransferDirection"),
+ placeholder_TransferType:this.$t("MoveStockBill_PDA.placeholder_TransferType") == "MoveStockBill_PDA.placeholder_TransferType" ? "璇烽�夋嫨璋冩嫧绫诲瀷" : this.$t("MoveStockBill_PDA.placeholder_TransferType"),
+ placeholder_SCWarehouse:this.$t("MoveStockBill_PDA.placeholder_SCWarehouse") == "MoveStockBill_PDA.placeholder_SCWarehouse" ? "璇烽�夋嫨璋冨嚭浠撳簱" : this.$t("MoveStockBill_PDA.placeholder_SCWarehouse"),
+ placeholder_SCStockPlace:this.$t("MoveStockBill_PDA.placeholder_SCStockPlace") == "MoveStockBill_PDA.placeholder_SCStockPlace" ? "璇烽�夋嫨璋冨嚭浠撲綅" : this.$t("MoveStockBill_PDA.placeholder_SCStockPlace"),
+ placeholder_SecManager:this.$t("MoveStockBill_PDA.placeholder_SecManager") == "MoveStockBill_PDA.placeholder_SecManager" ? "璇烽�夋嫨楠屾敹鍛�" : this.$t("MoveStockBill_PDA.placeholder_SecManager"),
+ placeholder_Keeper:this.$t("MoveStockBill_PDA.placeholder_Keeper") == "MoveStockBill_PDA.placeholder_Keeper" ? "璇烽�夋嫨淇濈鍛�" : this.$t("MoveStockBill_PDA.placeholder_Keeper"),
+ placeholder_Dept:this.$t("MoveStockBill_PDA.placeholder_Dept") == "MoveStockBill_PDA.placeholder_Dept" ? "璇烽�夋嫨閮ㄩ棬" : this.$t("MoveStockBill_PDA.placeholder_Dept"),
+ placeholder_Supplier:this.$t("MoveStockBill_PDA.placeholder_Supplier") == "MoveStockBill_PDA.placeholder_Supplier" ? "璇烽�夋嫨渚涘簲鍟�" : this.$t("MoveStockBill_PDA.placeholder_Supplier"),
+ placeholder_Customer:this.$t("MoveStockBill_PDA.placeholder_Customer") == "MoveStockBill_PDA.placeholder_Customer" ? "璇烽�夋嫨瀹㈡埛" : this.$t("MoveStockBill_PDA.placeholder_Customer")
}
},
components: {
@@ -435,7 +456,10 @@
}
}
},
- onLoad(e) {
+ async onLoad(e) {
+ uni.setNavigationBarTitle({
+ title: this.$t("SellOutBill_PDA.title")
+ })
console.log(e, this.userInfo)
this.OperationType = e.OperationType
if (e.HInterID) {
@@ -451,6 +475,7 @@
this.getHSupList()
this.getHEmpList()
this.getHDeptList()
+ await this.GetSourceBillType()
console.log('enableModule: ', this.enableModule);
this.getRelationStore()
@@ -464,6 +489,11 @@
uni.$off('BillSelectComplete')
},
methods: {
+ toScanBillCode() {
+ MpaasScan.scanCode((res) => {
+ this.getHBarCodeData(res)
+ })
+ },
async HWHNameScan(e) {
return
// 鎵弿浠撳簱鐮�
@@ -492,9 +522,9 @@
Organization: uni.getStorageSync('Organization')
},
})
-
+
if (res.data.count == 1) {
-
+
this.hform.HStockPlaceID = res.data.data[0].HMainID
this.hform.HStockPlaceName = res.data.data[0].浠撲綅鍚嶇О
this.hform.HWHID = res.data.data[0].HWHID
@@ -505,7 +535,7 @@
icon: 'none'
})
}
-
+
} catch (err) {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
@@ -809,7 +839,7 @@
if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
this.showHStockPlaceName = true
this.getStockPlaceRemote(this.HWHNameList[i]["HSPGroupID"])
- }
+ }
}
}
},
@@ -823,7 +853,7 @@
Organization: uni.getStorageSync('Organization')
},
})
-
+
if (res.data.count == 1) {
this.HStockPlaceNameList = res.data.data
for (var i = 0; i < res.data.data.length; i++) {
@@ -835,7 +865,7 @@
icon: 'none'
})
}
-
+
} catch (err) {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
@@ -869,6 +899,52 @@
// }
// }
},
+
+ // 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
+ async GetSourceBillType() {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Web/GetHSourceBillTypeByBillType',
+ data: {
+ HBillType: this.hform.HBillType,
+ Num: 2
+ }
+ })
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ console.log('data: ', data);
+ this.arrayHMainSourceBillType = []
+ this.arrayHMainSourceBillValue = []
+ Array.from(data).forEach(e => {
+ for(var j = 0; j < this.$t("SellOutBill_PDA.select option").length; j++){
+ let HSourceBillType_FY = this.$t("SellOutBill_PDA.select option[" + j + "]").split("@");
+ if(e['HSourceBillType'] == HSourceBillType_FY[0]){
+ this.arrayHMainSourceBillType.push(HSourceBillType_FY[1])
+ this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
+ }
+ }
+ })
+
+ this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
+ this.arrayHMainSourceBillValue.push('-1')
+ //濡傛灉鎵嬪伐褰曞叆涓嶇敤閫夋嫨婧愬崟
+ if (this.arrayHMainSourceBillType[0] == '鎵嬪伐褰曞叆') {
+ this.tabs = 1
+ }
+
+ this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
+ this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+
+ }
+ },
//閫夋嫨婧愬崟
HSourceBillNoChange(e) {
this.hform.HSourceBillNo = e
diff --git a/pages/xiaoshouchuku/SellOutBillList.vue b/pages/xiaoshouchuku/SellOutBillList.vue
index ce8cd4a..4de64a2 100644
--- a/pages/xiaoshouchuku/SellOutBillList.vue
+++ b/pages/xiaoshouchuku/SellOutBillList.vue
@@ -1,33 +1,33 @@
<template>
<view class="content">
<view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
- <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸叉牎楠屽垪琛�</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">{{ $t("SellOutBillList_PDA.cacheList") == "SellOutBillList_PDA.cacheList" ? "缂撳瓨鍒楄〃" : $t("SellOutBillList_PDA.cacheList") }}</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">{{ $t("SellOutBillList_PDA.updatedList") == "SellOutBillList_PDA.updatedList" ? "宸蹭笂浼犲垪琛�" : $t("SellOutBillList_PDA.updatedList") }}</view>
</view>
<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
<view class="form" v-if="tabs == 0">
<view class="buttons" @tap="add">
- <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
+ <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>{{ $t("SellOutBillList_PDA.btnAdd") == "SellOutBillList_PDA.btnAdd" ? "鏂板" : $t("SellOutBillList_PDA.btnAdd") }}
</view>
</view>
<view class="form" v-if="tabs == 1">
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("SellOutBillList_PDA.billNo") == "SellOutBillList_PDA.billNo" ? "鍗曟嵁鍙�" : $t("SellOutBillList_PDA.billNo") }}:</view>
<view class="right">
- <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ <input v-model="hform.HBillNo" :placeholder="billNoPlaceholder" />
</view>
</view>
<view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="title">{{ $t("SellOutBillList_PDA.sourceBillNo") == "SellOutBillList_PDA.sourceBillNo" ? "婧愬崟鍗曞彿" : $t("SellOutBillList_PDA.sourceBillNo") }}:</view>
<view class="right">
- <input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ <input v-model="hform.HSourceBillNo" :placeholder="sourceBillNoPlaceholder" />
</view>
</view>
<view class="buttons">
- <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
- <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+ <button class="btn-a" size="mini" type="default" @tap="clear">{{ $t("SellOutBillList_PDA.btn_Reset") == "SellOutBillList_PDA.btn_Reset" ? "閲嶇疆" : $t("SellOutBillList_PDA.btn_Reset") }}</button>
+ <button class="btn-c" size="mini" type="default" @tap="search">{{ $t("SellOutBillList_PDA.btn_Query") == "SellOutBillList_PDA.btn_Query" ? "鏌ヨ" : $t("SellOutBillList_PDA.btn_Query") }}</button>
</view>
</view>
@@ -37,28 +37,29 @@
<uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
<view class="detail" v-if="item.鍒跺崟浜�">
- <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
- </view>
- <view class="detail" v-if="item.鍗曟嵁鍐呯爜">
- <text>鍗曟嵁鍐呯爜锛�</text>{{item.鍗曟嵁鍐呯爜}}
- </view>
- <view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
- </view>
- <view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
- </view>
- <view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("SellOutBillList_PDA.table_Maker") == "SellOutBillList_PDA.table_Maker" ? "鍒跺崟浜�" : $t("SellOutBillList_PDA.table_Maker") }}锛�</text>{{item.鍒跺崟浜簘}
+ </view>
+ <view class="detail" v-if="item.鍗曟嵁鍐呯爜">
+ <text>{{ $t("SellOutBillList_PDA.table_BillID") == "SellOutBillList_PDA.table_BillID" ? "鍗曟嵁鍐呯爜" : $t("SellOutBillList_PDA.table_BillID") }}锛�</text>{{item.鍗曟嵁鍐呯爜}}
+ </view>
+ <view class="detail" v-if="item.鏁伴噺">
+ <text>{{ $t("SellOutBillList_PDA.table_Qty") == "SellOutBillList_PDA.table_Qty" ? "鏁伴噺" : $t("SellOutBillList_PDA.table_Qty") }}锛�</text>{{item.鏁伴噺}}
+ </view>
+ <view class="detail" v-if="item.婧愬崟鍗曞彿">
+ <text>{{ $t("SellOutBillList_PDA.table_SourceBillNo") == "SellOutBillList_PDA.table_SourceBillNo" ? "婧愬崟鍗曞彿" : $t("SellOutBillList_PDA.table_SourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
+ </view>
+ <view class="detail" v-if="item.缁勭粐">
+ <text>{{ $t("SellOutBillList_PDA.table_Org") == "SellOutBillList_PDA.table_Org" ? "缁勭粐" : $t("SellOutBillList_PDA.table_Org") }}锛�</text>{{item.缁勭粐}}
+
</view>
</view>
<view class="more">
<view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
- <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>缂栬緫
+ <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons></uni-icons>{{ $t("SellOutBillList_PDA.btn_Edit") == "SellOutBillList_PDA.btn_Edit" ? "缂栬緫" : $t("SellOutBillList_PDA.btn_Edit") }}
</view>
<view class="part" style="color: #da0000;" @tap.stop="del(item)">
- <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>鍒犻櫎
+ <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>{{ $t("SellOutBillList_PDA.btn_Del") == "SellOutBillList_PDA.btn_Del" ? "鍒犻櫎" : $t("SellOutBillList_PDA.btn_Del") }}
</view>
</view>
</uni-card>
@@ -67,42 +68,42 @@
<uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
<view class="detail" v-if="item.鍒跺崟浜�">
- <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ <text>{{ $t("SellOutBillList_PDA.table_Maker") == "SellOutBillList_PDA.table_Maker" ? "鍒跺崟浜�" : $t("SellOutBillList_PDA.table_Maker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("SellOutBillList_PDA.table_Qty") == "SellOutBillList_PDA.table_Qty" ? "鏁伴噺" : $t("SellOutBillList_PDA.table_Qty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("SellOutBillList_PDA.sourceBillNo") == "SellOutBillList_PDA.sourceBillNo" ? "婧愬崟鍗曞彿" : $t("SellOutBillList_PDA.sourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.鐗╂枡浠ｇ爜">
- <text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
+ <text>{{ $t("SellOutBillList_PDA.table_MaterNumber") == "SellOutBillList_PDA.table_MaterNumber" ? "鐗╂枡浠ｇ爜" : $t("SellOutBillList_PDA.table_MaterNumber") }}锛�</text>{{item.鐗╂枡浠ｇ爜}}
</view>
<view class="detail" v-if="item.鐗╂枡鍚嶇О">
- <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+ <text>{{ $t("SellOutBillList_PDA.table_MaterName") == "SellOutBillList_PDA.table_MaterName" ? "鐗╂枡鍚嶇О" : $t("SellOutBillList_PDA.table_MaterName") }}锛�</text>{{item.鐗╂枡鍚嶇О}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ <text>{{ $t("SellOutBillList_PDA.table_MaterModel") == "SellOutBillList_PDA.table_MaterModel" ? "瑙勬牸鍨嬪彿" : $t("SellOutBillList_PDA.table_MaterModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("SellOutBillList_PDA.table_Org") == "SellOutBillList_PDA.table_Org" ? "缁勭粐" : $t("SellOutBillList_PDA.table_Org") }}锛�</text>{{item.缁勭粐}}
</view>
</view>
<view class="more">
<view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
- <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>鏄剧ず浜岀淮鐮�
+ <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>{{ $t("SellOutBillList_PDA.btn_DisplayCode") == "SellOutBillList_PDA.btn_DisplayCode" ? "鏄剧ず浜岀淮鐮�" : $t("SellOutBillList_PDA.btn_DisplayCode") }}
</view>
<view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
- <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>鎾ら攢
+ <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>{{ $t("SellOutBillList_PDA.btn_Revoke") == "SellOutBillList_PDA.btn_Revoke" ? "鎾ら攢" : $t("SellOutBillList_PDA.btn_Revoke") }}
</view>
</view>
</uni-card>
</view>
- <view class="over" v-if="!listData || listData.length == 0">鏆傛棤鏁版嵁</view>
- <view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
- <view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+ <view class="over" v-if="!listData || listData.length == 0">{{ $t("SellOutBillList_PDA.noDate") == "SellOutBillList_PDA.noDate" ? "鏆傛棤鏁版嵁" : $t("SellOutBillList_PDA.noDate") }}</view>
+ <view class="over" v-if="listData.length != 0 && listData.length != showList.length">{{ $t("SellOutBillList_PDA.Loading") == "SellOutBillList_PDA.Loading" ? "鍔犺浇涓�..." : $t("SellOutBillList_PDA.Loading") }}</view>
+ <view class="over" v-if="listData.length != 0 && listData.length == showList.length">{{ $t("SellOutBillList_PDA.bottom") == "SellOutBillList_PDA.bottom" ? "宸插埌搴�" : $t("SellOutBillList_PDA.bottom") }}</view>
<BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
</view>
</template>
@@ -125,6 +126,9 @@
HMaker: uni.getStorageSync('HUserName'),
HStockOrgID: uni.getStorageSync('OrganizationID'),
},
+ billNoPlaceholder:this.$t("SellOutBillList_PDA.billNoPlaceholder") == "SellOutBillList_PDA.billNoPlaceholder" ? "璇疯緭鍏ュ崟鎹彿" : this.$t("SellOutBillList_PDA.billNoPlaceholder"),
+ sourceBillNoPlaceholder:this.$t("SellOutBillList_PDA.sourceBillNoPlaceholder") == "SellOutBillList_PDA.sourceBillNoPlaceholder" ? "璇疯緭鍏ユ簮鍗曠紪鍙�" : this.$t("SellOutBillList_PDA.sourceBillNoPlaceholder"),
+
sWhere:'',
listData:[],
showList:[],
@@ -134,6 +138,9 @@
}
},
onLoad() {
+ uni.setNavigationBarTitle({
+ title: this.$t("SellOutBillList_PDA.title")
+ })
//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
this.CheckModRight()
this.changeTab(0)
diff --git a/pages/xiaoshouchukujiaoyan/SellOutCheckBillList.vue b/pages/xiaoshouchukujiaoyan/SellOutCheckBillList.vue
index f515e46..0dda313 100644
--- a/pages/xiaoshouchukujiaoyan/SellOutCheckBillList.vue
+++ b/pages/xiaoshouchukujiaoyan/SellOutCheckBillList.vue
@@ -1,33 +1,42 @@
<template>
<view class="content">
<view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
- <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸叉牎楠屽垪琛�</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">
+ {{ $t("SellOutCheckBillList.cacheList") == "SellOutCheckBillList.cacheList" ? "缂撳瓨鍒楄〃" : $t("SellOutCheckBillList.cacheList") }}
+ </view>
+ <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">
+ {{ $t("SellOutCheckBillList.checkedList") == "SellOutCheckBillList.checkedList" ? "宸叉牎楠屽垪琛�" : $t("SellOutCheckBillList.checkedList") }}
+ </view>
</view>
<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
<view class="form" v-if="tabs == 0">
<view class="buttons" @tap="add">
- <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
+ <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>
+ {{ $t("SellOutCheckBillList.btnAdd") == "SellOutCheckBillList.btnAdd" ? "鏂板" : $t("SellOutCheckBillList.btnAdd") }}
</view>
</view>
<view class="form" v-if="tabs == 1">
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("SellOutCheckBillList.billNo") == "SellOutCheckBillList.billNo" ? "鍗曟嵁鍙�:" : $t("SellOutCheckBillList.billNo") }}:</view>
<view class="right">
- <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ <input v-model="hform.HBillNo" :placeholder="$t('SellOutCheckBillList.billNoPlaceholder') == 'SellOutCheckBillList.billNoPlaceholder' ? '璇疯緭鍏ュ崟鎹彿' : $t('SellOutCheckBillList.billNoPlaceholder')" />
</view>
</view>
<view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="title">{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿:" : $t("Gy.HMainSourceBillNo") }}:</view>
<view class="right">
- <input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ <input v-model="hform.HSourceBillNo" :placeholder="$t('SellOutCheckBillList.sourceBillNoPlaceholder') == 'SellOutCheckBillList.sourceBillNoPlaceholder' ? '璇疯緭鍏ユ簮鍗曞崟鍙�' : $t('SellOutCheckBillList.sourceBillNoPlaceholder')" />
</view>
</view>
<view class="buttons">
- <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
- <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+ <button class="btn-a" size="mini" type="default" @tap="clear">
+ {{ $t("SellOutCheckBillList.btn_Reset") == "SellOutCheckBillList.btn_Reset" ? "閲嶇疆" : $t("SellOutCheckBillList.btn_Reset") }}
+ </button>
+ <button class="btn-c" size="mini" type="default" @tap="search">
+ {{ $t("SellOutCheckBillList.btn_Query") == "SellOutCheckBillList.btn_Query" ? "鏌ヨ" : $t("SellOutCheckBillList.btn_Query") }}
+ </button>
</view>
</view>
@@ -38,28 +47,30 @@
@tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
<view class="detail" v-if="item.鍒跺崟浜�">
- <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ <text>{{ $t("Gy.HMaker") == "Gy.HMaker" ? "鍒跺崟浜猴細" : $t("Gy.HMaker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鍗曟嵁鍐呯爜">
- <text>鍗曟嵁鍐呯爜锛�</text>{{item.鍗曟嵁鍐呯爜}}
+ <text>{{ $t("SellOutCheckBillList.table_BillID") == "SellOutCheckBillList.table_BillID" ? "鍗曟嵁鍐呯爜锛�" : $t("SellOutCheckBillList.table_BillID") }}锛�</text>{{item.鍗曟嵁鍐呯爜}}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("Gy.HQty") == "Gy.HQty" ? "鏁伴噺锛�" : $t("Gy.HQty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("Gy.HMainSourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("Gy.CurrentOrganization") == "Gy.CurrentOrganization" ? "缁勭粐锛�" : $t("Gy.CurrentOrganization") }}锛�</text>{{item.缁勭粐}}
</view>
</view>
<view class="more">
<view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
- <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>缂栬緫
+ <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>
+ {{ $t("SellOutCheckBillList.btn_Edit") == "SellOutCheckBillList.btn_Edit" ? "缂栬緫" : $t("SellOutCheckBillList.btn_Edit") }}
</view>
<view class="part" style="color: #da0000;" @tap.stop="del(item)">
- <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>鍒犻櫎
+ <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>
+ {{ $t("SellOutCheckBillList.btn_Del") == "SellOutCheckBillList.btn_Del" ? "鍒犻櫎" : $t("SellOutCheckBillList.btn_Del") }}
</view>
</view>
</uni-card>
@@ -69,39 +80,46 @@
@tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
<view class="detail" v-if="item.鍒跺崟浜�">
- <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ <text>{{ $t("Gy.HMaker") == "Gy.HMaker" ? "鍒跺崟浜猴細" : $t("Gy.HMaker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("Gy.HQty") == "Gy.HQty" ? "鏁伴噺锛�" : $t("Gy.HQty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("Gy.HMainSourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.鐗╂枡浠ｇ爜">
- <text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
+ <text>{{ $t("SellOutCheckBillList.table_MaterNumber") == "SellOutCheckBillList.table_MaterNumber" ? "鐗╂枡浠ｇ爜锛�" : $t("SellOutCheckBillList.table_MaterNumber") }}锛�</text>{{item.鐗╂枡浠ｇ爜}}
</view>
<view class="detail" v-if="item.鐗╂枡鍚嶇О">
- <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+ <text>{{ $t("SellOutCheckBillList.table_MaterName") == "SellOutCheckBillList.table_MaterName" ? "鐗╂枡鍚嶇О锛�" : $t("SellOutCheckBillList.table_MaterName") }}锛�</text>{{item.鐗╂枡鍚嶇О}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ <text>{{ $t("SellOutCheckBillList.table_MaterModel") == "SellOutCheckBillList.table_MaterModel" ? "瑙勬牸鍨嬪彿锛�" : $t("SellOutCheckBillList.table_MaterModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("Gy.CurrentOrganization") == "Gy.CurrentOrganization" ? "缁勭粐锛�" : $t("Gy.CurrentOrganization") }}锛�</text>{{item.缁勭粐}}
</view>
</view>
<view class="more">
<view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
- <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>鎾ら攢
+ <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>
+ {{ $t("SellOutCheckBillList.btn_Revoke") == "SellOutCheckBillList.btn_Revoke" ? "鎾ら攢" : $t("SellOutCheckBillList.btn_Revoke") }}
</view>
</view>
</uni-card>
</view>
- <view class="over" v-if="!listData || listData.length == 0">鏆傛棤鏁版嵁</view>
- <view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
- <view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+ <view class="over" v-if="!listData || listData.length == 0">
+ {{ $t("SellOutCheckBillList.noDate") == "SellOutCheckBillList.noDate" ? "鏆傛棤鏁版嵁" : $t("SellOutCheckBillList.noDate") }}
+ </view>
+ <view class="over" v-if="listData.length != 0 && listData.length != showList.length">
+ {{ $t("SellOutCheckBillList.Loading") == "SellOutCheckBillList.Loading" ? "鍔犺浇涓�..." : $t("SellOutCheckBillList.Loading") }}
+ </view>
+ <view class="over" v-if="listData.length != 0 && listData.length == showList.length">
+ {{ $t("SellOutCheckBillList.bottom") == "SellOutCheckBillList.bottom" ? "宸插埌搴�" : $t("SellOutCheckBillList.bottom") }}
+ </view>
</view>
</template>
@@ -116,7 +134,7 @@
serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
tabs: 0,
urls: '/WEBSController/GetKf_PonderationBillMain_TempList_BillCheck_Json',
- MvarReportTitle: '閿�鍞嚭搴撳崟鏍￠獙缂撳瓨鍒楄〃',
+ MvarReportTitle: this.$t('SellOutCheckBillList.reportTitle') == 'SellOutCheckBillList.reportTitle' ? '閿�鍞嚭搴撳崟鏍￠獙缂撳瓨鍒楄〃' : this.$t('SellOutCheckBillList.reportTitle'),
hform: {
HBillNo: '',
HSourceBillNo: '',
@@ -169,7 +187,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('SellOutCheckBillList.requestFailed') == 'SellOutCheckBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('SellOutCheckBillList.requestFailed'),
icon: 'none'
})
},
@@ -196,7 +214,7 @@
},
getList() {
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title: this.$t('SellOutCheckBillList.loadingTitle') == 'SellOutCheckBillList.loadingTitle' ? '鍔犺浇涓�...' : this.$t('SellOutCheckBillList.loadingTitle')
})
uni.request({
url: this.serverUrl + this.urls,
@@ -222,7 +240,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('SellOutCheckBillList.requestFailed') == 'SellOutCheckBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('SellOutCheckBillList.requestFailed'),
icon: 'none'
})
},
@@ -298,8 +316,8 @@
del(item) {
// console.log(item.hmainid,uni.getStorageSync('HUserName'))
uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+ title: this.$t('SellOutCheckBillList.confirmTitle') == 'SellOutCheckBillList.confirmTitle' ? '鎻愮ず' : this.$t('SellOutCheckBillList.confirmTitle'),
+ content: this.$t('SellOutCheckBillList.delConfirm') == 'SellOutCheckBillList.delConfirm' ? '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�' : this.$t('SellOutCheckBillList.delConfirm'),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -328,7 +346,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('SellOutCheckBillList.requestFailed') == 'SellOutCheckBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('SellOutCheckBillList.requestFailed'),
icon: 'none'
})
},
@@ -343,8 +361,8 @@
revoke(item) {
// console.log(item.hmainid,uni.getStorageSync('HUserName'))
uni.showModal({
- title: '鎻愮ず',
- content: '鏄惁纭鎾ら攢',
+ title: this.$t('SellOutCheckBillList.confirmTitle') == 'SellOutCheckBillList.confirmTitle' ? '鎻愮ず' : this.$t('SellOutCheckBillList.confirmTitle'),
+ content: this.$t('SellOutCheckBillList.revokeConfirm') == 'SellOutCheckBillList.revokeConfirm' ? '鏄惁纭鎾ら攢' : this.$t('SellOutCheckBillList.revokeConfirm'),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -373,7 +391,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('SellOutCheckBillList.requestFailed') == 'SellOutCheckBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('SellOutCheckBillList.requestFailed'),
icon: 'none'
})
},
diff --git a/pages/xiaoshoutuihuo/ICStockBillMainList.vue b/pages/xiaoshoutuihuo/ICStockBillMainList.vue
index 3b0461c..ede4899 100644
--- a/pages/xiaoshoutuihuo/ICStockBillMainList.vue
+++ b/pages/xiaoshoutuihuo/ICStockBillMainList.vue
@@ -1,33 +1,42 @@
<template>
<view class="content">
<view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
- <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸蹭笂浼犲垪琛�</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">
+ {{ $t("ICStockBillMainList.cacheList") == "ICStockBillMainList.cacheList" ? "缂撳瓨鍒楄〃" : $t("ICStockBillMainList.cacheList") }}
+ </view>
+ <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">
+ {{ $t("ICStockBillMainList.uploadedList") == "ICStockBillMainList.uploadedList" ? "宸蹭笂浼犲垪琛�" : $t("ICStockBillMainList.uploadedList") }}
+ </view>
</view>
<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
<view class="form" v-if="tabs == 0">
<view class="buttons" @tap="add">
- <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
+ <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>
+ {{ $t("ICStockBillMainList.btnAdd") == "ICStockBillMainList.btnAdd" ? "鏂板" : $t("ICStockBillMainList.btnAdd") }}
</view>
</view>
<view class="form" v-if="tabs == 1">
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("ICStockBillMainList.billNo") == "ICStockBillMainList.billNo" ? "鍗曟嵁鍙�:" : $t("ICStockBillMainList.billNo") }}:</view>
<view class="right">
- <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ <input v-model="hform.HBillNo" :placeholder="$t('ICStockBillMainList.billNoPlaceholder') == 'ICStockBillMainList.billNoPlaceholder' ? '璇疯緭鍏ュ崟鎹彿' : $t('ICStockBillMainList.billNoPlaceholder')" />
</view>
</view>
<view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="title">{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿:" : $t("Gy.HMainSourceBillNo") }}:</view>
<view class="right">
- <input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ <input v-model="hform.HSourceBillNo" :placeholder="$t('ICStockBillMainList.sourceBillNoPlaceholder') == 'ICStockBillMainList.sourceBillNoPlaceholder' ? '璇疯緭鍏ユ簮鍗曞崟鍙�' : $t('ICStockBillMainList.sourceBillNoPlaceholder')" />
</view>
</view>
<view class="buttons">
- <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
- <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+ <button class="btn-a" size="mini" type="default" @tap="clear">
+ {{ $t("ICStockBillMainList.btn_Reset") == "ICStockBillMainList.btn_Reset" ? "閲嶇疆" : $t("ICStockBillMainList.btn_Reset") }}
+ </button>
+ <button class="btn-c" size="mini" type="default" @tap="search">
+ {{ $t("ICStockBillMainList.btn_Query") == "ICStockBillMainList.btn_Query" ? "鏌ヨ" : $t("ICStockBillMainList.btn_Query") }}
+ </button>
</view>
</view>
@@ -37,28 +46,30 @@
<uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
<view class="detail" v-if="item.鍒跺崟浜�">
- <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ <text>{{ $t("Gy.HMaker") == "Gy.HMaker" ? "鍒跺崟浜猴細" : $t("Gy.HMaker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鍗曟嵁鍐呯爜">
- <text>鍗曟嵁鍐呯爜锛�</text>{{item.鍗曟嵁鍐呯爜}}
+ <text>{{ $t("ICStockBillMainList.table_BillID") == "ICStockBillMainList.table_BillID" ? "鍗曟嵁鍐呯爜锛�" : $t("ICStockBillMainList.table_BillID") }}锛�</text>{{item.鍗曟嵁鍐呯爜}}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("Gy.HQty") == "Gy.HQty" ? "鏁伴噺锛�" : $t("Gy.HQty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("Gy.HMainSourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("Gy.CurrentOrganization") == "Gy.CurrentOrganization" ? "缁勭粐锛�" : $t("Gy.CurrentOrganization") }}锛�</text>{{item.缁勭粐}}
</view>
</view>
<view class="more">
<view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
- <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>缂栬緫
+ <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>
+ {{ $t("ICStockBillMainList.btn_Edit") == "ICStockBillMainList.btn_Edit" ? "缂栬緫" : $t("ICStockBillMainList.btn_Edit") }}
</view>
<view class="part" style="color: #da0000;" @tap.stop="del(item)">
- <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>鍒犻櫎
+ <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>
+ {{ $t("ICStockBillMainList.btn_Del") == "ICStockBillMainList.btn_Del" ? "鍒犻櫎" : $t("ICStockBillMainList.btn_Del") }}
</view>
</view>
</uni-card>
@@ -67,42 +78,50 @@
<uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
<view class="detail" v-if="item.鍒跺崟浜�">
- <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ <text>{{ $t("Gy.HMaker") == "Gy.HMaker" ? "鍒跺崟浜猴細" : $t("Gy.HMaker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("Gy.HQty") == "Gy.HQty" ? "鏁伴噺锛�" : $t("Gy.HQty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("Gy.HMainSourceBillNo") == "Gy.HMainSourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("Gy.HMainSourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.鐗╂枡浠ｇ爜">
- <text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
+ <text>{{ $t("ICStockBillMainList.table_MaterNumber") == "ICStockBillMainList.table_MaterNumber" ? "鐗╂枡浠ｇ爜锛�" : $t("ICStockBillMainList.table_MaterNumber") }}锛�</text>{{item.鐗╂枡浠ｇ爜}}
</view>
<view class="detail" v-if="item.鐗╂枡鍚嶇О">
- <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+ <text>{{ $t("ICStockBillMainList.table_MaterName") == "ICStockBillMainList.table_MaterName" ? "鐗╂枡鍚嶇О锛�" : $t("ICStockBillMainList.table_MaterName") }}锛�</text>{{item.鐗╂枡鍚嶇О}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ <text>{{ $t("ICStockBillMainList.table_MaterModel") == "ICStockBillMainList.table_MaterModel" ? "瑙勬牸鍨嬪彿锛�" : $t("ICStockBillMainList.table_MaterModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("Gy.CurrentOrganization") == "Gy.CurrentOrganization" ? "缁勭粐锛�" : $t("Gy.CurrentOrganization") }}锛�</text>{{item.缁勭粐}}
</view>
</view>
<view class="more">
<view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
- <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>鏄剧ず浜岀淮鐮�
+ <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>
+ {{ $t("ICStockBillMainList.btn_DisplayCode") == "ICStockBillMainList.btn_DisplayCode" ? "鏄剧ず浜岀淮鐮�" : $t("ICStockBillMainList.btn_DisplayCode") }}
</view>
<view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
- <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>鎾ら攢
+ <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>
+ {{ $t("ICStockBillMainList.btn_Revoke") == "ICStockBillMainList.btn_Revoke" ? "鎾ら攢" : $t("ICStockBillMainList.btn_Revoke") }}
</view>
</view>
</uni-card>
</view>
- <view class="over" v-if="!listData || listData.length == 0">鏆傛棤鏁版嵁</view>
- <view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
- <view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+ <view class="over" v-if="!listData || listData.length == 0">
+ {{ $t("ICStockBillMainList.noDate") == "ICStockBillMainList.noDate" ? "鏆傛棤鏁版嵁" : $t("ICStockBillMainList.noDate") }}
+ </view>
+ <view class="over" v-if="listData.length != 0 && listData.length != showList.length">
+ {{ $t("ICStockBillMainList.Loading") == "ICStockBillMainList.Loading" ? "鍔犺浇涓�..." : $t("ICStockBillMainList.Loading") }}
+ </view>
+ <view class="over" v-if="listData.length != 0 && listData.length == showList.length">
+ {{ $t("ICStockBillMainList.bottom") == "ICStockBillMainList.bottom" ? "宸插埌搴�" : $t("ICStockBillMainList.bottom") }}
+ </view>
<BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
</view>
</template>
@@ -117,7 +136,7 @@
serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
tabs:0,
urls:'/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
- MvarReportTitle:'閿�鍞��璐у崟缂撳瓨鍒楄〃',
+ MvarReportTitle: this.$t('ICStockBillMainList.reportTitle') == 'ICStockBillMainList.reportTitle' ? '閿�鍞��璐у崟缂撳瓨鍒楄〃' : this.$t('ICStockBillMainList.reportTitle'),
hform:{
HBillNo:'',
HSourceBillNo:'',
@@ -178,7 +197,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('ICStockBillMainList.requestFailed') == 'ICStockBillMainList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('ICStockBillMainList.requestFailed'),
icon:'none'
})
},
@@ -205,7 +224,7 @@
},
getList(){
uni.showLoading({
- title:'鍔犺浇涓�...'
+ title: this.$t('ICStockBillMainList.loadingTitle') == 'ICStockBillMainList.loadingTitle' ? '鍔犺浇涓�...' : this.$t('ICStockBillMainList.loadingTitle')
})
uni.request({
url: this.serverUrl + this.urls,
@@ -231,7 +250,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('ICStockBillMainList.requestFailed') == 'ICStockBillMainList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('ICStockBillMainList.requestFailed'),
icon:'none'
})
},
@@ -296,7 +315,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('ICStockBillMainList.requestFailed') == 'ICStockBillMainList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('ICStockBillMainList.requestFailed'),
icon:'none'
})
},
@@ -306,8 +325,8 @@
del(item){
// console.log(item.hmainid,uni.getStorageSync('HUserName'))
uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+ title: this.$t('ICStockBillMainList.confirmTitle') == 'ICStockBillMainList.confirmTitle' ? '鎻愮ず' : this.$t('ICStockBillMainList.confirmTitle'),
+ content: this.$t('ICStockBillMainList.delConfirm') == 'ICStockBillMainList.delConfirm' ? '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�' : this.$t('ICStockBillMainList.delConfirm'),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -334,7 +353,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('ICStockBillMainList.requestFailed') == 'ICStockBillMainList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('ICStockBillMainList.requestFailed'),
icon:'none'
})
},
@@ -349,8 +368,8 @@
revoke(item){
// console.log(item.hmainid,uni.getStorageSync('HUserName'))
uni.showModal({
- title: '鎻愮ず',
- content: '鏄惁纭鎾ら攢',
+ title: this.$t('ICStockBillMainList.confirmTitle') == 'ICStockBillMainList.confirmTitle' ? '鎻愮ず' : this.$t('ICStockBillMainList.confirmTitle'),
+ content: this.$t('ICStockBillMainList.revokeConfirm') == 'ICStockBillMainList.revokeConfirm' ? '鏄惁纭鎾ら攢' : this.$t('ICStockBillMainList.revokeConfirm'),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -377,7 +396,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('ICStockBillMainList.requestFailed') == 'ICStockBillMainList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('ICStockBillMainList.requestFailed'),
icon:'none'
})
},
@@ -504,5 +523,4 @@
}
}
}
-
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/zhijiediaobo/MoveStockBill.vue b/pages/zhijiediaobo/MoveStockBill.vue
index d8567db..cb86cdf 100644
--- a/pages/zhijiediaobo/MoveStockBill.vue
+++ b/pages/zhijiediaobo/MoveStockBill.vue
@@ -2,9 +2,9 @@
<view>
<view class="form">
<view class="form-item">
- <view class="title">鏉＄爜:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.BarCode") == "MoveStockBill_PDA.BarCode" ? "鏉＄爜" : $t("MoveStockBill_PDA.BarCode") }}:</view>
<view class="right" style="width: 380rpx;">
- <input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜"
+ <input :focus="barCodeFocus" v-model="hform.HBarCode":placeholder="placeholder_BarCode"
@confirm="getCode(hform.HBarCode)" />
</view>
<view class="icon-wrapper">
@@ -12,23 +12,23 @@
</view>
</view>
<view class="form-item">
- <view class="title">鏁伴噺:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.Qty") == "MoveStockBill_PDA.Qty" ? "鏁伴噺" : $t("MoveStockBill_PDA.Qty") }}:</view>
<view class="right">
- <input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
+ <input v-model="hform.HQty" :placeholder="placeholder_Qty" />
</view>
</view>
<view class="form-item">
- <view class="title">璋冨嚭浠撳簱:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.SCWarehouse") == "MoveStockBill_PDA.SCWarehouse" ? "璋冨嚭浠撳簱" : $t("MoveStockBill_PDA.SCWarehouse") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HSCWHName"
+ <uni-combox :candidates="arrayHWHName" :placeholder="placeholder_SCWarehouse" v-model="hform.HSCWHName"
@input="HSCWHNameChange" @confirm="HWHNameOutScan"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">璋冨嚭浠撲綅:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.SCStockPlace") == "MoveStockBill_PDA.SCStockPlace" ? "璋冨嚭浠撲綅" : $t("MoveStockBill_PDA.SCStockPlace") }}:</view>
<!-- TODO: 鍥涚淮灏旈渶瑕佹壂浠撲綅鐮� 甯﹀嚭浠撳簱浠撲綅淇℃伅锛屾牴鎹叕鍙稿垽鏂槸鍚﹂渶瑕佺鐢ㄤ粨浣� -->
<view class="right">
- <uni-combox :candidates="arrayHStockPlaceNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+ <uni-combox :candidates="arrayHStockPlaceNameComputed" :placeholder="placeholder_SCStockPlace"
v-model="hform.HOutStockPlaceName" @input="HOutStockPlaceNameChange"
@confirm="HStockPlaceOutNameScan"></uni-combox>
</view>
@@ -39,16 +39,16 @@
</view>
<view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
- <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鏉＄爜淇℃伅</view>
- <view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">涓嬫灦淇℃伅</view>
+ <view :class="tabs == 0 ? 'on' : ''" @tap="tabs = 0">{{ $t("MoveStockBill_PDA.selectSource") == "MoveStockBill_PDA.selectSource" ? "閫夋嫨婧愬崟" : $t("MoveStockBill_PDA.selectSource") }}</view>
+ <view :class="tabs == 1 ? 'on' : ''" @tap="tabs = 1">{{ $t("MoveStockBill_PDA.tableInfo") == "MoveStockBill_PDA.tableInfo" ? "琛ㄥご淇℃伅" : $t("MoveStockBill_PDA.tableInfo") }}</view>
+ <view :class="tabs == 2 ? 'on' : ''" @tap="tabs = 2">{{ $t("MoveStockBill_PDA.materInfo") == "MoveStockBill_PDA.materInfo" ? "鐗╂枡淇℃伅" : $t("MoveStockBill_PDA.materInfo") }}</view>
+ <view :class="tabs == 3 ? 'on' : ''" @tap="tabs = 3">{{ $t("MoveStockBill_PDA.barInfo") == "MoveStockBill_PDA.barInfo" ? "鏉＄爜淇℃伅" : $t("MoveStockBill_PDA.barInfo") }}</view>
+ <view :class="tabs == 4 ? 'on' : ''" @tap="tabs = 4">{{ $t("MoveStockBill_PDA.removeShelvesInfo") == "MoveStockBill_PDA.removeShelvesInfo" ? "涓嬫灦淇℃伅" : $t("MoveStockBill_PDA.removeShelvesInfo") }}</view>
</view>
<view v-if="tabs == 0">
<view class="form-item">
- <view class="title">婧愬崟绫诲瀷:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.SourceBillType") == "MoveStockBill_PDA.SourceBillType" ? "婧愬崟绫诲瀷" : $t("MoveStockBill_PDA.SourceBillType") }}:</view>
<view class="right" v-show="showHMainSourceBillType">
<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
@change="HMainSourceBillTypeChange">
@@ -63,25 +63,28 @@
</view>
</view>
<view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.SourceBillNo") == "MoveStockBill_PDA.SourceBillNo" ? "婧愬崟鍗曞彿" : $t("MoveStockBill_PDA.SourceBillNo") }}:</view>
<view class="right" v-show="showHSourceBillNo">
<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
<input :focus="HSourcebillNoFocus" type="text" @confirm="onHSourceBillNoConfirmHandler"
- name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ name="HSourceBillNo" v-model="hform.HSourceBillNo" :placeholder="placeholder_SourceBillNo" />
+ </view>
+ <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+ <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
</view>
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
</view>
<view class="righton" v-show="!showHSourceBillNo">
- <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" :placeholder="placeholder_SourceBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁瀛愮被鍨�:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.BillSubType") == "MoveStockBill_PDA.BillSubType" ? "鍗曟嵁瀛愮被鍨�" : $t("MoveStockBill_PDA.BillSubType") }}:</view>
<view class="right">
<picker :range="arrayHBillSubType" v-model="hform.HBillSubType" @change="HBillSubTypeChange">
<input disabled name="HMainSourceBillType" v-model="HBillSubType" placeholder="璇烽�夋嫨鍗曟嵁瀛愮被鍨�" />
@@ -91,42 +94,42 @@
</view>
<view class="form-item">
- <view class="title">鍏堣繘鍏堝嚭浠�:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.FIFOwarehouse") == "MoveStockBill_PDA.FIFOwarehouse" ? "鍏堣繘鍏堝嚭浠�" : $t("MoveStockBill_PDA.FIFOwarehouse") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨" v-model="hform.HFIFOWHName"
+ <uni-combox :candidates="arrayHWHName" :placeholder="placeholder_FIFOwarehouse" v-model="hform.HFIFOWHName"
@input="HFIFOWHNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">璋冩嫧绫诲瀷:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.TransferType") == "MoveStockBill_PDA.TransferType" ? "璋冩嫧绫诲瀷" : $t("MoveStockBill_PDA.TransferType") }}:</view>
<!-- <view class="right" v-show="showHMainSourceBillType">
<uni-combox :candidates="HStockStyleArray" placeholder="璇烽�夋嫨" v-model="hform.HStockStyle"
@input="HStockStyleChange"></uni-combox>
</view> -->
<view class="righton">
- <input name="HStockStyle" disabled v-model="hform.HStockStyle" placeholder="璇烽�夋嫨璋冩嫧绫诲瀷" />
+ <input name="HStockStyle" disabled v-model="hform.HStockStyle" :placeholder="placeholder_TransferType" />
</view>
</view>
<view class="form-item">
- <view class="title">璋冩嫧鏂瑰悜:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.TransferDirection") == "MoveStockBill_PDA.TransferDirection" ? "璋冩嫧鏂瑰悜" : $t("MoveStockBill_PDA.TransferDirection") }}:</view>
<!-- <view class="right" v-show="showHMainSourceBillType">
<uni-combox :candidates="arrayHTransferDirect" placeholder="璇烽�夋嫨" v-model="hform.HTransferDirect"
@input="HTransferDirectChange"></uni-combox>
</view> -->
<view class="righton">
- <input name="HTransferDirect" disabled v-model="hform.HTransferDirect" placeholder="璇烽�夋嫨璋冩嫧鏂瑰悜" />
+ <input name="HTransferDirect" disabled v-model="hform.HTransferDirect" :placeholder="placeholder_TransferDirection" />
</view>
</view>
<view class="form-item">
- <view class="title">鍑鸿揣绫诲瀷:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.OutboundType") == "MoveStockBill_PDA.OutboundType" ? "鍑鸿揣绫诲瀷" : $t("MoveStockBill_PDA.OutboundType") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHShipType" placeholder="璇烽�夋嫨" v-model="hform.HShipType"
+ <uni-combox :candidates="arrayHShipType" :placeholder="placeholder_OutboundType" v-model="hform.HShipType"
@input="HShipTypeChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">鏃ユ湡:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.Date") == "MoveStockBill_PDA.Date" ? "鏃ユ湡" : $t("MoveStockBill_PDA.Date") }}:</view>
<view class="right">
<picker mode="date" v-model="hform.HDate" @change="HDateChange">
<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
@@ -135,13 +138,13 @@
</view>
</view>
<view class="form-item">
- <view class="title">鍒跺崟浜�:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.Maker") == "MoveStockBill_PDA.Maker" ? "鍒跺崟浜�" : $t("MoveStockBill_PDA.Maker") }}:</view>
<view class="righton">
<input name="HMaker" disabled v-model="hform.HMaker" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.BillNo") == "MoveStockBill_PDA.BillNo" ? "鍗曟嵁鍙�" : $t("MoveStockBill_PDA.BillNo") }}:</view>
<view class="righton">
<input name="HBillNo" disabled v-model="hform.HBillNo" />
</view>
@@ -150,7 +153,7 @@
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁ID:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.BillID") == "MoveStockBill_PDA.BillID" ? "鍗曟嵁ID" : $t("MoveStockBill_PDA.BillID") }}:</view>
<view class="righton">
<input name="HInterID" disabled v-model="hform.HInterID" />
</view>
@@ -159,17 +162,17 @@
<view v-if="tabs == 1">
<view class="form-item">
- <view class="title">璋冨叆浠撳簱:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.DCWarehouse") == "MoveStockBill_PDA.DCWarehouse" ? "璋冨叆浠撳簱" : $t("MoveStockBill_PDA.DCWarehouse") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHWHInName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+ <uni-combox :candidates="arrayHWHInName" :placeholder="placeholder_DCWarehouse" v-model="hform.HWHName"
@input="HWHInNameChange" @confirm="HWHNameInScan"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">璋冨叆浠撲綅:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.DCStockPlace") == "MoveStockBill_PDA.DCStockPlace" ? "璋冨叆浠撲綅" : $t("MoveStockBill_PDA.DCStockPlace") }}:</view>
<!-- TODO: 娣诲姞鍏徃鍒ゆ柇锛屽洓缁村皵娓呴櫎浠撲綅鎵爜闄愬埗锛屽叾浠栫収鏃� -->
<view class="right">
- <uni-combox :candidates="arrayHStockPlaceInNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+ <uni-combox :candidates="arrayHStockPlaceInNameComputed" :placeholder="placeholder_DCStockPlace"
v-model="hform.HStockPlaceName" @input="HStockPlaceInNameChange"
@confirm="HStockPlaceNameInScan"></uni-combox>
</view>
@@ -178,40 +181,40 @@
</view> -->
</view>
<view class="form-item">
- <view class="title">淇濈:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.Keeper") == "MoveStockBill_PDA.Keeper" ? "淇濈" : $t("MoveStockBill_PDA.Keeper") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
+ <uni-combox :candidates="arrayHEmpName" :placeholder="placeholder_Keeper" v-model="hform.HKeeperName"
@input="HKeeperNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">楠屾敹:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.SecManager") == "MoveStockBill_PDA.SecManager" ? "楠屾敹" : $t("MoveStockBill_PDA.SecManager") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
+ <uni-combox :candidates="arrayHEmpName" :placeholder="placeholder_SecManager" v-model="hform.HSecManagerName"
@input="HSecManagerNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">閮ㄩ棬:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.Dept") == "MoveStockBill_PDA.Dept" ? "閮ㄩ棬" : $t("MoveStockBill_PDA.Dept") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+ <uni-combox :candidates="arrayHDeptName" :placeholder="placeholder_Dept" v-model="hform.HDeptName"
@input="HDeptNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">瀹㈡埛:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.Customer") == "MoveStockBill_PDA.Customer" ? "瀹㈡埛" : $t("MoveStockBill_PDA.Customer") }}:</view>
<!-- <view class="right" v-show="showHSupName">
<uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨瀹㈡埛" v-model="hform.HSupName"
@input="HSupNameChange"></uni-combox>
</view> -->
<view class="righton">
- <input name="HSupName" disabled v-model="hform.HSupName" placeholder="璇烽�夋嫨瀹㈡埛" />
+ <input name="HSupName" disabled v-model="hform.HSupName" :placeholder="placeholder_Customer" />
</view>
</view>
<view class="form-item">
- <view class="title">渚涘簲鍟�:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.Supplier") == "MoveStockBill_PDA.Supplier" ? "渚涘簲鍟�" : $t("MoveStockBill_PDA.Supplier") }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHCusName" placeholder="璇烽�夋嫨渚涘簲鍟�" v-model="hform.HCusName"
+ <uni-combox :candidates="arrayHCusName" :placeholder="placeholder_Supplier" v-model="hform.HCusName"
@input="HCusNameChange"></uni-combox>
</view>
<!-- <view class="righton" v-show="!showHSupName">
@@ -220,13 +223,13 @@
</view>
<!-- TODO: 璺ㄧ粍缁囪皟鐢ㄥ彲淇敼 閫変腑缁勭粐鍚庯紝浠撳簱浠撲綅涔熻鍙戠敓鍙樺寲 -->
<view class="form-item">
- <view class="title">璋冨嚭缁勭粐:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.OutStockOrg") == "MoveStockBill_PDA.OutStockOrg" ? "璋冨嚭缁勭粐" : $t("MoveStockBill_PDA.OutStockOrg") }}:</view>
<view class="righton">
<input name="HStockOutOrgName" disabled v-model="hform.HStockOutOrgName" />
</view>
</view>
<view class="form-item">
- <view class="title">璋冨叆缁勭粐:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.InStockOrg") == "MoveStockBill_PDA.InStockOrg" ? "璋冨叆缁勭粐" : $t("MoveStockBill_PDA.InStockOrg") }}:</view>
<view class="right" v-show="!HIsStockInner">
<uni-combox :candidates="arrayHOrgName" placeholder="璇烽�夋嫨璋冨叆缁勭粐" v-model="hform.HStockInOrgName"
@input="HStockInOrgNameChange"></uni-combox>
@@ -242,27 +245,27 @@
<uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠ｇ爜" style="margin: 10px;" @tap="delMater(item)">
<view class="card-detail">
<view class="detail">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("MoveStockBill_PDA.table_SourceBillNo") == "MoveStockBill_PDA.table_SourceBillNo" ? "婧愬崟鍗曞彿" : $t("MoveStockBill_PDA.table_SourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail">
- <text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
+ <text>{{ $t("MoveStockBill_PDA.table_SourceBillQty") == "MoveStockBill_PDA.table_SourceBillQty" ? "婧愬崟鏁伴噺" : $t("MoveStockBill_PDA.table_SourceBillQty") }}锛�</text>{{item.婧愬崟鏁伴噺}}
</view>
<view class="detail">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("MoveStockBill_PDA.table_BarQty") == "MoveStockBill_PDA.table_BarQty" ? "鏁伴噺" : $t("MoveStockBill_PDA.table_BarQty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail">
- <text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
+ <text>{{ $t("MoveStockBill_PDA.table_BarNum") == "MoveStockBill_PDA.table_BarNum" ? "鏉＄爜涓暟" : $t("MoveStockBill_PDA.table_BarNum") }}锛�</text>{{item.鏉＄爜涓暟}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ <text>{{ $t("MoveStockBill_PDA.table_MaterModel") == "MoveStockBill_PDA.table_MaterModel" ? "瑙勬牸鍨嬪彿" : $t("MoveStockBill_PDA.table_MaterModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
<view class="detail" v-if="item.杈呭姪灞炴��">
- <text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+ <text>{{ $t("MoveStockBill_PDA.table_Aux") == "MoveStockBill_PDA.table_Aux" ? "杈呭姪灞炴��" : $t("MoveStockBill_PDA.table_Aux") }}锛�</text>{{item.杈呭姪灞炴�}
</view>
</view>
</uni-card>
</view>
- <view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="Materlist.length == 0">{{ $t("MoveStockBill_PDA.noData") == "MoveStockBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("MoveStockBill_PDA.noData") }}</view>
</view>
<view v-if="tabs == 4">
@@ -271,95 +274,95 @@
@tap="delMater(item)">
<view class="card-detail">
<view class="detail">
- <text>鏁伴噺锛�</text>{{item.HQty}}
+ <text>{{ $t("MoveStockBill_PDA.Qty") == "MoveStockBill_PDA" ? "鏁伴噺" : $t("MoveStockBill_PDA.Qty") }}锛�</text>{{item.HQty}}
</view>
<view class="detail">
- <text>涓嬫灦鏁伴噺锛�</text>{{item.HQtyMust}}
+ <text>{{ $t("MoveStockBill_PDA.PutawayQty") == "MoveStockBill_PDA.PutawayQty" ? "涓嬫灦鏁伴噺" : $t("MoveStockBill_PDA.PutawayQty") }}锛�</text>{{item.HQtyMust}}
</view>
<view class="detail">
- <text>浠撳簱锛�</text>{{item.HWhName}}
+ <text>{{ $t("MoveStockBill_PDA.Warehouse") == "MoveStockBill_PDA.Warehouse" ? "浠撳簱" : $t("MoveStockBill_PDA.Warehouse") }}锛�</text>{{item.HWhName}}
</view>
<view class="detail">
- <text>浠撲綅锛�</text>{{item.HSPName}}
+ <text>{{ $t("MoveStockBill_PDA.StockPlace") == "MoveStockBill_PDA.StockPlace" ? "浠撲綅" : $t("MoveStockBill_PDA.StockPlace") }}锛�</text>{{item.HSPName}}
</view>
<view class="detail">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.HMaterModel}}
+ <text>{{ $t("MoveStockBill_PDA.MaterModel") == "MoveStockBill_PDA.MaterModel" ? "瑙勬牸鍨嬪彿" : $t("MoveStockBill_PDA.MaterModel") }}锛�</text>{{item.HMaterModel}}
</view>
<view class="detail" v-if="item.HBatchNo">
- <text>鎵瑰彿锛�</text>{{item.HBatchNo}}
+ <text>{{ $t("MoveStockBill_PDA.BatchNo") == "MoveStockBill_PDA.BatchNo" ? "鎵瑰彿" : $t("MoveStockBill_PDA.BatchNo") }}锛�</text>{{item.HBatchNo}}
</view>
<view class="detail" v-if="item.HAuxPropName">
- <text>杈呭姪灞炴�э細</text>{{item.HAuxPropName}}
+ <text>{{ $t("MoveStockBill_PDA.table_Aux") == "MoveStockBill_PDA.table_Aux" ? "杈呭姪灞炴��" : $t("MoveStockBill_PDA.table_Aux") }}锛�</text>{{item.HAuxPropName}}
</view>
</view>
</uni-card>
</view>
- <view class="over" v-if="FIFOlist.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="FIFOlist.length == 0">{{ $t("MoveStockBill_PDA.noData") == "MoveStockBill_PDA.noData" ? "鏆傛棤鏁版嵁" : $t("MoveStockBill_PDA.noData") }}</view>
</view>
<view v-if="tabs == 3">
<view class="form-item">
- <view class="title">鏉＄爜:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.BarCode") == "MoveStockBill_PDA.BarCode" ? "鏉＄爜" : $t("MoveStockBill_PDA.BarCode") }}:</view>
<view class="righton">
<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鐗╂枡:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.Material") == "MoveStockBill_PDA.Material" ? "鐗╂枡" : $t("MoveStockBill_PDA.Material") }}:</view>
<view class="righton">
<input disabled v-model="hform.HMaterName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">瑙勬牸:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.MaterModel") == "MoveStockBill_PDA.MaterModel" ? "瑙勬牸" : $t("MoveStockBill_PDA.MaterModel") }}:</view>
<view class="righton">
<input disabled v-model="hform.HMaterModel_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鎵规:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.BatchNo") == "MoveStockBill_PDA.BatchNo" ? "鎵规" : $t("MoveStockBill_PDA.BatchNo") }}:</view>
<view class="righton">
<input disabled v-model="hform.HBatchNo_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曚綅:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.Unit") == "MoveStockBill_PDA.Unit" ? "鍗曚綅" : $t("MoveStockBill_PDA.Unit") }}:</view>
<view class="righton">
<input disabled v-model="hform.HUnitName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鏁伴噺:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.Qty") == "MoveStockBill_PDA.Qty" ? "鏁伴噺" : $t("MoveStockBill_PDA.Qty") }}:</view>
<view class="righton">
<input disabled v-model="hform.HQty_B" />
</view>
</view>
<view class="form-item">
- <view class="title">瀹归噺:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.Capacity") == "MoveStockBill_PDA.Capacity" ? "瀹归噺" : $t("MoveStockBill_PDA.Capacity") }}:</view>
<view class="righton">
<input disabled v-model="hform.HTMQty_B" />
</view>
</view>
<view class="form-item">
- <view class="title">璋冨叆浠撳簱:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.DCWarehouse") == "MoveStockBill_PDA.DCWarehouse" ? "璋冨叆浠撳簱" : $t("MoveStockBill_PDA.DCWarehouse") }}:</view>
<view class="righton">
<input disabled v-model="hform.HWHName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">璋冨叆浠撲綅:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.DCStockPlace") == "MoveStockBill_PDA.DCStockPlace" ? "璋冨叆浠撲綅" : $t("MoveStockBill_PDA.DCStockPlace") }}:</view>
<view class="righton">
<input disabled v-model="hform.HSPName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">璋冨嚭浠撳簱:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.SCWarehouse") == "MoveStockBill_PDA.SCWarehouse" ? "璋冨嚭浠撳簱" : $t("MoveStockBill_PDA.SCWarehouse") }}:</view>
<view class="righton">
<input disabled v-model="hform.HSCWHName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">璋冨嚭浠撲綅:</view>
+ <view class="title">{{ $t("MoveStockBill_PDA.SCStockPlace") == "MoveStockBill_PDA.SCStockPlace" ? "璋冨嚭浠撲綅" : $t("MoveStockBill_PDA.SCStockPlace") }}:</view>
<view class="righton">
<input disabled v-model="hform.HSCSPName_B" />
</view>
@@ -367,10 +370,10 @@
</view>
<view class="bottom-btn">
- <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button class="btn-a" size="mini" @tap="submit">{{ $t("MoveStockBill_PDA.btnSubmit") == "MoveStockBill_PDA.btnSubmit" ? "鎻愪氦" : $t("MoveStockBill_PDA.btnSubmit") }}</button>
<view style="flex: 1;"></view>
- <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
- <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ <button class="btn-a" size="mini" @tap="addNew">{{ $t("MoveStockBill_PDA.btnAdd") == "MoveStockBill_PDA.btnAdd" ? "鏂板" : $t("MoveStockBill_PDA.btnAdd") }}</button>
+ <button class="btn-c" size="mini" @tap="goBack">{{ $t("MoveStockBill_PDA.btnExit") == "MoveStockBill_PDA.btnExit" ? "閫�鍑�" : $t("MoveStockBill_PDA.btnExit") }}</button>
</view>
</view>
<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
@@ -392,6 +395,7 @@
getUserStockRelation
} from '../../utils/userRelationManager';
import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+ import { MpaasScan } from '../../utils/mpaasScan';
export default {
data() {
return {
@@ -522,7 +526,23 @@
HTMQty_B: '',
HWHName_B: '',
HSPName_B: '',
- }
+ },
+ placeholder_BarCode:this.$t("MoveStockBill_PDA.placeholder_BarCode") == "MoveStockBill_PDA.placeholder_BarCode" ? "璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" : this.$t("MoveStockBill_PDA.placeholder_BarCode"),
+ placeholder_Qty:this.$t("MoveStockBill_PDA.placeholder_Qty") == "MoveStockBill_PDA.placeholder_Qty" ? "璇疯緭鍏ユ暟閲�" : this.$t("MoveStockBill_PDA.placeholder_Qty"),
+ placeholder_DCWarehouse:this.$t("MoveStockBill_PDA.placeholder_DCWarehouse") == "MoveStockBill_PDA.placeholder_DCWarehouse" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" : this.$t("MoveStockBill_PDA.placeholder_DCWarehouse"),
+ placeholder_DCStockPlace:this.$t("MoveStockBill_PDA.placeholder_DCStockPlace") == "MoveStockBill_PDA.placeholder_DCStockPlace" ? "璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" : this.$t("MoveStockBill_PDA.placeholder_DCStockPlace"),
+ placeholder_SourceBillNo:this.$t("MoveStockBill_PDA.placeholder_SourceBillNo") == "MoveStockBill_PDA.placeholder_SourceBillNo" ? "璇疯緭鍏ユ簮鍗曞崟鍙�" : this.$t("MoveStockBill_PDA.placeholder_SourceBillNo"),
+ placeholder_FIFOwarehouse:this.$t("MoveStockBill_PDA.placeholder_FIFOwarehouse") == "MoveStockBill_PDA.placeholder_FIFOwarehouse" ? "璇烽�夋嫨" : this.$t("MoveStockBill_PDA.placeholder_FIFOwarehouse"),
+ placeholder_OutboundType:this.$t("MoveStockBill_PDA.placeholder_OutboundType") == "MoveStockBill_PDA.placeholder_OutboundType" ? "璇烽�夋嫨" : this.$t("MoveStockBill_PDA.placeholder_OutboundType"),
+ placeholder_TransferDirection:this.$t("MoveStockBill_PDA.placeholder_TransferDirection") == "MoveStockBill_PDA.placeholder_TransferDirection" ? "璇烽�夋嫨璋冩嫧鏂瑰悜" : this.$t("MoveStockBill_PDA.placeholder_TransferDirection"),
+ placeholder_TransferType:this.$t("MoveStockBill_PDA.placeholder_TransferType") == "MoveStockBill_PDA.placeholder_TransferType" ? "璇烽�夋嫨璋冩嫧绫诲瀷" : this.$t("MoveStockBill_PDA.placeholder_TransferType"),
+ placeholder_SCWarehouse:this.$t("MoveStockBill_PDA.placeholder_SCWarehouse") == "MoveStockBill_PDA.placeholder_SCWarehouse" ? "璇烽�夋嫨璋冨嚭浠撳簱" : this.$t("MoveStockBill_PDA.placeholder_SCWarehouse"),
+ placeholder_SCStockPlace:this.$t("MoveStockBill_PDA.placeholder_SCStockPlace") == "MoveStockBill_PDA.placeholder_SCStockPlace" ? "璇烽�夋嫨璋冨嚭浠撲綅" : this.$t("MoveStockBill_PDA.placeholder_SCStockPlace"),
+ placeholder_SecManager:this.$t("MoveStockBill_PDA.placeholder_SecManager") == "MoveStockBill_PDA.placeholder_SecManager" ? "璇烽�夋嫨楠屾敹鍛�" : this.$t("MoveStockBill_PDA.placeholder_SecManager"),
+ placeholder_Keeper:this.$t("MoveStockBill_PDA.placeholder_Keeper") == "MoveStockBill_PDA.placeholder_Keeper" ? "璇烽�夋嫨淇濈鍛�" : this.$t("MoveStockBill_PDA.placeholder_Keeper"),
+ placeholder_Dept:this.$t("MoveStockBill_PDA.placeholder_Dept") == "MoveStockBill_PDA.placeholder_Dept" ? "璇烽�夋嫨閮ㄩ棬" : this.$t("MoveStockBill_PDA.placeholder_Dept"),
+ placeholder_Supplier:this.$t("MoveStockBill_PDA.placeholder_Supplier") == "MoveStockBill_PDA.placeholder_Supplier" ? "璇烽�夋嫨渚涘簲鍟�" : this.$t("MoveStockBill_PDA.placeholder_Supplier"),
+ placeholder_Customer:this.$t("MoveStockBill_PDA.placeholder_Customer") == "MoveStockBill_PDA.placeholder_Customer" ? "璇烽�夋嫨瀹㈡埛" : this.$t("MoveStockBill_PDA.placeholder_Customer")
}
},
components: {
@@ -531,8 +551,11 @@
},
async onLoad(e) {
- await this.getOrganization()
- await this.GetSourceBillType()
+ uni.setNavigationBarTitle({
+ title: this.$t("MoveStockBill_PDA.title")
+ })
+ console.log(e, this.userInfo)
+ this.OperationType = e.OperationType
await this.set_InitBillSubType()
// 纭繚 鍗曟嵁瀛愮被鍨嬪厛浜� 璇诲彇鍗曟嵁淇℃伅杩涜锛岄槻姝㈡椂搴忛棶棰�
console.log(e, this.userInfo)
@@ -552,7 +575,7 @@
this.getHSupList()
this.getHEmpList()
this.getHDeptList()
-
+ await this.GetSourceBillType()
this.InitTransferDirect()
this.InitShipType()
@@ -597,6 +620,11 @@
}
},
methods: {
+ toScanBillCode() {
+ MpaasScan.scanCode((res) => {
+ this.getHBarCodeData(res)
+ })
+ },
//鑾峰彇渚涘簲鍟嗘暟鎹�
getHCusList() {
if (!this.hform.HStockOrgID) {
@@ -1044,7 +1072,7 @@
for (var i = 0; i < res.data.data.length; i++) {
this.arrayHWHInName[i] = res.data.data[i].浠撳簱鍚嶇О
}
-
+
this.HWHInNameChange(getUserInfo()["HSCWHName"])
} else {
uni.showToast({
@@ -1235,7 +1263,12 @@
this.arrayHMainSourceBillType = []
this.arrayHMainSourceBillValue = []
Array.from(data).forEach(e => {
- this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
+ for(var j = 0; j < this.$t("MoveStockBill_PDA.select option").length; j++){
+ let HSourceBillType_FY = this.$t("MoveStockBill_PDA.select option[" + j + "]").split("@");
+ if(e['HSourceBillType'] == HSourceBillType_FY[0]){
+ this.arrayHMainSourceBillType.push(HSourceBillType_FY[1])
+ }
+ }
this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
})
@@ -1427,13 +1460,13 @@
},
//閫夋嫨婧愬崟绫诲瀷
HMainSourceBillTypeChange(e) {
- console.log('e: ',e);
+ console.log('e: ', e);
let index = e.detail.value
if (index != -1) {
this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[index]
}
-
+
},
//鑾峰彇渚涘簲鍟嗘暟鎹�
@@ -2045,7 +2078,7 @@
console.log(33, res.data.data[0]);
if (res.data.count == 1) {
var data = res.data.data[0]
-
+
this.hform.HInterID = data.HInterID
this.hform.HBillNo = data.HBillNo
this.hform.HMainSourceBillType = data.HSourceBillType
diff --git a/pages/zhijiediaobo/MoveStockBillList.vue b/pages/zhijiediaobo/MoveStockBillList.vue
index 295e427..dfb2010 100644
--- a/pages/zhijiediaobo/MoveStockBillList.vue
+++ b/pages/zhijiediaobo/MoveStockBillList.vue
@@ -1,33 +1,33 @@
<template>
<view class="content">
<view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
- <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸蹭笂浼犲垪琛�</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">{{ $t("MoveStockBillList_PDA.cacheList") == "MoveStockBillList_PDA.cacheList" ? "缂撳瓨鍒楄〃" : $t("MoveStockBillList_PDA.cacheList") }}</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">{{ $t("MoveStockBillList_PDA.updatedList") == "MoveStockBillList_PDA.updatedList" ? "宸蹭笂浼犲垪琛�" : $t("MoveStockBillList_PDA.updatedList") }}</view>
</view>
<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
<view class="form" v-if="tabs == 0">
<view class="buttons" @tap="add">
- <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
+ <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>{{ $t("MoveStockBillList_PDA.btnAdd") == "MoveStockBillList_PDA.btnAdd" ? "鏂板" : $t("MoveStockBillList_PDA.btnAdd") }}
</view>
</view>
<view class="form" v-if="tabs == 1">
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("MoveStockBillList_PDA.billNo") == "MoveStockBillList_PDA.billNo" ? "鍗曟嵁鍙�" : $t("MoveStockBillList_PDA.billNo") }}:</view>
<view class="right">
- <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ <input v-model="hform.HBillNo" :placeholder="billNoPlaceholder" />
</view>
</view>
<view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="title">{{ $t("MoveStockBillList_PDA.sourceBillNo") == "MoveStockBillList_PDA.sourceBillNo" ? "婧愬崟鍗曞彿" : $t("MoveStockBillList_PDA.sourceBillNo") }}:</view>
<view class="right">
- <input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ <input v-model="hform.HSourceBillNo" :placeholder="sourceBillNoPlaceholder" />
</view>
</view>
<view class="buttons">
- <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
- <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+ <button class="btn-a" size="mini" type="default" @tap="clear">{{ $t("MoveStockBillList_PDA.btn_Reset") == "MoveStockBillList_PDA.btn_Reset" ? "閲嶇疆" : $t("MoveStockBillList_PDA.btn_Reset") }}</button>
+ <button class="btn-c" size="mini" type="default" @tap="search">{{ $t("MoveStockBillList_PDA.btn_Query") == "MoveStockBillList_PDA.btn_Query" ? "鏌ヨ" : $t("MoveStockBillList_PDA.btn_Query") }}</button>
</view>
</view>
@@ -38,28 +38,28 @@
@tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
<view class="detail" v-if="item.鍒跺崟浜�">
- <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ <text>{{ $t("MoveStockBillList_PDA.table_Maker") == "MoveStockBillList_PDA.table_Maker" ? "鍒跺崟浜�" : $t("MoveStockBillList_PDA.table_Maker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鍗曟嵁鍐呯爜">
- <text>鍗曟嵁鍐呯爜锛�</text>{{item.鍗曟嵁鍐呯爜}}
+ <text>{{ $t("MoveStockBillList_PDA.table_BillID") == "MoveStockBillList_PDA.table_BillID" ? "鍗曟嵁鍐呯爜" : $t("MoveStockBillList_PDA.table_BillID") }}锛�</text>{{item.鍗曟嵁鍐呯爜}}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("MoveStockBillList_PDA.table_Qty") == "MoveStockBillList_PDA.table_Qty" ? "鏁伴噺" : $t("MoveStockBillList_PDA.table_Qty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("MoveStockBillList_PDA.table_SourceBillNo") == "MoveStockBillList_PDA.table_SourceBillNo" ? "婧愬崟鍗曞彿" : $t("MoveStockBillList_PDA.table_SourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("MoveStockBillList_PDA.table_Org") == "MoveStockBillList_PDA.table_Org" ? "缁勭粐" : $t("MoveStockBillList_PDA.table_Org") }}锛�</text>{{item.缁勭粐}}
</view>
</view>
<view class="more">
<view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
- <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>缂栬緫
+ <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>{{ $t("MoveStockBillList_PDA.btn_Edit") == "MoveStockBillList_PDA.btn_Edit" ? "缂栬緫" : $t("MoveStockBillList_PDA.btn_Edit") }}
</view>
<view class="part" style="color: #da0000;" @tap.stop="del(item)">
- <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>鍒犻櫎
+ <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>{{ $t("MoveStockBillList_PDA.btn_Del") == "MoveStockBillList_PDA.btn_Del" ? "鍒犻櫎" : $t("MoveStockBillList_PDA.btn_Del") }}
</view>
</view>
</uni-card>
@@ -69,45 +69,45 @@
@tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
<view class="detail" v-if="item.鐘舵��">
- <text>鐘舵�侊細</text>{{item.鐘舵�亇}
+ <text>{{ $t("MoveStockBillList_PDA.table_Status") == "MoveStockBillList_PDA.table_Status" ? "鐘舵��" : $t("MoveStockBillList_PDA.table_Status") }}锛�</text>{{item.鐘舵�亇}
</view>
- <view class="detail" v-if="item.鍒跺崟浜�">
- <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
- </view>
- <view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
- </view>
- <view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
- </view>
- <view class="detail" v-if="item.鐗╂枡浠ｇ爜">
- <text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
- </view>
- <view class="detail" v-if="item.鐗╂枡鍚嶇О">
- <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
- </view>
- <view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
- </view>
- <view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
- </view>
+ <view class="detail" v-if="item.鍒跺崟浜�">
+ <text>{{ $t("MoveStockBillList_PDA.table_Maker") == "MoveStockBillList_PDA.table_Maker" ? "鍒跺崟浜�" : $t("MoveStockBillList_PDA.table_Maker") }}锛�</text>{{item.鍒跺崟浜簘}
+ </view>
+ <view class="detail" v-if="item.鏁伴噺">
+ <text>{{ $t("MoveStockBillList_PDA.table_Qty") == "MoveStockBillList_PDA.table_Qty" ? "鏁伴噺" : $t("MoveStockBillList_PDA.table_Qty") }}锛�</text>{{item.鏁伴噺}}
+ </view>
+ <view class="detail" v-if="item.婧愬崟鍗曞彿">
+ <text>{{ $t("MoveStockBillList_PDA.sourceBillNo") == "MoveStockBillList_PDA.sourceBillNo" ? "婧愬崟鍗曞彿" : $t("MoveStockBillList_PDA.sourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
+ </view>
+ <view class="detail" v-if="item.鐗╂枡浠ｇ爜">
+ <text>{{ $t("MoveStockBillList_PDA.table_MaterNumber") == "MoveStockBillList_PDA.table_MaterNumber" ? "鐗╂枡浠ｇ爜" : $t("MoveStockBillList_PDA.table_MaterNumber") }}锛�</text>{{item.鐗╂枡浠ｇ爜}}
+ </view>
+ <view class="detail" v-if="item.鐗╂枡鍚嶇О">
+ <text>{{ $t("MoveStockBillList_PDA.table_MaterName") == "MoveStockBillList_PDA.table_MaterName" ? "鐗╂枡鍚嶇О" : $t("MoveStockBillList_PDA.table_MaterName") }}锛�</text>{{item.鐗╂枡鍚嶇О}}
+ </view>
+ <view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+ <text>{{ $t("MoveStockBillList_PDA.table_MaterModel") == "MoveStockBillList_PDA.table_MaterModel" ? "瑙勬牸鍨嬪彿" : $t("MoveStockBillList_PDA.table_MaterModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ </view>
+ <view class="detail" v-if="item.缁勭粐">
+ <text>{{ $t("MoveStockBillList_PDA.table_Org") == "MoveStockBillList_PDA.table_Org" ? "缁勭粐" : $t("MoveStockBillList_PDA.table_Org") }}锛�</text>{{item.缁勭粐}}
+ </view>
</view>
<view class="more">
<view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
- <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>鏄剧ず浜岀淮鐮�
+ <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>{{ $t("MoveStockBillList_PDA.btn_DisplayCode") == "MoveStockBillList_PDA.btn_DisplayCode" ? "鏄剧ず浜岀淮鐮�" : $t("MoveStockBillList_PDA.btn_DisplayCode") }}
</view>
<view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
- <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>鎾ら攢
+ <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>{{ $t("MoveStockBillList_PDA.btn_Revoke") == "MoveStockBillList_PDA.btn_Revoke" ? "鎾ら攢" : $t("MoveStockBillList_PDA.btn_Revoke") }}
</view>
</view>
</uni-card>
</view>
- <view class="over" v-if="!listData || listData.length == 0">鏆傛棤鏁版嵁</view>
- <view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
- <view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+ <view class="over" v-if="!listData || listData.length == 0">{{ $t("MoveStockBillList_PDA.noDate") == "MoveStockBillList_PDA.noDate" ? "鏆傛棤鏁版嵁" : $t("MoveStockBillList_PDA.noDate") }}</view>
+ <view class="over" v-if="listData.length != 0 && listData.length != showList.length">{{ $t("MoveStockBillList_PDA.Loading") == "MoveStockBillList_PDA.Loading" ? "鍔犺浇涓�..." : $t("MoveStockBillList_PDA.Loading") }}</view>
+ <view class="over" v-if="listData.length != 0 && listData.length == showList.length">{{ $t("MoveStockBillList_PDA.bottom") == "MoveStockBillList_PDA.bottom" ? "宸插埌搴�" : $t("MoveStockBillList_PDA.bottom") }}</view>
<BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
</view>
</template>
@@ -132,6 +132,8 @@
HMaker: uni.getStorageSync('HUserName'),
HStockOrgID: uni.getStorageSync('OrganizationID'),
},
+ billNoPlaceholder:this.$t("MoveStockBillList_PDA.billNoPlaceholder") == "MoveStockBillList_PDA.billNoPlaceholder" ? "璇疯緭鍏ュ崟鎹彿" : this.$t("MoveStockBillList_PDA.billNoPlaceholder"),
+ sourceBillNoPlaceholder:this.$t("MoveStockBillList.sourceBillNoPlaceholder") == "MoveStockBillList_PDA.sourceBillNoPlaceholder" ? "璇疯緭鍏ユ簮鍗曠紪鍙�" : this.$t("MoveStockBillList_PDA.sourceBillNoPlaceholder"),
sWhere: '',
listData: [],
showList: [],
@@ -144,6 +146,9 @@
BarCodePopupVue
},
onShow() {
+ uni.setNavigationBarTitle({
+ title: this.$t("MoveStockBillList_PDA.title")
+ })
//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
this.CheckModRight()
this.changeTab(0)
diff --git a/pages/ziwodaiban/todoMain.vue b/pages/ziwodaiban/todoMain.vue
index ab71bcf..3596b5a 100644
--- a/pages/ziwodaiban/todoMain.vue
+++ b/pages/ziwodaiban/todoMain.vue
@@ -51,7 +51,7 @@
let res = CommonUtils.doRequest2Sync({
url: '/ZWDBController/GetLIST',
data: {
- user: localStorage.getItem('HUserName'),
+ user: uni.getStorageSync('HUserName'),
OrgIDs: 100038
},
}).then(res => {
@@ -92,7 +92,7 @@
url: '/ZWDBController/insertTODOS',
data: {
- user: localStorage.getItem('HUserName'),
+ user: uni.getStorageSync('HUserName'),
contents: inputValue
},
@@ -124,7 +124,7 @@
return CommonUtils.doRequest2Sync({
url: '/ZWDBController/deleteTODOS',
data: {
- user: localStorage.getItem('HUserName'),
+ user: uni.getStorageSync('HUserName'),
HID: deleteID
},
diff --git a/utils/i18n.js b/utils/i18n.js
index 927b989..e5d1b00 100644
--- a/utils/i18n.js
+++ b/utils/i18n.js
@@ -42,7 +42,10 @@
title: "娓╅Θ鎻愮ず",
message: "[i18n]鑾峰彇璇█鍖呭け璐�: " + Message
})
- return
+ return {
+ data: [],
+ getRemoteFile: false
+ }
}
} catch (err) {
enableCollectMissingKey = false
@@ -82,7 +85,7 @@
MissingKeysMap[key] = Array.from(MissingKeysMap[key])
}
}
- CommonUtils.doRequest2Sync({
+ await CommonUtils.doRequest2Sync({
url: "/Xt_grdAlignment_WMES/syncMissingKeyToDB",
data: {
missingObj: JSON.stringify(MissingKeysMap)
@@ -95,12 +98,14 @@
// 閲嶅惎搴旂敤
const systemInfo = uni.getSystemInfoSync();
const platform = systemInfo.platform;
-
- if (platform === 'ios' || platform === 'android') {
- // App 绔細瀹屽叏閲嶅惎
- plus.runtime.restart();
- } else if (platform === 'h5') {
- // H5 绔細鍒锋柊椤甸潰
- window.location.reload();
- }
+ // #ifdef APP-PLUS
+ // App 绔細瀹屽叏閲嶅惎
+ plus.runtime.restart();
+ // #endif
+ // #ifdef H5
+ console.log('H5鍥炲埌鐧诲綍椤�: ');
+ uni.reLaunch({
+ url: '/pages/index/login'
+ })
+ // #endif
}
\ No newline at end of file
--
Gitblit v1.9.1