From 94cfe8943459fb434ea2a6971ee660ccc13f1ee5 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期六, 11 十月 2025 09:14:00 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/caigourukujiaoyan/form.vue | 4
pages/gongxuOutSendWork/table.vue | 365 ++++++++
pages/shouliaotongzhi/table.vue | 2
manifest.json | 5
pages.json | 15
main.js | 12
pages/gongxuOutSendWork/form.vue | 2143 +++++++++++++++++++++++++++++++++++++++++++++++++
pages/shouliaotongzhi/table_son.vue | 2
pages/shengchanlingliao/form.vue | 7
9 files changed, 2,545 insertions(+), 10 deletions(-)
diff --git a/main.js b/main.js
index 983fc86..75e4530 100644
--- a/main.js
+++ b/main.js
@@ -32,4 +32,14 @@
app
}
}
-// #endif
\ No newline at end of file
+// #endif
+// main.js uni.showToast 瀹炵幇鍏ㄥ眬鎷︽埅璁剧疆榛樿鎻愮ず鏃堕棿涓�3.5绉�
+const originalShowToast = uni.showToast;
+uni.showToast = (options) => {
+ originalShowToast({
+ duration: options.duration || 3500, // 榛樿2绉�
+ icon: options.icon || 'none',
+ title: options.title || 'none',
+ ...options
+ });
+};
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 8cbdab0..3772692 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,9 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "1.0.94",
- "versionCode" : 194,
+
+ "versionName" : "1.0.97",
+ "versionCode" : 197,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index 860ac2c..340b1cb 100644
--- a/pages.json
+++ b/pages.json
@@ -189,11 +189,24 @@
}
},
{
+ "path": "pages/gongxuOutSendWork/form",
+ "style": {
+ "navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�(娲惧伐)"
+ }
+ },
+ {
+ "path": "pages/gongxuOutSendWork/table",
+ "style": {
+ "navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�(娲惧伐)",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
"path": "pages/gongxuOut/moneystatistics",
"style": {
"navigationBarTitleText": "鎴戠殑宸ヨ祫(姹囨姤棰勪及)",
"enablePullDownRefresh": true
- }
+ }
},
{
"path": "pages/shebeiguanli/form",
diff --git a/pages/caigourukujiaoyan/form.vue b/pages/caigourukujiaoyan/form.vue
index c36b571..b98cfcb 100644
--- a/pages/caigourukujiaoyan/form.vue
+++ b/pages/caigourukujiaoyan/form.vue
@@ -4,7 +4,7 @@
<view class="form-item">
<view class="title">鏉＄爜:</view>
<view class="right">
- <input v-model="hform.HBarCode" :focus="HBarCodeFocus" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" @confirm="getCode(hform.HBarCode)" @blur="getCode(hform.HBarCode)" @input="handleInput" />
+ <input v-model="hform.HBarCode" :focus="HBarCodeFocus" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" @blur="getCode(hform.HBarCode)" @input="handleInput" />
</view>
<uni-icons type="scan"
style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
@@ -45,7 +45,7 @@
<view class="title">鍗曟嵁鍙�:</view>
<view class="right" style="width: 380rpx;">
<input name="HBillNo" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜"
- @confirm="GetMeesageByBillNo()" :focus="HBillNoFocus" @blur="GetMeesageByBillNo()"/>
+ :focus="HBillNoFocus" @blur="GetMeesageByBillNo()"/>
</view>
<uni-icons type="scan"
style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
diff --git a/pages/gongxuOutSendWork/form.vue b/pages/gongxuOutSendWork/form.vue
new file mode 100644
index 0000000..27a3014
--- /dev/null
+++ b/pages/gongxuOutSendWork/form.vue
@@ -0,0 +1,2143 @@
+<template>
+ <view>
+ <view class="form">
+ <view class="form-item">
+ <view class="title"><text>*</text>鏉″舰鐮�:</view>
+ <view class="right" style="width: 380rpx;">
+ <input name="HBarCode" v-model="hform.HBarCode" placeholder="璇锋壂鎻忔潯鐮�" @confirm="toInCode(e)" />
+ </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="right">
+ <uni-combox :candidates="arrayHSEQName" placeholder="璇烽�夋嫨搴忓垪" v-model="hform.HSEQName"
+ @input="HSEQNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title"><text>*</text>娴佹按鍙�:</view>
+ <view class="right" style="width: 380rpx;">
+ <input v-model="hform.HProcNo" placeholder="璇疯緭鍏�(鎴栨壂鎻�)娴佹按鍙�"
+ @blur="getHProcNoData2(hform.HBarCode,hform.HProcNo,hform.HSEQNumber)" />
+ </view>
+ <uni-icons type="scan"
+ style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+ size="20" @click="toScanProcNo"></uni-icons>
+ </view>
+ <view class="form-item">
+ <view class="title">宸ュ簭缂栫爜:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HProcNumber" placeholder="璇疯緭鍏ュ伐搴忕紪鐮�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鏈姤宸ユ暟閲�:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HNotReportQty" placeholder="璇疯緭鍏ユ湭鎶ュ伐鏁伴噺" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍚堟牸鏁伴噺:</view>
+ <view class="right">
+ <input v-model="hform.HQty" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">涓嶈壇鏁伴噺:</view>
+ <view class="right">
+ <input v-model="hform.HBadCount" placeholder="璇疯緭鍏ヤ笉鑹暟閲�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鎶ュ簾鏁伴噺:</view>
+ <view class="right">
+ <input v-model="hform.HWasterQty" placeholder="璇疯緭鍏ユ姤搴熸暟閲�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇璧勬簮:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
+ @input="HSourceNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title"><text>*</text>宸ヤ綔涓績:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHCenterName" placeholder="璇烽�夋嫨宸ヤ綔涓績" v-model="hform.HCenterName"
+ @input="HCenterNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇鐝粍:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHGroupName" placeholder="璇烽�夋嫨鐢熶骇鐝粍" v-model="hform.HGroupName"
+ @input="HGroupNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title"><text>*</text>鎿嶄綔鍛�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName"
+ @input="HEmpNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">澶囨敞:</view>
+ <view class="right">
+ <textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="璇疯緭鍏ュ娉�"></textarea>
+ </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="tick-wrapper">
+ <view class="form-item">
+ <view class="title">宸ユ椂:</view>
+ <view class="right">
+ <input v-model="hform.HWorkTimes" placeholder="璇疯緭鍏ュ伐鏃�" @blur="HWorkTimesChange" :disabled="hform.HIsTimeFlag!=1"/>
+ </view>
+ </view>
+ <view class="form-item">
+ <checkbox-group name="checkboxGroup" @change="onCGChangeHandler">
+ <label>
+ <checkbox :checked="hform.HIsTimeFlag == 1" value="1" />
+ 鏄惁璁℃椂
+ </label>
+ </checkbox-group>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">寮�宸ユ椂闂�:</view>
+ <view class="right">
+ <uni-datetime-picker v-model="hform.HRelBeginTime" @change="HRelBeginTimeChange" v-if="hform.HIsTimeFlag==1" :hide-second="true">
+ <input disabled v-model="hform.HRelBeginTime" placeholder="璇烽�夋嫨寮�宸ユ椂闂�" style="pointer-events: none;"/>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹屽伐鏃堕棿:</view>
+ <view class="right">
+ <uni-datetime-picker v-model="hform.HRelEndTime" @change="HRelEndTimeChange" v-if="hform.HIsTimeFlag==1" :hide-second="true">
+ <input disabled v-model="hform.HRelEndTime" placeholder="璇烽�夋嫨瀹屽伐鏃堕棿" />
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <!--
+ <view class="title">鏄惁璁℃椂</view>
+ <checkbox-group name="checkboxGroup" @change="onCGChangeHandler">
+ <label>
+ <checkbox :checked="hform.HIsTimeFlag == 1" value="1" />
+ </label>
+ </checkbox-group>
+ </view> -->
+
+ <view class="tab_area"></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="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="righton">
+ <input disabled v-model="hform.HMaterNumber" />
+ <!-- <uni-combox :candidates="arrayHMaterNumber" placeholder="璇烽�夋嫨浜у搧浠ｇ爜" v-model="hform.HMaterNumber" @input="HMaterNumberChange"></uni-combox> -->
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐗╂枡鍚嶇О:</view>
+ <view class="righton">
+ <input v-model="hform.HMaterName" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瑙勬牸鍨嬪彿:</view>
+ <view class="righton">
+ <input v-model="hform.HMaterModel" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">娆惧彿:</view>
+ <view class="righton">
+ <input v-model="hform.HStyleNumber" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璁￠噺鍗曚綅:</view>
+ <view class="righton">
+ <input v-model="hform.鍗曚綅" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">宸ュ簭:</view>
+ <!-- <view class="right">
+ <uni-combox :candidates="arrayHProcName" placeholder="璇烽�夋嫨褰撳墠宸ュ簭" v-model="hform.HProcName" @input="HProcNameChange"></uni-combox>
+ </view> -->
+ <view class="righton">
+ <input v-model="hform.HProcName" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇缁勭粐:</view>
+ <view class="righton">
+ <input v-model="hform.HPRDOrg" disabled />
+ </view>
+ </view>
+
+
+
+ <!--
+ <view class="form-item">
+ <view class="title">璁㈠崟鏁伴噺:</view>
+ <view class="right">
+ <input name="HICMOQty" v-model="hform.HICMOQty" placeholder="璇疯緭鍏ヨ鍗曟暟閲�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璁㈠崟璺熻釜鍙�:</view>
+ <view class="right">
+ <input name="HOrderProcNO" v-model="hform.HOrderProcNO" placeholder="璇疯緭鍏ヨ鍗曡窡韪彿" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浜у搧浠ｇ爜:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHMaterNumber" placeholder="璇烽�夋嫨浜у搧浠ｇ爜" v-model="hform.HMaterNumber" @input="HMaterNumberChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浜у搧鍚嶇О:</view>
+ <view class="right">
+ <input v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瑙勬牸鍨嬪彿:</view>
+ <view class="right">
+ <input v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title"><text>*</text>娴佽浆鍗″彿:</view>
+ <view class="right">
+ <input v-model="hform.HProcExchBillNo" placeholder="璇疯緭鍏ユ祦杞崱鍙�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">娴佽浆鍗℃暟閲�:</view>
+ <view class="right">
+ <input v-model="hform.HPlanQty" placeholder="璇疯緭鍏ユ祦杞崱鏁伴噺" />
+ </view>
+ </view>
+
+ <view class="tab_area"></view>
+
+ <view class="form-item">
+ <view class="title"><text>*</text>褰撳墠宸ュ簭:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHProcName" placeholder="璇烽�夋嫨褰撳墠宸ュ簭" v-model="hform.HProcName" @input="HProcNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">妫�楠屽憳:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨妫�楠屽憳" v-model="hform.HQCCheckName" @input="HQCCheckNameChange"></uni-combox>
+ </view>
+ </view> -->
+
+ <view class="tab_area"></view>
+
+
+ <view class="form-item">
+ <view class="title">鎿嶄綔鍛�2:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName2"
+ @input="HEmpName2Change"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鎿嶄綔鍛�3:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName3"
+ @input="HEmpName3Change"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鎿嶄綔鍛�4:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName4"
+ @input="HEmpName4Change"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鎿嶄綔鍛�5:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName5"
+ @input="HEmpName5Change"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title"></view>
+ <!-- <view style="padding-top: 10rpx;" @tap="hform.HLastSubProc = hform.HLastSubProc==true?false:true">
+ <radio value="true" :checked="hform.HLastSubProc == true" style="transform:scale(1);"/>杞笅閬�
+ </view> -->
+ <view style="padding-top: 10rpx;">
+ <radio value="true" :checked="hform.HLastSubProc == true" style="transform:scale(1);" />杞笅閬�
+ </view>
+ </view>
+ <!-- <view class="form-item">
+ <view class="title">鍑虹珯鏃堕棿:</view>
+ <view class="right">
+ <uni-datetime-picker v-model="hform.HStationOutTime">
+ <input disabled v-model="hform.HStationOutTime" placeholder="璇烽�夋嫨鍑虹珯鏃堕棿" />
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">妯＄┐鍙�:</view>
+ <view class="right">
+ <input v-model="hform.HMouldNum" placeholder="璇疯緭鍏ユā绌村彿" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇璧勬簮2:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName2" @input="HSourceName2Change"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇璧勬簮3:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName3" @input="HSourceName3Change"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇璧勬簮4:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName4" @input="HSourceName4Change"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇璧勬簮5:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName5" @input="HSourceName5Change"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鏍哥畻宸ュ簭:</view>
+ <view class="right">
+ <input v-model="hform.HPayProcID" placeholder="璇疯緭鍏ユ牳绠楀伐搴�" />
+ </view>
+ </view> -->
+
+ <!-- <view class="form-item">
+ <view class="title">璁惧娓呭崟:</view>
+ <view class="right">
+ <input v-model="hform.HSourceNameList" placeholder="璇疯緭鍏ヨ澶囨竻鍗�" />
+ </view>
+ </view> -->
+ <!-- <view class="form-item">
+ <view class="title">渚涘簲鍟�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" v-model="hform.HSupName" @input="HSupNameChange"></uni-combox>
+ </view>
+ </view> -->
+ <!--
+ <view class="form-item">
+ <view class="title">杩涚珯鏃堕棿:</view>
+ <view class="right">
+ <uni-datetime-picker v-model="hform.HStationInTime">
+ <input disabled v-model="hform.HStationInTime" placeholder="璇烽�夋嫨鎺ユ敹鏃堕棿" />
+ </uni-datetime-picker>
+ </view>
+ </view> -->
+
+ <!-- <view class="form-item">
+ <view class="title">鎿嶄綔鍛�:</view>
+ <view class="right">
+ <input v-model="hform.HEmp" placeholder="璇疯緭鍏ユ搷浣滃憳" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">閮ㄩ棬:</view>
+ <view class="right">
+ <input v-model="hform.HDept" placeholder="璇疯緭鍏ラ儴闂�" />
+ </view>
+ </view> -->
+
+ <!-- <view class="tab_area"></view> -->
+
+ <!-- <view class="form-item">
+ <view class="title">閫夋嫨鏂囦欢:</view>
+ <view class="right">
+ 1111
+ </view>
+ </view> -->
+
+ <view v-if="showmore">
+ <view class="form-item">
+ <view class="title">璁㈠崟璺熻釜鍙�:</view>
+ <view class="righton">
+ <input v-model="hform.HOrderProcNO" disabled />
+ </view>
+ </view>
+ <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 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 v-if="hform.HDeleteDate" v-model="hform.HDeleteDate.substr(0,10)" disabled />
+ <input v-else v-model="hform.HDeleteDate" disabled />
+ </view>
+ </view>
+ </view>
+
+ <view class="tab_area"></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="op">
+ <button class="op1" size="mini" plain @tap="huibao">姹囨姤</button>
+ <button class="op2" size="mini" plain @tap="ruku">鍏ュ簱</button>
+ <button class="op3" size="mini" plain @tap="baofei">鎶ュ簾</button>
+ </view> -->
+
+ <view class="bottom-btn">
+ <button v-if="btnType == 0 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button v-if="btnType != 0 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button>
+ <button v-if="btnType != 0 && isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button v-if="btnType != 0 && btnType == 2" class="btn-b" style="margin-left: 20rpx;" size="mini"
+ @tap="check">瀹℃牳</button>
+ <button v-if="btnType != 0 && btnType == 3" class="btn-d" style="margin-left: 20rpx;" size="mini"
+ @tap="abandonCheck">鍙嶅鏍�</button>
+ <flex style="flex: 1;"></flex>
+ <button class="btn-b" size="mini" @tap="addNew">鏂板</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 { CommonUtils } from '../../utils/common';
+ export default {
+ data() {
+ return {
+ userInfo: getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ linterid: '',
+ HBillNo: '',
+ btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
+ FirstEndHProcNo: 0, //榛樿0 棣栭亾宸ュ簭1 鏈亾宸ュ簭2
+ OperationType: 1,
+ showmore: false,
+
+ arrayHMaterNumber: [], //浜у搧
+ HMaterNumberList: [],
+ arrayHProcName: [], //宸ュ簭
+ HProcNameList: [],
+ arrayHSupName: [], //渚涘簲鍟�
+ HSupNameList: [],
+ arrayHSourceName: [], //鐢熶骇璧勬簮
+ HSourceNameList: [],
+ arrayHGroupName: [], //鐢熶骇鐝粍
+ HGroupNameList: [],
+ arrayHEmpName: [], //鎺ユ敹浜�
+ HEmpNameList: [],
+ arrayHCenterName: [], //宸ヤ綔涓績
+ HCenterNameList: [],
+ arrayHSEQName:[],//搴忓垪
+ HSEQNameList:[],
+ isEdit: false,
+ hform: {
+ HInterID: '',
+ HBillNo: '',
+ HBarCode: '',
+ HProcNo: '',
+ HQty: '',
+ HBadCount:0,
+ HProcNumber: '',
+ HNotReportQty: 0,
+ HIsTimeFlag: 0,
+ HRelBeginTime:'',
+ HRelEndTime:'',
+ // HPieceQty:'',
+ HWasterQty: 0,
+ HSourceName: '',
+ HSourceID: 0,
+ HCenterName: '',
+ HCenterID: 0,
+ HGroupName: '',
+ HGroupID: 0,
+ HEmpName: '',
+ HEmpID: 0,
+ HSEQName:'',
+ HSEQNumber:0,
+ HRemark: '',
+ HDate: getDateTime.dateTimeStr('y-m-d'),
+
+ HICMOBillNo: '',
+ HProcExchBillNo: '',
+ HMaterNumber: '',
+ HMaterName: '',
+ HMaterID: 0,
+ HMaterModel: '',
+ 鍗曚綅: '',
+ HProcName: '',
+ HProcID: '',
+ HPRDOrg: '',
+ HOrderProcNO: '',
+
+ HWorkTimes: 0,
+ HEmpName2: '',
+ HEmpID2: 0,
+ HEmpName3: '',
+ HEmpID3: 0,
+ HEmpName4: '',
+ HEmpID4: 0,
+ HEmpName5: '',
+ HEmpID5: 0,
+ HLastSubProc: true,
+
+ // HICMOInterID:'',
+ // HICMOQty:'',
+ HProcExchHinteID: '',
+ lngBillKey: '',
+ // HPlanQty:'',
+ // HSupName:'',
+ // HSupID:'',
+ // HWWWorkOrderBillNo:'',
+ // HTaxRate:'',
+ // HPrice:'',
+ // HMoney:'',
+ HStationInTime: getDateTime.dateTimeStr('y-m-d h:i:s'),
+ // HStationOutTime:getDateTime.dateTimeStr('y-m-d h:i:s'),
+ // HSendBillNo:'',
+ // HInnerBillNo:'',
+ // HEmp:'',
+ // HEmpID:'',
+ // HQCCheckName:'',
+ // HQCCheckID:'',
+ // HSourceName2:'',
+ // HSourceID2:'',
+ // HSourceName3:'',
+ // HSourceID3:'',
+ // HSourceName4:'',
+ // HSourceID4:'',
+ // HSourceName5:'',
+ // HSourceID5:'',
+ // HDept:'',
+ // HDeptID:'',
+ // HMouldNum:'',
+ // HPayProcID:'',
+ // HSourceNameList:'',
+
+ HMaker: uni.getStorageSync('HUserName'),
+ HMakeDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+ HUpDater: '',
+ HUpDateDate: '',
+ HChecker: '',
+ HCheckDate: '',
+ // HCloseMan:'',
+ // HCloseDate:'',
+ HDeleteMan: '',
+ HDeleteDate: '',
+
+ HStyleNumber: '', // 娆惧彿
+
+ eventType: 'Add',
+ }
+ }
+ },
+ onLoad(e) {
+ // this.getEditData('1516','GXCZHB000000001290')
+ console.log(e, this.userInfo)
+ // this.hform.HEmpID = this.userInfo.Czybm
+ // this.hform.HEmp = uni.getStorageSync('HUserName')
+ this.hform.HMaker = uni.getStorageSync('HUserName')
+ this.hform.HMakeDate = getDateTime.dateTimeStr('y-m-d h:i:s')
+ // this.hform.HDate = getDateTime.dateTimeStr('y-m-d')
+ // this.hform.HStationOutTime = getDateTime.dateTimeStr('y-m-d h:i:s')
+ if (e.linterid) {
+ this.btnType = 1
+ this.OperationType = 4
+ this.linterid = e.linterid
+ this.HBillNo = e.HBillNo
+ this.getEditData(e.linterid, e.HBillNo)
+ } else {
+ this.getNewData()
+ if(e.HBarCode){
+ this.hform.HBarCode=e.HBarCode
+ setTimeout(() => {
+ this.toInCode(e);
+ }, 1000)
+ }
+
+ }
+ this.getHMaterList()
+ this.getHProcList()
+ this.getHSupList()
+ this.getHSourceList()
+ this.getHGroupList()
+ this.getHEmpList()
+ this.getHCenterList()
+
+ this.getDefValByUser()
+
+ },
+ methods: {
+ //閫変腑鍏ㄩ儴鏂囨湰
+ selectAllText(e) {
+ console.log(e.target)
+ console.log(e)
+ },
+ onCGChangeHandler({
+ detail
+ }) {
+ console.log(detail.value[0])
+ this.hform.HIsTimeFlag = detail.value[0] || 0
+ if(detail.value[0]){
+ this.getNewHRelBeginDate()
+ this.hform.HRelEndTime = getDateTime.dateTimeStr('y-m-d h:i');
+ }else{
+ this.hform.HWorkTimes = 0;
+ }
+ },
+ //閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
+ getDefValByUser() {
+ uni.request({
+ url: this.serverUrl + '/Cj_StationInBill/GetDefValByUser',
+ type: "GET",
+ async: false,
+ data: {
+ "Czybm": this.userInfo.Czybm,
+ "Czymc": this.userInfo.Czymc
+ },
+ success: (res) => {
+ // console.log(res.data)
+ if (res.data.count == 1) {
+ var data = res.data.data[0]
+ this.hform.HGroupID = data.HGroupID
+ this.hform.HGroupName = data.鐢熶骇鐝粍鍚嶇О
+ this.hform.HEmpID = data.HEmpID
+ this.hform.HEmpName = data.鎿嶄綔鍛樺悕绉�
+ this.hform.HEmpNumber = data.鎿嶄綔鍛樹唬鐮�
+ this.hform.HSourceID = data.HSourceID
+ this.hform.HSourceName = data.鐢熶骇璧勬簮鍚嶇О
+ this.hform.HCenterID = data.HWorkCenterID
+ this.hform.HCenterName = data.宸ヤ綔涓績鍚嶇О
+ this.hform.HEmpName_second = data.鎿嶄綔鍛樺悕绉�
+ } else {
+ uni.showToast({
+ title: '鑾峰彇鐢熶骇鐝粍淇℃伅澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇鐢熶骇鐝粍淇℃伅澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //鎵爜
+ toScanCode() {
+ var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+ mpaasScanModule.mpaasScan({
+ 'hideAlbum': true,
+ 'timeoutInterval': '10', //瓒呮椂鏃堕棿
+ 'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ }, (ret) => {
+ console.log(ret.resp_result)
+ var str = ret.resp_result
+ if (str.includes('@')) {
+ const parts = str.split('@');
+ //濡傛灉浠ｇ爜鍖呭惈瀛愬簭鍒�
+ if(parts.length==3){
+ this.hform.HBarCode = parts[0]
+ this.hform.HProcNo = parts[1]
+ this.hform.HSEQNumber = parts[2]
+ this.getHBarCodeData(parts[0], 2)
+ }else{
+ this.hform.HBarCode = parts[0]
+ this.hform.HProcNo = parts[1]
+ this.getHBarCodeData(parts[0], 1)
+ }
+
+ // this.getHProcNoData(parts[0],parts[1])
+ } else {
+ this.hform.HBarCode = ret.resp_result
+ this.getHBarCodeData(ret.resp_result)
+ }
+ })
+ // const str = "GXLX250603001-01@10";
+ // uni.scanCode({
+ // onlyFromCamera: true,
+ // // autoZoom:false,
+ // success: (res) => {
+ // console.log('鏉＄爜鍐呭锛�' + res.result);
+ // var str = res.result
+ // if(str.includes('@')) {
+ // const parts = str.split('@');
+ // this.hform.HBarCode = parts[0]
+ // this.hform.HProcNo = parts[1]
+ // this.getHBarCodeData(parts[0],1)
+ // // this.getHProcNoData(parts[0],parts[1])
+ // }else{
+ // this.hform.HBarCode = res.result
+ // this.getHBarCodeData(res.result)
+ // }
+ // }
+ // });
+ },
+ toInCode(e) {
+ var str = this.hform.HBarCode
+ if (str.includes('@')) {
+ const parts = str.split('@');
+ //濡傛灉浠ｇ爜鍖呭惈瀛愬簭鍒�
+ if(parts.length==3){
+ this.hform.HBarCode = parts[0]
+ this.hform.HProcNo = parts[1]
+ this.hform.HSEQNumber = parts[2]
+ this.getHBarCodeData(parts[0], 2)
+ }else{
+ this.hform.HBarCode = parts[0]
+ this.hform.HProcNo = parts[1]
+ this.getHBarCodeData(parts[0], 1)
+ }
+ // this.getHProcNoData(parts[0],parts[1])
+ } else {
+ this.getHBarCodeData(this.hform.HBarCode)
+ }
+ },
+ //鎵祦姘村彿
+ toScanProcNo() {
+ var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+ mpaasScanModule.mpaasScan({
+ 'hideAlbum': true,
+ 'timeoutInterval': '10', //瓒呮椂鏃堕棿
+ 'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ }, (ret) => {
+ console.log(ret.resp_result)
+ this.hform.HProcNo = ret.resp_result
+ this.getHProcNoData2(this.hform.HBarCode, ret.resp_result,this.hform.HSEQNumber)
+ })
+ },
+ //鏃ユ湡
+ HDateChange(e) {
+ console.log(e.detail.value)
+ this.hform.HDate = e.detail.value
+ },
+ HRelBeginTimeChange(e) {
+ console.log(e)
+ this.hform.HRelBeginTime = e
+ this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime);
+ },
+ HRelEndTimeChange(e) {
+ console.log(e)
+ this.hform.HRelEndTime = e
+ this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime);
+ },
+ HWorkTimesChange(e){
+ console.log(e);
+ this.hform.HRelEndTime = getDateTime.addHoursToDate(this.hform.HRelBeginTime,e.detail.value);
+ },
+ //鑾峰彇浜у搧鏁版嵁
+ getHMaterList() {
+ var Value = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + uni.getStorageSync('OrganizationID')
+ uni.request({
+ url: this.serverUrl + '/Web/GetMaterialList_Json',
+ data: {
+ sWhere: Value
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.HMaterNumberList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHMaterNumber[i] = res.data.data[i].HNumber
+ }
+ this.$forceUpdate();
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //閫夋嫨浜у搧鏁版嵁
+ HMaterNumberChange(e) {
+ for (var i = 0; i < this.HMaterNumberList.length; i++) {
+ if (this.HMaterNumberList[i].HNumber == e) {
+ this.hform.HMaterName = this.HMaterNumberList[i].HName
+ this.hform.HMaterID = this.HMaterNumberList[i].HItemID
+ }
+ }
+ },
+ //宸ュ簭
+ getHProcList() {
+ uni.request({
+ url: this.serverUrl + '/Web/GetProcList_Json',
+ data: {
+ sWhere: ''
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.HProcNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHProcName[i] = res.data.data[i].宸ュ簭
+ }
+ this.$forceUpdate();
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //閫夋嫨宸ュ簭
+ HProcNameChange(e) {
+ for (var i = 0; i < this.HProcNameList.length; i++) {
+ if (this.HProcNameList[i].宸ュ簭 == e) {
+ this.hform.HProcID = this.HProcNameList[i].HItemID
+ }
+ }
+ },
+ //鑾峰彇渚涘簲鍟嗘暟鎹�
+ getHSupList() {
+ if (!uni.getStorageSync('OrganizationID')) {
+ var HOtherOrgID = 0;
+ } else {
+ var HOtherOrgID = uni.getStorageSync('OrganizationID')
+ }
+ uni.request({
+ url: this.serverUrl + '/Web/GetSupplierList_Json',
+ data: {
+ Supplier: '',
+ HOrgID: HOtherOrgID
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.HSupNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHSupName[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'
+ })
+ },
+ });
+ },
+ //閫夋嫨渚涘簲鍟�
+ HSupNameChange(e) {
+ for (var i = 0; i < this.HSupNameList.length; i++) {
+ if (this.HSupNameList[i].HName == e) {
+ this.hform.HSupID = this.HSupNameList[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
+ }
+ }
+ },
+ HSourceName2Change(e) {
+ for (var i = 0; i < this.HSourceNameList.length; i++) {
+ if (this.HSourceNameList[i].鐢熶骇璧勬簮 == e) {
+ this.hform.HSourceID2 = this.HSourceNameList[i].HItemID
+ }
+ }
+ },
+ HSourceName3Change(e) {
+ for (var i = 0; i < this.HSourceNameList.length; i++) {
+ if (this.HSourceNameList[i].鐢熶骇璧勬簮 == e) {
+ this.hform.HSourceID3 = this.HSourceNameList[i].HItemID
+ }
+ }
+ },
+ HSourceName4Change(e) {
+ for (var i = 0; i < this.HSourceNameList.length; i++) {
+ if (this.HSourceNameList[i].鐢熶骇璧勬簮 == e) {
+ this.hform.HSourceID4 = this.HSourceNameList[i].HItemID
+ }
+ }
+ },
+ HSourceName5Change(e) {
+ for (var i = 0; i < this.HSourceNameList.length; i++) {
+ if (this.HSourceNameList[i].鐢熶骇璧勬簮 == e) {
+ this.hform.HSourceID5 = this.HSourceNameList[i].HItemID
+ }
+ }
+ },
+ //鐢熶骇鐝粍
+ getHGroupList() {
+ uni.request({
+ url: this.serverUrl + '/Web/GetProductionTeamList_Json',
+ data: {
+ sWhere: "and HUSEORGID = " + uni.getStorageSync('OrganizationID') + ""
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.HGroupNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHGroupName[i] = res.data.data[i].鐝粍
+ }
+ this.$forceUpdate();
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //閫夋嫨鐢熶骇鐝粍
+ HGroupNameChange(e) {
+ for (var i = 0; i < this.HGroupNameList.length; i++) {
+ if (this.HGroupNameList[i].鐝粍 == e) {
+ this.hform.HGroupID = this.HGroupNameList[i].HItemID
+ }
+ }
+ },
+ //鎿嶄綔鍛樼瓑
+ getHEmpList() {
+ uni.request({
+ url: this.serverUrl + '/Web/GetEmployeeList_Json',
+ data: {
+ Employee: '',
+ HGroupID: 0
+ },
+ 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) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+ this.hform.HEmpID = this.HEmpNameList[i].HItemID
+ }
+ }
+ },
+ //閫夋嫨妫�楠屽憳
+ HQCCheckNameChange(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+ this.hform.HQCCheckID = this.HEmpNameList[i].HItemID
+ }
+ }
+ },
+ //閫夋搷浣滃憳
+ HEmpName2Change(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+ this.hform.HEmpID2 = this.HEmpNameList[i].HItemID
+ }
+ }
+ },
+ HEmpName3Change(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+ this.hform.HEmpID3 = this.HEmpNameList[i].HItemID
+ }
+ }
+ },
+ HEmpName4Change(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+ this.hform.HEmpID4 = this.HEmpNameList[i].HItemID
+ }
+ }
+ },
+ HEmpName5Change(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+ this.hform.HEmpID5 = this.HEmpNameList[i].HItemID
+ }
+ }
+ },
+ //宸ヤ綔涓績
+ getHCenterList() {
+ uni.request({
+ url: this.serverUrl + '/api/newBill/getWorkCenterList',
+ data: {
+ sWhere: ''
+ },
+ success: (res) => {
+ if (res.data.code == 1) {
+ this.HCenterNameList = res.data.data.Gy_Source
+ for (var i = 0; i < res.data.data.Gy_Source.length; i++) {
+ this.arrayHCenterName[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'
+ })
+ },
+ });
+ },
+ //閫夋嫨宸ヤ綔涓績
+ HCenterNameChange(e) {
+ for (var i = 0; i < this.HCenterNameList.length; i++) {
+ if (this.HCenterNameList[i].宸ヤ綔涓績 == e) {
+ this.hform.HCenterID = this.HCenterNameList[i].HItemID
+ }
+ }
+ },
+ //搴忓垪鑾峰彇
+ getHSEQList(e){
+ uni.request({
+ url: this.serverUrl + 'Cj_StationOutBill/getAllHSEQ',
+ data: {
+ HInterID:this.hform.HProcExchHinteID
+ },
+ success: (res) => {
+ if (res.data.code == 1) {
+ this.HSEQNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHSEQName[i] = res.data.data[i].HSEQName
+ }
+ this.$forceUpdate();
+ //娌℃湁搴忓垪鍙烽粯璁や富搴忓垪
+ if(e==1){
+ //璁剧疆涓诲簭鍒�
+ this.setMainHSEQ();
+ this.getHProcNoData2(this.hform.HBarCode,this.hform.HProcNo,this.hform.HSEQNumber)
+ }else if(e==2){
+ this.getHProcNoData2(this.hform.HBarCode,this.hform.HProcNo,this.hform.HSEQNumber)
+ }else{
+ //璁剧疆涓诲簭鍒�
+ this.setMainHSEQ();
+ }
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //閫夋嫨搴忓垪
+ HSEQNameChange(e) {
+ for (var i = 0; i < this.HSEQNameList.length; i++) {
+ if (this.HSEQNameList[i].HSEQName == e) {
+ this.hform.HSEQNumber = this.HSEQNameList[i].HSEQNumber
+ }
+ }
+ },
+ //璁剧疆涓诲簭鍒�
+ setMainHSEQ(){
+ for (var i = 0; i < this.HSEQNameList.length; i++) {
+ if (this.HSEQNameList[i].HSEQType == 'M') {
+ this.hform.HSEQNumber = this.HSEQNameList[i].HSEQNumber
+ this.hform.HSEQName = this.HSEQNameList[i].HSEQName
+ break;
+ }
+ }
+ },
+ //姹囨姤
+ huibao() {
+ var datas = {
+ InterID: this.hform.HInterID,
+ BillNo: this.hform.HBillNo,
+ user: uni.getStorageSync('HUserName'),
+ OrganizationID: uni.getStorageSync('OrganizationID'),
+ }
+ console.log('姹囨姤', datas)
+ uni.request({
+ url: this.serverUrl + '/Sc_ProcessMangement/SaveICMOReportBill',
+ method: 'GET',
+ data: datas,
+ success: (res) => {
+ console.log(res)
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //鍏ュ簱
+ ruku() {
+ console.log('ruku')
+ uni.request({
+ url: this.serverUrl + '/Sc_ProcessMangement/SaveProcdutInBill',
+ method: 'GET',
+ data: {
+ BillNo: this.hform.HBillNo
+ },
+ success: (res) => {
+ console.log(res)
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //鎶ュ簾
+ baofei() {
+ console.log('baofei')
+ uni.request({
+ url: this.serverUrl + '/Sc_ProcessMangement/SaveBFBill',
+ method: 'GET',
+ data: {
+ BillNo: this.hform.HBillNo
+ },
+ success: (res) => {
+ console.log(res)
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ preEditOrAddCheck() {
+ if(CommonUtils.isEmpty(this.hform.HQty) == true){
+ return {pass: false, message: '鎻愪氦澶辫触: 鍚堟牸鏁伴噺涓虹┖'}
+ }
+ if(CommonUtils.isEmpty(this.hform.HBadCount) == true){
+ return {pass: false, message: '鎻愪氦澶辫触: 涓嶈壇鏁伴噺涓虹┖'}
+ }
+ if(CommonUtils.isEmpty(this.hform.HQty) == true){
+ return {pass: false, message: '鎻愪氦澶辫触: 鎶ュ簾鏁伴噺涓虹┖'}
+ }
+ if(this.hform.HIsTimeFlag == 1 && CommonUtils.isEmpty(this.hform.HWorkTimes, true, true)) {
+ return {pass: false, message: '鎻愪氦澶辫触: 寮�鍚鏃讹紝浣嗗伐鏃朵负0鎴栫┖'}
+ }
+ return {pass: true, message: ''}
+ },
+ //缂栬緫
+ ifEdit() {
+ let {pass, message} = this.preEditOrAddCheck()
+ if(pass == false) {
+ return uni.showToast({
+ icon: 'none',
+ title: message
+ })
+ }
+
+ //鏄惁缂栬緫
+ uni.request({
+ url: this.serverUrl + '/Cj_StationOutBill/set_ShowBillJudge',
+ data: {
+ HBillNo: this.HBillNo,
+ // CurUserName: uni.getStorageSync('HUserName'),
+ // HInterID: this.linterid,
+ },
+ success: (res) => {
+ console.log(res)
+ if (res.data.count == 1) {
+ this.isEdit = true
+ this.OperationType = 3
+ this.hform.eventType = 'Modify'
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ getEditData(linterid, HBillNo) {
+ //涓昏〃
+ uni.request({
+ url: this.serverUrl + '/Cj_StationOutBill/GetStationOutBill',
+ data: {
+ HInterID: linterid
+ },
+ success: (res) => {
+ console.log(1, res.data.data[0]);
+ if (res.data.code == 1) {
+ var data = res.data.data[0]
+ this.getHBarCodeData(data.HBarCode,1)
+ //this.getHProcNoData(data.HBarCode, data.HProcNo)
+
+ this.hform.HInterID = data.HInterID
+ this.hform.HBillNo = data.HBillNo
+ this.hform.HBarCode = data.HBarCode
+ this.hform.HProcNo = data.HProcNo
+ // this.hform.HQty = data.HQty
+ // this.hform.HPieceQty= data.HPieceQty
+ this.hform.HIsTimeFlag = data.HIsTimeFlag || 0
+ this.hform.HNotReportQty = data.HNotReportQty
+ this.hform.HProcNumber = data.HProcNumber || ''
+ this.hform.HWasterQty = data.HWasterQty
+ this.hform.HBadCount = data.HBadCount
+ this.hform.HSourceID = data.HSourceID
+ this.hform.HSourceName = data.HSourceName
+ this.hform.HGroupID = data.HGroupID
+ this.hform.HGroupName = data.HGroupName
+ this.hform.HEmpID = data.HEmpID
+ this.hform.HEmpName = data.HEmpName
+ this.hform.HRemark = data.HRemark
+ this.hform.HDate = data.HDate.substr(0, 10)
+
+ this.hform.HWorkTimes = data.HWorkTimes
+ this.hform.HEmpID2 = data.HEmpID2
+ this.hform.HEmpName2 = data.HEmpName2
+ this.hform.HEmpID3 = data.HEmpID3
+ this.hform.HEmpName3 = data.HEmpName3
+ this.hform.HEmpID4 = data.HEmpID4
+ this.hform.HEmpName4 = data.HEmpName4
+ this.hform.HEmpID5 = data.HEmpID5
+ this.hform.HEmpName5 = data.HEmpName5
+ // this.hform.HLastSubProc= data.HLastSubProc
+ // this.hform.HQCCheckID= data.HQCCheckID
+ // this.hform.HQCCheckName= data.HQCCheckName
+
+ if (data.鏄惁瀹℃牳 == "true") {
+ this.btnType = 3
+ } else {
+ this.btnType = 2
+ }
+
+ this.hform.HMaker = data.HMaker
+ this.hform.HMakeDate = data.HMakeDate
+ this.hform.HUpDater = data.HUpDater
+ this.hform.HUpDateDate = data.HUpDateDate
+ this.hform.HChecker = data.HChecker
+ this.hform.HCheckDate = data.HCheckDate
+ // this.hform.HCloseMan= data.HCloseMan
+ // this.hform.HCloseDate= data.HCloseDate
+ this.hform.HDeleteMan = data.HDeleteMan
+ this.hform.HDeleteDate = data.HDeleteDate
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ getHBarCodeData(HBarCode, e) {
+ var barNo = HBarCode.substr(0, 2);
+ var barNo1 = HBarCode.substr(0, 4);
+ uni.request({
+ url: this.serverUrl + '/Cj_StationBill/txtHBarCode_KeyDown2',
+ data: {
+ HBarCode: HBarCode,
+ HInterID: this.hform.HProcExchHinteID,
+ UserID: this.userInfo.Czybm,
+ HBillType: "Out"
+ },
+ success: (res) => {
+ console.log(2, res.data);
+ if (res.data.code == 1) {
+ var data = res.data.data[0]
+ if (barNo != 'OP') {
+ if (barNo1 == 'GXLZ' && data.娴佹按鍙�) {
+ this.hform.HProcNo = data.娴佹按鍙�
+ } else if (barNo1 == 'GXLX' && data.宸ュ簭鍙�) {
+ this.hform.HProcNo = data.宸ュ簭鍙�
+ }
+ }
+ this.hform.HICMOInterID = data.hicmointerid
+ this.hform.HICMOBillNo = data.浠诲姟鍗曞彿
+ this.hform.HMaterID = data.HMaterID
+ this.hform.HMaterName = data.浜у搧
+ this.hform.HMaterNumber = data.浜у搧浠ｇ爜
+ this.hform.HMaterModel = data.瑙勬牸鍨嬪彿
+ this.hform.HPlanQty = data.娴佽浆鍗℃暟閲�
+ this.hform.lngBillKey = data.hmainid
+ this.hform.HProcExchBillNo = data.鍗曟嵁鍙�
+ this.hform.HProcExchHinteID = data.hmainid
+ this.hform.HICMOQty = data.浠诲姟鍗曟暟閲�
+ this.hform.HOrderProcNO = data.璁㈠崟璺熻釜鍙�
+ this.hform.HPRDOrgID = data.缁勭粐
+ this.hform.HPRDOrg = data.缁勭粐鍚嶇О
+ this.hform.lngBillSubKey = data.hsubid
+ this.hform.HProcName = data.宸ュ簭
+ this.hform.HProcID = data.HProcID
+ this.hform.HCenterName = data.宸ヤ綔涓績
+ this.hform.HCenterID = data.HCenterID
+ this.hform.NoOutboundHqty = (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+ this.hform.HStyleNumber = data['娆惧彿']
+ //璁剧疆搴忓垪
+ this.getHSEQList(e);
+
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ getHProcNoData(HBarCode, HProcNo) {
+ uni.request({
+ url: this.serverUrl + '/Cj_StationInBill/txtHProcNo_KeyDown',
+ data: {
+ sBillNo: HBarCode,
+ sProcNo: HProcNo
+ },
+ success: (res) => {
+ console.log(3, res);
+ if (res.data.code == 1) {
+ var data = res.data.data[0]
+ this.hform.lngBillSubKey = data.hsubid
+ this.hform.HProcName = data.宸ュ簭
+ this.hform.HProcID = data.HProcID
+ this.hform.HCenterName = data.宸ヤ綔涓績
+ this.hform.HCenterID = data.HCenterID
+ this.hform.NoOutboundHqty = (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+ this.hform.HNotReportQty = data['鏈姤宸ユ暟閲�']
+ this.hform.HProcNumber = data['宸ュ簭浠ｇ爜']
+ this.hform.HIsTimeFlag = data['鏄惁璁℃椂'] ? 1 : 0
+ // this.hform.HStyleNumber = data['娆惧彿']
+ // this.hform.HQty = data.鍚堟牸鏁伴噺
+ if (data.棣栭亾宸ュ簭 == "鏄�") {
+ this.FirstEndHProcNo = 1
+ }
+ if (data.鏈亾宸ュ簭 == "鏄�") {
+ this.FirstEndHProcNo = 2
+ }
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ getHProcNoData2(HBarCode, HProcNo,HSEQNumber) {
+ uni.request({
+ url: this.serverUrl + '/Cj_StationOutBill/txtHProcNo_KeyDown',
+ data: {
+ sBillNo: HBarCode,
+ sProcNo: HProcNo,
+ HSEQNumber:HSEQNumber
+ },
+ success: (res) => {
+ console.log(3, res);
+ if (res.data.code == 1) {
+ var data = res.data.data[0]
+ this.hform.lngBillSubKey = data.hsubid
+ this.hform.HProcName = data.宸ュ簭
+ this.hform.HProcID = data.HProcID
+ this.hform.HCenterName = data.宸ヤ綔涓績
+ this.hform.HCenterID = data.HCenterID
+ this.hform.NoOutboundHqty = (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+ this.hform.HNotReportQty = data['鏈姤宸ユ暟閲�']
+ this.hform.HProcNumber = data['宸ュ簭浠ｇ爜']
+ this.hform.HIsTimeFlag = data['鏄惁璁℃椂'] ? 1 : 0
+ if(data['鏄惁璁℃椂']){
+ this.hform.HRelEndTime = getDateTime.dateTimeStr('y-m-d h:i');
+ this.getNewHRelBeginDate();
+ }
+ this.hform.HSEQName = data.搴忓垪鍚嶇О
+ // this.hform.HStyleNumber = data['娆惧彿']
+ // this.hform.HQty = data.鍚堟牸鏁伴噺
+ if (data.棣栭亾宸ュ簭 == "鏄�") {
+ this.FirstEndHProcNo = 1
+ }
+ if (data.鏈亾宸ュ簭 == "鏄�") {
+ this.FirstEndHProcNo = 2
+ }
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //鑾峰彇鏈�鏂扮殑鎶ュ伐鏃ユ湡
+ getNewHRelBeginDate(){
+ uni.request({
+ url: this.serverUrl + '/Cj_StationOutBill/get_Display',
+ data:{
+ sWhere: ` and HEmpID = N'${this.hform.HEmpID}'`,
+ user: uni.getStorageSync('HUserName'),
+ HBillSubType:'',
+ },
+ success: (res) => {
+ if(res.data.count == 1){
+ //鑾峰彇鍒楄〃鏁版嵁
+ const listData = res.data.data
+ // 鑾峰彇褰撳墠鏃ユ湡锛堝幓鎺夋椂闂撮儴鍒嗭級
+ const today = new Date();
+ today.setHours(0, 0, 0, 0);
+ if(listData.length==0){
+ this.hform.HRelBeginTime = getDateTime.dateTimeSetHoureStr(7, 40, 0, 0,'y-m-d h:i');
+ this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime);
+ }else{
+ // 浠庡璞℃暟缁勪腑鎻愬彇鎵�鏈夋棩鏈熷瓧娈靛苟鎵惧埌鏈�澶у��
+ const maxDate = listData.reduce((max, obj) => {
+ const date = new Date(obj.鍑虹珯鏃堕棿);
+ return date > max ? date : max;
+ }, new Date(0)); // 鍒濆鍊间负鏈�灏忔棩鏈�
+ // 姣旇緝鏈�澶ф棩鏈熷拰浠婂ぉ鐨勬棩鏈熼儴鍒嗭紙涓嶆瘮杈冩椂闂达級
+ const maxDateDateOnly = new Date(maxDate);
+ maxDateDateOnly.setHours(0, 0, 0, 0);
+ // 姣旇緝鏈�澶ф棩鏈熷拰浠婂ぉ
+ if (maxDateDateOnly.getTime() !== today.getTime()) {
+ // 濡傛灉涓嶆槸浠婂ぉ锛岃繑鍥炲綋鍓嶆棩鏈�
+ this.hform.HRelBeginTime = getDateTime.dateTimeSetHoureStr(7, 40, 0, 0,'y-m-d h:i');
+ this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime);
+ }else{
+ this.hform.HRelBeginTime = getDateTime.formatDate(maxDate);
+ this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime);
+ }
+ }
+ }else{
+ uni.showToast({
+ title:res.data.Message,
+ icon:'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
+ })
+ },
+ });
+ },
+ //鏂板
+ getNewData() {
+
+ uni.request({
+ url: this.serverUrl + '/Web/GetMAXNum',
+ data: {
+ HBillType: '3791'
+ },
+ 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
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ addNew() {
+ uni.redirectTo({
+ url: '/pages/gongxuOut/form?OperationType=1'
+ })
+ },
+ submit() {
+ //鍘婚櫎鍒嗗彿浠ュ厤鍚庣鍒嗚В鎶ラ敊
+ this.hform.HMaterName= this.hform.HMaterName.replace(/;/g, '');
+ this.hform.HMaterModel = this.hform.HMaterModel.replace(/;/g, '');
+ if (!this.hform.HBarCode) {
+ uni.showToast({
+ title: '璇锋壂鎻忚澶囨潯褰㈢爜',
+ icon: 'none'
+ })
+ } else if (!this.hform.HProcNo) {
+ uni.showToast({
+ title: '璇疯緭鍏�/鎵弿娴佹按鍙�',
+ icon: 'none'
+ })
+ } else if (!this.hform.HEmpName) {
+ uni.showToast({
+ title: '璇烽�夋嫨鎿嶄綔鍛�',
+ icon: 'none'
+ })
+ } else if (!this.hform.HCenterName) {
+ uni.showToast({
+ title: '璇烽�夋嫨宸ヤ綔涓績',
+ icon: 'none'
+ })
+ } else {
+
+ let {pass, message} = this.preEditOrAddCheck()
+ if(pass == false) {
+ return uni.showToast({
+ icon: 'none',
+ title: message
+ })
+ }
+
+ uni.showLoading({
+ title: '璇风◢鍊�'
+ })
+ var sMainStr = JSON.stringify(this.hform);
+ var sMainSub = sMainStr + ";" + uni.getStorageSync('HUserName') + ";" + this.OperationType;
+ console.log(sMainSub);
+ uni.request({
+ url: this.serverUrl + '/Cj_StationOutBill/AddBill',
+ method: 'POST',
+ dataType: "json",
+ data: {
+ oMain: sMainSub
+ },
+ success: (res) => {
+ console.log(1, res);
+ uni.hideLoading()
+ if (res.data.count == 1) {
+ // if (uni.getStorageSync('OrganizationID') == 100038) {
+ // if (this.FirstEndHProcNo == 1) {
+ // //姹囨姤
+ // this.huibao()
+ // } else if (this.FirstEndHProcNo == 2) {
+ // //鍏ュ簱
+ // this.ruku()
+ // //鎶ュ簾
+ // this.baofei()
+ // }
+ // }
+
+ // let pages = getCurrentPages();
+ // let prePage = pages[pages.length - 2];
+ // prePage.$vm.getList()
+ if (this.isEdit) {
+ uni.showToast({
+ title: '淇敼鎴愬姛',
+ icon: 'none'
+ })
+ setTimeout(() => {
+ uni.redirectTo({
+ url: '/pages/gongxuOut/table'
+ })
+ }, 1000)
+ } else {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧炰笅涓�閬撳伐搴忥紵(鐐瑰嚮鍙栨秷杩斿洖鏂板椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ this.getNextProc()
+ // uni.redirectTo({
+ // url: '/pages/gongxuOut/form?OperationType=1'
+ // })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ // setTimeout(() => {
+ // uni.navigateBack();
+ // }, 50)
+ uni.redirectTo({
+ url: '/pages/gongxuOut/form?OperationType=1'
+ })
+ }
+ }
+ });
+ }
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ }
+ },
+ //瀹℃牳
+ check() {
+ uni.request({
+ url: this.serverUrl + '/Cj_StationOutBill/set_CheckBill',
+ method: 'GET',
+ dataType: "json",
+ data: {
+ CurUserName: uni.getStorageSync('HUserName'),
+ HInterID: this.linterid,
+ HBillSubType: '',
+ },
+ success: (res) => {
+ console.log(1, res);
+ uni.hideLoading()
+ if (res.data.count == 1) {
+ this.btnType = 3
+ let pages = getCurrentPages();
+ let prePage = pages[pages.length - 2];
+ prePage.$vm.getList()
+ uni.showModal({
+ title: '鎿嶄綔鎴愬姛',
+ content: '鏄惁缁х画鍋滅暀鍦ㄥ綋鍓嶉〉闈紵鈥樻槸鈥欏彲杩涜鍙嶅鏍革紝鈥樺惁鈥欏垯鍥炲埌涓婁竴绾у垪琛�',
+ confirmText: '鏄�',
+ cancelText: '鍚�',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮鏄�');
+ this.btnType = 3
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍚�');
+ uni.navigateBack()
+ }
+ }
+ });
+ }
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //鍙嶅鏍�
+ abandonCheck() {
+ uni.request({
+ url: this.serverUrl + '/Cj_StationOutBill/set_AbandonCheck',
+ method: 'GET',
+ dataType: "json",
+ data: {
+ CurUserName: uni.getStorageSync('HUserName'),
+ HInterID: this.linterid,
+ HBillSubType: '',
+ },
+ 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()
+ this.btnType = 2
+ uni.showModal({
+ title: '鎿嶄綔鎴愬姛',
+ content: '鏄惁缁х画鍋滅暀鍦ㄥ綋鍓嶉〉闈紵鈥樻槸鈥欏彲杩涜瀹℃牳锛屸�樺惁鈥欏垯鍥炲埌涓婁竴绾у垪琛�',
+ confirmText: '鏄�',
+ cancelText: '鍚�',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮鏄�');
+ this.btnType = 2
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍚�');
+ uni.navigateBack()
+ }
+ }
+ });
+ }
+ 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('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
+ });
+ },
+ getNextProc(){
+ uni.request({
+ url: this.serverUrl + '/LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json',
+ method: 'GET',
+ dataType: "json",
+ data: {
+ sWhere:this.hform.HProcExchHinteID
+ },
+ success: (res) => {
+ console.log(1, res);
+ if (res.data.count == 1) {
+ let processList = res.data.data
+
+ // 1. 鍏堣繃婊ゅ嚭 HSEQNumber === 'N' 鐨勬暟鎹�
+ processList = processList.filter(item => item.HSEQNumber === this.hform.HSEQNumber);
+
+ //褰撳墠宸ュ簭缂栧彿
+ const currentIndex = processList.findIndex(item => item["宸ュ簭鍙�"] === this.hform.HProcNo);
+ // 鑾峰彇涓嬩竴涓伐搴忥紙濡傛灉瀛樺湪锛�
+ const nextProcess = currentIndex !== -1 && currentIndex < processList.length - 1
+ ? processList[currentIndex + 1] : null;
+ if(!nextProcess){
+ uni.showToast({
+ title: '娌℃湁涓嬩竴閬撳伐搴忓嵆灏嗚烦杞柊澧為〉闈�',
+ icon: 'none'
+ })
+ uni.redirectTo({
+ url: '/pages/gongxuOut/form?OperationType=1'
+ })
+ }else{
+ this.hform.HProcNo=nextProcess["宸ュ簭鍙�"];
+ const HNextBarCode = this.hform.HBarCode+"@"+this.hform.HProcNo+"@"+this.hform.HSEQNumber
+ uni.redirectTo({
+ url: '/pages/gongxuOut/form?OperationType=1&HBarCode='+HNextBarCode
+ })
+ }
+ }else{
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇涓嬩竴閬撳伐搴忓け璐�',
+ icon: 'none'
+ })
+ }
+
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .form {
+ width: 668rpx;
+ margin: 20rpx auto;
+ padding-bottom: 240rpx;
+ }
+ picker input{
+ pointer-events: none;
+ }
+ .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;
+ }
+
+ }
+
+ .op {
+ display: flex;
+ justify-content: space-around;
+
+ button {
+ padding: 0;
+ width: 150rpx;
+ font-size: 25rpx;
+ }
+
+ .op1 {
+ border: 1px solid #3a78ff;
+ color: #3a78ff;
+ background-color: rgba(58, 120, 255, 0.1);
+ }
+
+ .op2 {
+ border: 1px solid #41a863;
+ color: #41a863;
+ background-color: rgba(65, 168, 99, 0.1);
+ }
+
+ .op3 {
+ border: 1px solid #da0000;
+ color: #da0000;
+ background-color: rgba(218, 0, 0, 0.1);
+ }
+ }
+
+ .has-ticking {
+ display: flex;
+ flex-direction: row;
+ justify-content: right;
+ }
+
+ .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;
+ // margin-left: 30rpx;
+ }
+
+ .btn-c {
+ background-color: #acacac;
+ color: #fff;
+ // position: absolute;
+ // right: 120rpx;
+ }
+
+ .btn-d {
+ background-color: #ff8901;
+ color: #fff;
+ // margin-left: 30rpx;
+ }
+ }
+
+ .tick-wrapper {
+ display: flex;
+ flex-direction: row;
+ gap: 20rpx;
+
+ .form-item:nth-child(1) {
+ flex: 1;
+
+ >.title {
+ width: 208rpx;
+ flex-shrink: 0;
+ }
+
+ >.right {
+ width: inherit;
+ display: flex;
+
+ input {
+ width: inherit;
+ }
+ }
+ }
+
+ .form-item:nth-child(2) {}
+
+ }
+</style>
\ No newline at end of file
diff --git a/pages/gongxuOutSendWork/table.vue b/pages/gongxuOutSendWork/table.vue
new file mode 100644
index 0000000..52b4f46
--- /dev/null
+++ b/pages/gongxuOutSendWork/table.vue
@@ -0,0 +1,365 @@
+<template>
+ <view class="content">
+ <view class="list" v-for="(item,index) in showList" :key="index">
+ <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.宸ュ簭娴佽浆鍗″彿}}
+ </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.鏃ユ湡.substr(0,10)}}
+ </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.鍑虹珯鏃堕棿.substr(0,19)}}
+ </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.LOT鏁伴噺">
+ <text>LOT鏁伴噺锛�</text>{{item.LOT鏁伴噺}}
+ </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.淇敼浜簘}
+ </view>
+ <view class="detail" v-if="item.淇敼鏃ユ湡">
+ <text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
+ </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.鍏抽棴浜簘}
+ </view>
+ <view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+ <text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.澶囨敞">
+ <text>澶囨敞锛�</text>{{item.澶囨敞}}
+ </view>
+ </view>
+
+ <view class="more" v-if="showDetail == 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">
+ <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>
+ </uni-card>
+ </view>
+
+ <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
+ <view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+ </view>
+</template>
+
+<script>
+ import { getUserInfo } from "@/utils/auth.js";
+ export default {
+ data() {
+ return {
+ userInfo:getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+ sWhere:'',
+ listData:[],
+ showList:[],
+ showDetail:-1,
+ page:1,
+ }
+ },
+ onLoad() {
+ this.getList()
+ // console.log(this.userInfo,uni.getStorageSync('HUserName'))
+ },
+ onReachBottom: function() {
+ this.page++
+ setTimeout(() => {
+ this.showList = this.showList.concat(this.getPage(this.page,this.listData))
+ }, 100)
+ },
+ onPullDownRefresh: function() {
+ this.clear()
+ setTimeout(()=>{
+ uni.stopPullDownRefresh();
+ }, 1000);
+ },
+ methods: {
+ getPage(page,list){
+ let sindex = (parseInt(page) - 1) * 20
+ let eindex = parseInt(page) * 20
+ let newList = list.slice(sindex,eindex)
+ return newList
+ },
+ getList(){
+ if(this.userInfo.HEmpID==0 || this.userInfo.HEmpID==''|| this.userInfo.HEmpID==null){
+ uni.showToast({
+ title:'鐢ㄦ埛鏈粦瀹氳亴鍛樿鍏堢粦瀹�',
+ icon:'none'
+ })
+ return false;
+ }
+ this.sWhere += ` and HEmpID = ${this.userInfo.HEmpID}
+ and CONVERT(DATE, 鏃ユ湡) = CONVERT(DATE, GETDATE())`
+ uni.showLoading({
+ title:'鍔犺浇涓�...'
+ })
+ uni.request({
+ url: this.serverUrl + '/Sc_ProcExchSendWorkBill/Sc_ProcExchSendWorkBillList',
+ data:{
+ sWhere: this.sWhere,
+ user: uni.getStorageSync('HUserName'),
+ HBillSubType:'',
+ },
+ success: (res) => {
+ // console.log(1,res.data.data);
+ if(res.data.count == 1){
+ this.listData = res.data.data
+ this.showList = this.getPage(this.page,this.listData)
+ setTimeout(()=>{
+ uni.hideLoading()
+ }, 1000)
+ }else{
+ uni.hideLoading()
+ uni.showToast({
+ title:res.data.Message,
+ icon:'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.hideLoading()
+ uni.showToast({
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
+ })
+ },
+ });
+ this.sWhere = ``
+ },
+
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .form{
+ width: 640rpx;
+ margin: 20rpx auto;
+ }
+ picker input{
+ pointer-events: none;
+ }
+ .other{
+ margin-top: 8rpx;
+ text-align: center;
+ font-size: 28rpx;
+ padding: 4rpx 18rpx;
+ color: #1890FF;
+ }
+ .form-item{
+ display: flex;
+ align-items: center;
+ font-size: 28rpx;
+ padding: 6rpx 0;
+ .title{
+ width: 180rpx;
+ text{
+ color: red;
+ font-weight: bold;
+ }
+ }
+ .choose{
+ padding: 4rpx 16rpx 0 0;
+ width: 100%;
+ text-align: right;
+ }
+ .left{
+ width: 170rpx;
+ padding: 10rpx 0;
+ margin-right: 10rpx;
+ border: 1px solid #acacac;
+ border-radius: 22rpx;
+ color: #888;
+ text-align: center;
+ }
+ .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;
+ }
+ }
+ .buttons{
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ margin-top: 20rpx;
+ 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;
+ }
+ }
+
+ .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;
+ }
+ }
+ .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;
+ }
+ }
+ }
+
+</style>
diff --git a/pages/shengchanlingliao/form.vue b/pages/shengchanlingliao/form.vue
index 9efb389..34f2d26 100644
--- a/pages/shengchanlingliao/form.vue
+++ b/pages/shengchanlingliao/form.vue
@@ -5,7 +5,7 @@
<view class="title">鏉＄爜:</view>
<view class="right" style="width: 380rpx;">
<input v-model="hform.HBarCode" :focus="HBarCodeFocus" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜"
- @confirm="getCode(hform.HBarCode)" @blur="getCode(hform.HBarCode)" />
+ @blur="getCode(hform.HBarCode)" />
</view>
<uni-icons type="scan"
style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
@@ -46,7 +46,7 @@
<view class="title">鍗曟嵁鍙�:</view>
<view class="right" style="width: 380rpx;">
<input name="HBillNo" :focus="HBillNoFocus" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜"
- @confirm="GetMeesageByBillNo()" @blur="GetMeesageByBillNo()" />
+ @blur="GetMeesageByBillNo()" />
</view>
<uni-icons type="scan"
style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
@@ -616,6 +616,7 @@
console.log('鎵爜杩斿洖', res.data);
this.hform.HBarCode = ''
if (res.data.count == 1) {
+ CommonUtils.playSound(1);
var data = res.data.data
if (data.hBarTypeField == '浠撳簱鏉＄爜') {
this.hform.HWHName = data.hWhNameField
@@ -702,6 +703,7 @@
//娓呯┖鏁伴噺
this.hform.HQty = ''
} else {
+ CommonUtils.playSound(0);
uni.showToast({
title: res.data.Message,
icon: 'none'
@@ -711,6 +713,7 @@
this.refreshHBarCodeFocus()
},
fail: (res) => {
+ CommonUtils.playSound(0);
console.log(res);
uni.showToast({
title: '鎺ュ彛璇锋眰澶辫触',
diff --git a/pages/shouliaotongzhi/table.vue b/pages/shouliaotongzhi/table.vue
index 9c8a8ca..80168f2 100644
--- a/pages/shouliaotongzhi/table.vue
+++ b/pages/shouliaotongzhi/table.vue
@@ -268,7 +268,7 @@
HBillType: printerOne['HBillType'],
HInnerBillNo: printerOne.閲囪喘璁㈠崟鍙�,
HMaterID: printerOne.HMaterID,
- HMaterNumber: printerOne.鐗╂枡浠ｇ爜,
+ HMaterNumber: printerOne.鐗╂枡浠ｇ爜.replace(/;/g, ''),
HMaterName: printerOne.鐗╂枡鍚嶇О,
HMaterModel: printerOne.瑙勬牸鍨嬪彿,
HQty: printerOne.鏁伴噺,
diff --git a/pages/shouliaotongzhi/table_son.vue b/pages/shouliaotongzhi/table_son.vue
index eb1276b..f4306bc 100644
--- a/pages/shouliaotongzhi/table_son.vue
+++ b/pages/shouliaotongzhi/table_son.vue
@@ -253,7 +253,7 @@
HInnerBillNo: data[0].閲囪喘璁㈠崟鍙�,
HMaterID: data[0].HMaterID,
HMaterNumber: data[0].鐗╂枡浠ｇ爜,
- HMaterName: data[0].鐗╂枡鍚嶇О,
+ HMaterName: data[0].鐗╂枡鍚嶇О.replace(/;/g, ''),
HMaterModel: data[0].瑙勬牸鍨嬪彿,
HQty: data[0].鏁伴噺,
HMinQty: data[0].鏁伴噺,
--
Gitblit v1.9.1