From 5b8b0ba6ebbc1d400f480db7f00b12208927ec40 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 04 三月 2026 09:57:32 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/ZLGL/QuYangHuangYang/QC_BackSampleCheckBill/QC_BackSampleCheckBill.vue | 3
pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill.vue | 2
pages/MJGL/Sc_MouldRepairCheckTaskReport/Sc_MouldRepairCheckTaskReport.vue | 216 +
pages/gongxuOut/moneystatistics.vue | 3
pages/CustomerComplaintsBill/CustomerComplaintsBillEdit.vue | 3
pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue | 3
pages/index/tab1.vue | 11
pages/caigouruku/POStockInBill.vue | 3
pages/qitachuku/qitachukudan.vue | 3
pages/qitaruku/qitarukudan.vue | 3
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue | 2
pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue | 3
pages/baogong/ProductReportStepBillList.vue | 2
pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue | 70
pages/gongxuOut/Cj_StationOutBill.vue | 3
pages/index/login.vue | 2
pages/xiaoshoutuihuo/ICStockBillMain.vue | 3
pages/ZLGL/shoujianjianyan/firstCheckBill.vue | 2
pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue | 2
pages/MJGL/MouldScrapOutBill/MouldScrapOutBill.vue | 3
utils/WebSocketServices.js | 1
pages.json | 27
pages/ZLGL/QualityReportStep/QualityReportStepBill.vue | 2
pages/xiaoshouchuku/SellOutBill.vue | 3
pages/qitaruku_v2/OtherInBill.vue | 3
pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue | 3
pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBill.vue | 3
pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue | 3
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue | 3
pages/index/tab3.vue | 62
pages/zhijiediaobo/MoveStockBill.vue | 3
pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue | 3
pages/weiwaigxOut/Cj_StationEntrustOutBill.vue | 3
pages/shoujishouming/form.vue | 2
pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue | 1
pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue | 3
pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBill.vue | 2
pages/weiwailingliao/Kf_EntrustOutBill.vue | 3
pages/shengchanbuliao/MateReplenishOutBill.vue | 3
pages/weiwairuku/EntrustInBill.vue | 3
pages/JIAOYAN/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue | 4279 +++++++++++++++++++-------------------
pages/MJGL/Sc_MouldDotCheckTaskReport/Sc_MouldDotCheckTaskReport.vue | 7
pages/baogong/AddLineBind.vue | 3
utils/common.js | 4
pages/caigoutuiliao/POStockInBackBill.vue | 3
pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue | 7
pages/gongxuIn/Cj_StationInBill.vue | 2
pages/fenbushidiaochudan/form_out.vue | 3
pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue | 1
pages/shengchantuiliao/MateOutBackBill.vue | 3
pages/baogong/OA_ErrMsgBackBill.vue | 4
pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue | 3
pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue | 3
pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue | 3
pages/fenbushidiaorudan/form.vue | 3
pages/MJGL/Sb_EquipDotCheckTaskReport/Sb_EquipDotCheckTaskReport.vue | 11
pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue | 2
pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue | 3
pages/shengchanrukushengdan/Kf_ProductInBill.vue | 3
pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue | 7
manifest.json | 9
pages/MJGL/Sb_EquipRepairCheckTaskReport/Sb_EquipRepairCheckTaskReport.vue | 216 +
components/StationOutBillPopup/StationOutBillPopup.vue | 1398 ++++++------
pages/EmployeeRecords/EmployeeRecordsBill.vue | 3
pages/qitachuku_v2/OtherOutBill.vue | 3
pages/weiwaigxIn/Cj_StationEntrustInBill.vue | 2
66 files changed, 3,548 insertions(+), 2,915 deletions(-)
diff --git a/components/StationOutBillPopup/StationOutBillPopup.vue b/components/StationOutBillPopup/StationOutBillPopup.vue
index 8e8a697..5714e22 100644
--- a/components/StationOutBillPopup/StationOutBillPopup.vue
+++ b/components/StationOutBillPopup/StationOutBillPopup.vue
@@ -1,141 +1,145 @@
<template>
<view>
- <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
- <view class="form">
- <view class="form-item" v-show="false">
- <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" v-show="false">
- <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" v-show="false">
- <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" v-show="false">
- <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" v-show="false">
- <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" v-show="false">
- <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>
+ <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
+ <view class="form">
+ <view class="form-item" v-show="false">
+ <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" v-show="false">
+ <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" v-show="false">
+ <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" v-show="false">
+ <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" v-show="false">
+ <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" v-show="false">
+ <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="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>
@@ -144,76 +148,76 @@
</checkbox-group>
</view> -->
- <view class="tab_area"></view>
+ <view class="tab_area"></view>
- <view class="form-item" v-show="false">
- <view class="title">鍗曟嵁鍙�:</view>
- <view class="righton">
- <input name="HBillNo" disabled v-model="hform.HBillNo" />
- </view>
- </view>
- <view class="form-item" v-show="false" >
- <view class="title">鐢熶骇璁㈠崟:</view>
- <view class="righton">
- <input name="HICMOBillNo" disabled v-model="hform.HICMOBillNo" />
- </view>
- </view>
- <view class="form-item" v-show="false">
- <view class="title">娴佽浆鍗�:</view>
- <view class="righton">
- <input disabled v-model="hform.HProcExchBillNo" />
- </view>
- </view>
- <view class="form-item" v-show="false">
- <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" v-show="false">
- <view class="title">鐗╂枡鍚嶇О:</view>
- <view class="righton">
- <input v-model="hform.HMaterName" disabled />
- </view>
- </view>
- <view class="form-item" v-show="false">
- <view class="title">瑙勬牸鍨嬪彿:</view>
- <view class="righton">
- <input v-model="hform.HMaterModel" disabled />
- </view>
- </view>
- <view class="form-item" v-show="false">
- <view class="title">娆惧彿:</view>
- <view class="righton">
- <input v-model="hform.HStyleNumber" disabled />
- </view>
- </view>
- <view class="form-item" v-show="false">
- <view class="title">璁￠噺鍗曚綅:</view>
- <view class="righton">
- <input v-model="hform.鍗曚綅" disabled />
- </view>
- </view>
- <view class="form-item" v-show="false">
- <view class="title">宸ュ簭:</view>
- <!-- <view class="right">
+ <view class="form-item" v-show="false">
+ <view class="title">鍗曟嵁鍙�:</view>
+ <view class="righton">
+ <input name="HBillNo" disabled v-model="hform.HBillNo" />
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title">鐢熶骇璁㈠崟:</view>
+ <view class="righton">
+ <input name="HICMOBillNo" disabled v-model="hform.HICMOBillNo" />
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title">娴佽浆鍗�:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HProcExchBillNo" />
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <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" v-show="false">
+ <view class="title">鐗╂枡鍚嶇О:</view>
+ <view class="righton">
+ <input v-model="hform.HMaterName" disabled />
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title">瑙勬牸鍨嬪彿:</view>
+ <view class="righton">
+ <input v-model="hform.HMaterModel" disabled />
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title">娆惧彿:</view>
+ <view class="righton">
+ <input v-model="hform.HStyleNumber" disabled />
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <view class="title">璁￠噺鍗曚綅:</view>
+ <view class="righton">
+ <input v-model="hform.鍗曚綅" disabled />
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <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" v-show="false">
- <view class="title">鐢熶骇缁勭粐:</view>
- <view class="righton">
- <input v-model="hform.HPRDOrg" disabled />
- </view>
- </view>
-
+ <view class="righton">
+ <input v-model="hform.HProcName" disabled />
+ </view>
+ </view>
+ <view class="form-item" v-show="false">
+ <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">
@@ -272,151 +276,153 @@
</view>
</view> -->
- <view class="tab_area"></view>
+ <view class="tab_area"></view>
- <view class="form-item" v-show="false">
- <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" v-show="false">
- <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" v-show="false">
- <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" v-show="false">
- <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" v-show="false">
- <view class="title"></view>
- <!-- <view style="padding-top: 10rpx;" @tap="hform.HLastSubProc = hform.HLastSubProc==true?false:true">
+ <view class="form-item" v-show="false">
+ <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" v-show="false">
+ <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" v-show="false">
+ <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" v-show="false">
+ <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" v-show="false">
+ <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 style="padding-top: 10rpx;">
+ <radio value="true" :checked="hform.HLastSubProc == true" style="transform:scale(1);" />杞笅閬�
+ </view>
+ </view>
- <view v-if="showmore" v-show="false">
- <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 v-if="showmore" v-show="false">
+ <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="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="op">
+ <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="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>
- <!-- <button class="btn-b" size="mini" @tap="addNew">鏂板</button>
+ <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>
+ <!-- <button class="btn-b" size="mini" @tap="addNew">鏂板</button>
<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button> -->
- </view>
- </view>
- </uni-popup>
- </view>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
</template>
<script>
import getDateTime from '@/utils/getdateTime.js';
import {
getUserInfo
} from "@/utils/auth.js";
-import { CommonUtils } from '../../utils/common';
+ import {
+ CommonUtils
+ } from '../../utils/common';
export default {
- name: "BillListPopup_gongxuOut",
+ name: "BillListPopup_gongxuOut",
data() {
return {
userInfo: getUserInfo(),
@@ -442,8 +448,8 @@
HEmpNameList: [],
arrayHCenterName: [], //宸ヤ綔涓績
HCenterNameList: [],
- arrayHSEQName:[],//搴忓垪
- HSEQNameList:[],
+ arrayHSEQName: [], //搴忓垪
+ HSEQNameList: [],
isEdit: false,
hform: {
HInterID: '',
@@ -451,12 +457,12 @@
HBarCode: '',
HProcNo: '',
HQty: '',
- HBadCount:0,
- HProcNumber: '',
+ HBadCount: 0,
+ HProcNumber: '',
HNotReportQty: 0,
HIsTimeFlag: 0,
- HRelBeginTime:'',
- HRelEndTime:'',
+ HRelBeginTime: '',
+ HRelEndTime: '',
// HPieceQty:'',
HWasterQty: 0,
HSourceName: '',
@@ -467,8 +473,8 @@
HGroupID: 0,
HEmpName: '',
HEmpID: 0,
- HSEQName:'',
- HSEQNumber:0,
+ HSEQName: '',
+ HSEQNumber: 0,
HRemark: '',
HDate: getDateTime.dateTimeStr('y-m-d'),
@@ -538,15 +544,15 @@
// HCloseDate:'',
HDeleteMan: '',
HDeleteDate: '',
-
- HStyleNumber: '', // 娆惧彿
+
+ HStyleNumber: '', // 娆惧彿
eventType: 'Add',
}
}
},
-
- mounted(e) {
+
+ mounted(e) {
// this.getEditData('1516','GXCZHB000000001290')
console.log(e, this.userInfo)
// this.hform.HEmpID = this.userInfo.Czybm
@@ -555,23 +561,23 @@
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.getNewData()
+ // 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.getNewData()
this.getHMaterList()
this.getHProcList()
this.getHSupList()
@@ -581,40 +587,40 @@
this.getHCenterList()
this.getDefValByUser()
-
+
},
methods: {
- //鎵撳紑鏃跺姞杞�
- popupChangeHandler(e) {
- if (e.show === false) {
- this.hform.HQty='';
- this.hform.HBadCount=0;
- this.hform.HWasterQty=0;
- this.getNewData()
- }
- },
- //鎵撳紑寮规
- showPopup(hBarCode) {
- this.hform.HBarCode=hBarCode;
- this.toInCode(hBarCode);
- this.$refs.popup.open();
- },
- //閫変腑鍏ㄩ儴鏂囨湰
- selectAllText(e) {
- console.log(e.target)
- console.log(e)
- },
+ //鎵撳紑鏃跺姞杞�
+ popupChangeHandler(e) {
+ if (e.show === false) {
+ this.hform.HQty = '';
+ this.hform.HBadCount = 0;
+ this.hform.HWasterQty = 0;
+ this.getNewData()
+ }
+ },
+ //鎵撳紑寮规
+ showPopup(hBarCode) {
+ this.hform.HBarCode = hBarCode;
+ this.toInCode(hBarCode);
+ this.$refs.popup.open();
+ },
+ //閫変腑鍏ㄩ儴鏂囨湰
+ selectAllText(e) {
+ console.log(e.target)
+ console.log(e)
+ },
onCGChangeHandler({
detail
}) {
- console.log(detail.value[0])
+ 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;
- }
+ if (detail.value[0]) {
+ this.getNewHRelBeginDate()
+ this.hform.HRelEndTime = getDateTime.dateTimeStr('y-m-d h:i');
+ } else {
+ this.hform.HWorkTimes = 0;
+ }
},
//閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
getDefValByUser() {
@@ -668,18 +674,18 @@
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)
- }
-
+ //濡傛灉浠ｇ爜鍖呭惈瀛愬簭鍒�
+ 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
@@ -711,15 +717,15 @@
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)
+ 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 {
@@ -736,7 +742,7 @@
}, (ret) => {
console.log(ret.resp_result)
this.hform.HProcNo = ret.resp_result
- this.getHProcNoData2(this.hform.HBarCode, ret.resp_result,this.hform.HSEQNumber)
+ this.getHProcNoData2(this.hform.HBarCode, ret.resp_result, this.hform.HSEQNumber)
})
},
//鏃ユ湡
@@ -744,20 +750,22 @@
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);
- },
+ 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')
@@ -990,7 +998,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
@@ -1098,70 +1107,72 @@
}
}
},
- //搴忓垪鑾峰彇
- 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 {
- if(res.data.Message=="瀛愬簭鍒楃己澶�"){
- this.getHProcNoData(this.hform.HBarCode,this.hform.HProcNo)
- }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;
- }
- }
- },
+ //搴忓垪鑾峰彇
+ 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 {
+ if (res.data.Message == "瀛愬簭鍒楃己澶�") {
+ this.getHProcNoData(this.hform.HBarCode, this.hform.HProcNo)
+ } 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 = {
@@ -1241,31 +1252,49 @@
},
});
},
- 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: ''}
- },
+ 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
- })
- }
-
+ let {
+ pass,
+ message
+ } = this.preEditOrAddCheck()
+ if (pass == false) {
+ return uni.showToast({
+ icon: 'none',
+ title: message
+ })
+ }
+
//鏄惁缂栬緫
uni.request({
url: this.serverUrl + '/Cj_StationOutBill/set_ShowBillJudge',
@@ -1307,7 +1336,7 @@
console.log(1, res.data.data[0]);
if (res.data.code == 1) {
var data = res.data.data[0]
- this.getHBarCodeData(data.HBarCode,1)
+ this.getHBarCodeData(data.HBarCode, 1)
//this.getHProcNoData(data.HBarCode, data.HProcNo)
this.hform.HInterID = data.HInterID
@@ -1318,9 +1347,9 @@
// this.hform.HPieceQty= data.HPieceQty
this.hform.HIsTimeFlag = data.HIsTimeFlag || 0
this.hform.HNotReportQty = data.HNotReportQty
- this.hform.HProcNumber = data.HProcNumber || ''
+ this.hform.HProcNumber = data.HProcNumber || ''
this.hform.HWasterQty = data.HWasterQty
- this.hform.HBadCount = data.HBadCount
+ this.hform.HBadCount = data.HBadCount
this.hform.HSourceID = data.HSourceID
this.hform.HSourceName = data.HSourceName
this.hform.HGroupID = data.HGroupID
@@ -1417,10 +1446,10 @@
this.hform.HCenterName = data.宸ヤ綔涓績
this.hform.HCenterID = data.HCenterID
this.hform.NoOutboundHqty = (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
- this.hform.HStyleNumber = data['娆惧彿']
- //璁剧疆搴忓垪
- this.getHSEQList(e);
-
+ this.hform.HStyleNumber = data['娆惧彿']
+ //璁剧疆搴忓垪
+ this.getHSEQList(e);
+
} else {
uni.showToast({
title: res.data.Message,
@@ -1455,10 +1484,10 @@
this.hform.HCenterID = data.HCenterID
this.hform.NoOutboundHqty = (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
this.hform.HNotReportQty = data['鏈姤宸ユ暟閲�']
- this.hform.HProcNumber = data['宸ュ簭浠ｇ爜']
+ this.hform.HProcNumber = data['宸ュ簭浠ｇ爜']
this.hform.HIsTimeFlag = data['鏄惁璁℃椂'] ? 1 : 0
- // this.hform.HStyleNumber = data['娆惧彿']
- // this.hform.HQty = data.鍚堟牸鏁伴噺
+ // this.hform.HStyleNumber = data['娆惧彿']
+ // this.hform.HQty = data.鍚堟牸鏁伴噺
if (data.棣栭亾宸ュ簭 == "鏄�") {
this.FirstEndHProcNo = 1
}
@@ -1481,13 +1510,13 @@
},
});
},
- getHProcNoData2(HBarCode, HProcNo,HSEQNumber) {
+ getHProcNoData2(HBarCode, HProcNo, HSEQNumber) {
uni.request({
url: this.serverUrl + '/Cj_StationOutBill/txtHProcNo_KeyDown',
data: {
sBillNo: HBarCode,
sProcNo: HProcNo,
- HSEQNumber:HSEQNumber
+ HSEQNumber: HSEQNumber
},
success: (res) => {
console.log(3, res);
@@ -1500,15 +1529,15 @@
this.hform.HCenterID = data.HCenterID
this.hform.NoOutboundHqty = (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
this.hform.HNotReportQty = data['鏈姤宸ユ暟閲�']
- this.hform.HProcNumber = 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.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
}
@@ -1531,63 +1560,68 @@
},
});
},
- //鑾峰彇鏈�鏂扮殑鎶ュ伐鏃ユ湡
- getNewHRelBeginDate(){
- uni.request({
- url: this.serverUrl + '/Cj_StationOutBill/get_Display',
- data:{
- sWhere: ` and HEmpID = N'${this.hform.HEmpID}'`,
- user: uni.getStorageSync('HUserName'),
- HBillSubType:'',
- },
- success: (res) => {
- if(res.data.count == 1){
- //鑾峰彇鍒楄〃鏁版嵁
- const listData = res.data.data
- // 鑾峰彇褰撳墠鏃ユ湡锛堝幓鎺夋椂闂撮儴鍒嗭級
- const today = new Date();
- today.setHours(0, 0, 0, 0);
- if(listData.length==0){
- this.hform.HRelBeginTime = getDateTime.dateTimeSetHoureStr(7, 40, 0, 0,'y-m-d h:i');
- this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime);
- }else{
- // 浠庡璞℃暟缁勪腑鎻愬彇鎵�鏈夋棩鏈熷瓧娈靛苟鎵惧埌鏈�澶у��
- const maxDate = listData.reduce((max, obj) => {
- const date = new Date(obj.鍑虹珯鏃堕棿);
- return date > max ? date : max;
- }, new Date(0)); // 鍒濆鍊间负鏈�灏忔棩鏈�
- // 姣旇緝鏈�澶ф棩鏈熷拰浠婂ぉ鐨勬棩鏈熼儴鍒嗭紙涓嶆瘮杈冩椂闂达級
- const maxDateDateOnly = new Date(maxDate);
- maxDateDateOnly.setHours(0, 0, 0, 0);
- // 姣旇緝鏈�澶ф棩鏈熷拰浠婂ぉ
- if (maxDateDateOnly.getTime() !== today.getTime()) {
- // 濡傛灉涓嶆槸浠婂ぉ锛岃繑鍥炲綋鍓嶆棩鏈�
- this.hform.HRelBeginTime = getDateTime.dateTimeSetHoureStr(7, 40, 0, 0,'y-m-d h:i');
- this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime);
- }else{
- this.hform.HRelBeginTime = getDateTime.formatDate(maxDate);
- this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime);
- }
- }
- }else{
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- },
- //鏂板
+ //鑾峰彇鏈�鏂扮殑鎶ュ伐鏃ユ湡
+ getNewHRelBeginDate() {
+ uni.request({
+ url: this.serverUrl + '/Cj_StationOutBill/get_Display',
+ data: {
+ sWhere: ` and HEmpID = N'${this.hform.HEmpID}'`,
+ user: uni.getStorageSync('HUserName'),
+ HBillSubType: '',
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ //鑾峰彇鍒楄〃鏁版嵁
+ const listData = res.data.data
+ // 鑾峰彇褰撳墠鏃ユ湡锛堝幓鎺夋椂闂撮儴鍒嗭級
+ const today = new Date();
+ today.setHours(0, 0, 0, 0);
+ if (listData.length == 0) {
+ this.hform.HRelBeginTime = getDateTime.dateTimeSetHoureStr(7, 40, 0, 0,
+ 'y-m-d h:i');
+ this.hform.HWorkTimes = getDateTime.calculateHoursDiff(this.hform
+ .HRelBeginTime, this.hform.HRelEndTime);
+ } else {
+ // 浠庡璞℃暟缁勪腑鎻愬彇鎵�鏈夋棩鏈熷瓧娈靛苟鎵惧埌鏈�澶у��
+ const maxDate = listData.reduce((max, obj) => {
+ const date = new Date(obj.鍑虹珯鏃堕棿);
+ return date > max ? date : max;
+ }, new Date(0)); // 鍒濆鍊间负鏈�灏忔棩鏈�
+ // 姣旇緝鏈�澶ф棩鏈熷拰浠婂ぉ鐨勬棩鏈熼儴鍒嗭紙涓嶆瘮杈冩椂闂达級
+ const maxDateDateOnly = new Date(maxDate);
+ maxDateDateOnly.setHours(0, 0, 0, 0);
+ // 姣旇緝鏈�澶ф棩鏈熷拰浠婂ぉ
+ if (maxDateDateOnly.getTime() !== today.getTime()) {
+ // 濡傛灉涓嶆槸浠婂ぉ锛岃繑鍥炲綋鍓嶆棩鏈�
+ this.hform.HRelBeginTime = getDateTime.dateTimeSetHoureStr(7, 40, 0, 0,
+ 'y-m-d h:i');
+ this.hform.HWorkTimes = getDateTime.calculateHoursDiff(this.hform
+ .HRelBeginTime, this.hform.HRelEndTime);
+ } else {
+ this.hform.HRelBeginTime = getDateTime.formatDate(maxDate);
+ this.hform.HWorkTimes = getDateTime.calculateHoursDiff(this.hform
+ .HRelBeginTime, this.hform.HRelEndTime);
+ }
+ }
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //鏂板
getNewData() {
-
+
uni.request({
url: this.serverUrl + '/Web/GetMAXNum',
data: {
@@ -1620,9 +1654,9 @@
})
},
submit() {
- //鍘婚櫎鍒嗗彿浠ュ厤鍚庣鍒嗚В鎶ラ敊
- this.hform.HMaterName= this.hform.HMaterName.replace(/;/g, '');
- this.hform.HMaterModel = this.hform.HMaterModel.replace(/;/g, '');
+ //鍘婚櫎鍒嗗彿浠ュ厤鍚庣鍒嗚В鎶ラ敊
+ this.hform.HMaterName = this.hform.HMaterName.replace(/;/g, '');
+ this.hform.HMaterModel = this.hform.HMaterModel.replace(/;/g, '');
if (!this.hform.HBarCode) {
uni.showToast({
title: '璇锋壂鎻忚澶囨潯褰㈢爜',
@@ -1644,15 +1678,18 @@
icon: 'none'
})
} else {
-
- let {pass, message} = this.preEditOrAddCheck()
- if(pass == false) {
- return uni.showToast({
- icon: 'none',
- title: message
- })
- }
-
+
+ let {
+ pass,
+ message
+ } = this.preEditOrAddCheck()
+ if (pass == false) {
+ return uni.showToast({
+ icon: 'none',
+ title: message
+ })
+ }
+
uni.showLoading({
title: '璇风◢鍊�'
})
@@ -1686,41 +1723,41 @@
// let prePage = pages[pages.length - 2];
// prePage.$vm.getList()
if (this.isEdit) {
- uni.showToast({
- title: '淇敼鎴愬姛',
- icon: 'none'
- })
+ uni.showToast({
+ title: '淇敼鎴愬姛',
+ icon: 'none'
+ })
setTimeout(() => {
uni.redirectTo({
url: '/pages/gongxuOut/Cj_StationOutBillList'
})
}, 1000)
} else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- // uni.showModal({
- // title: '鎻愮ず',
- // content: res.data.Message + '銆傛槸鍚︾户缁柊澧炰笅涓�閬撳伐搴忥紵(鐐瑰嚮鍙栨秷杩斿洖鏂板椤甸潰)',
- // success: (res) => {
- // if (res.confirm) {
- // console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- // this.getNextProc()
- // // uni.redirectTo({
- // // url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
- // // })
- // } else if (res.cancel) {
- // console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- // // setTimeout(() => {
- // // uni.navigateBack();
- // // }, 50)
- // uni.redirectTo({
- // url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
- // })
- // }
- // }
- // });
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ // uni.showModal({
+ // title: '鎻愮ず',
+ // content: res.data.Message + '銆傛槸鍚︾户缁柊澧炰笅涓�閬撳伐搴忥紵(鐐瑰嚮鍙栨秷杩斿洖鏂板椤甸潰)',
+ // success: (res) => {
+ // if (res.confirm) {
+ // console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ // this.getNextProc()
+ // // uni.redirectTo({
+ // // url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
+ // // })
+ // } else if (res.cancel) {
+ // console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ // // setTimeout(() => {
+ // // uni.navigateBack();
+ // // }, 50)
+ // uni.redirectTo({
+ // url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
+ // })
+ // }
+ // }
+ // });
}
} else {
uni.showToast({
@@ -1851,60 +1888,65 @@
}
});
},
- 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/Cj_StationOutBill?OperationType=1'
- })
- }else{
- this.hform.HProcNo=nextProcess["宸ュ簭鍙�"];
- const HNextBarCode = this.hform.HBarCode+"@"+this.hform.HProcNo+"@"+this.hform.HSEQNumber
- uni.redirectTo({
- url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1&HBarCode='+HNextBarCode
- })
- }
- }else{
- console.log(res);
- uni.showToast({
- title: '鑾峰彇涓嬩竴閬撳伐搴忓け璐�',
- icon: 'none'
- })
- }
-
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- });
- }
+ 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/Cj_StationOutBill?OperationType=1'
+ })
+ } else {
+ this.hform.HProcNo = nextProcess["宸ュ簭鍙�"];
+ const HNextBarCode = this.hform.HBarCode + "@" + this.hform.HProcNo + "@" +
+ this.hform.HSEQNumber
+ uni.redirectTo({
+ url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1&HBarCode=' +
+ HNextBarCode
+ })
+ }
+ } else {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇涓嬩竴閬撳伐搴忓け璐�',
+ icon: 'none'
+ })
+ }
+
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ }
}
}
</script>
@@ -1918,11 +1960,13 @@
display: flex;
flex-direction: column;
gap: 10rpx;
- overflow-y: auto;
+ overflow-y: auto;
}
- picker input{
- pointer-events: none;
- }
+
+ picker input {
+ pointer-events: none;
+ }
+
.tab_area {
width: 100%;
height: 50rpx;
diff --git a/manifest.json b/manifest.json
index 625d02f..5b88679 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "2.084",
- "versionCode" : 284,
+ "versionName" : "2.085",
+ "versionCode" : 285,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
@@ -52,7 +52,6 @@
},
/* ios鎵撳寘閰嶇疆 */
"ios" : {
-
"dSYMs" : false,
"privacyDescription" : {
"NSPhotoLibraryUsageDescription" : "鎴戜滑闇�瑕佽闂偍鐨勭浉鍐屾潵杩涜鍥剧墖閫夋嫨",
@@ -63,9 +62,7 @@
/* SDK閰嶇疆 */
"sdkConfigs" : {
"ad" : {},
- "push" : {
-
- }
+ "push" : {}
},
"icons" : {
"android" : {
diff --git a/pages.json b/pages.json
index 8b642b1..8d44169 100644
--- a/pages.json
+++ b/pages.json
@@ -1850,14 +1850,14 @@
"path" : "pages/MJGL/Sb_EquipDotCheckTaskReport/Sb_EquipDotCheckTaskReport",
"style" :
{
- "navigationBarTitleText" : "璁惧鐐规浠诲姟"
+ "navigationBarTitleText" : "璁惧寰呯偣妫�浠诲姟"
}
},
{
"path" : "pages/MJGL/Sc_MouldDotCheckTaskReport/Sc_MouldDotCheckTaskReport",
"style" :
{
- "navigationBarTitleText" : "鍣ㄥ叿鐐规浠诲姟"
+ "navigationBarTitleText" : "妯″叿寰呯偣妫�浠诲姟"
}
},
{
@@ -1871,7 +1871,28 @@
"path" : "pages/MJGL/Sc_MouldRepairCheckTaskReport/Sc_MouldRepairCheckTaskReport",
"style" :
{
- "navigationBarTitleText" : "鍣ㄥ叿鐧昏鏁呴殰璺熻釜"
+ "navigationBarTitleText" : "妯″叿鏁呴殰鐧昏璺熻釜"
+ }
+ },
+ {
+ "path" : "pages/MJGL/Sc_MouldUpperAwaitQuery/Sc_MouldUpperAwaitQuery",
+ "style" :
+ {
+ "navigationBarTitleText" : "妯″叿寰呬笂妯℃煡璇�"
+ }
+ },
+ {
+ "path" : "pages/Cj_StationInBillAwaitQuery/Cj_StationInBillAwaitQuery",
+ "style" :
+ {
+ "navigationBarTitleText" : "寰呭紑宸ユ煡璇�"
+ }
+ },
+ {
+ "path" : "pages/MJGL/Sc_MouldLowerBillAwaitQuery/Sc_MouldLowerBillAwaitQuery",
+ "style" :
+ {
+ "navigationBarTitleText" : "寰呬笅妯℃煡璇�"
}
},
{
diff --git a/pages/CustomerComplaintsBill/CustomerComplaintsBillEdit.vue b/pages/CustomerComplaintsBill/CustomerComplaintsBillEdit.vue
index cf182b6..093eabe 100644
--- a/pages/CustomerComplaintsBill/CustomerComplaintsBillEdit.vue
+++ b/pages/CustomerComplaintsBill/CustomerComplaintsBillEdit.vue
@@ -550,7 +550,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/EmployeeRecords/EmployeeRecordsBill.vue b/pages/EmployeeRecords/EmployeeRecordsBill.vue
index f476662..e1fd766 100644
--- a/pages/EmployeeRecords/EmployeeRecordsBill.vue
+++ b/pages/EmployeeRecords/EmployeeRecordsBill.vue
@@ -530,7 +530,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/JIAOYAN/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue b/pages/JIAOYAN/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
index 1f2c0b3..40f6347 100644
--- a/pages/JIAOYAN/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
+++ b/pages/JIAOYAN/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
@@ -1,2231 +1,2234 @@
<template>
- <view>
- <!-- 涓昏〃鍖哄煙 -->
- <view class="bill-main-area">
- <!-- 涓昏〃椤电 -->
- <view class="bill-main-tabs">
- <view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">鍩烘湰淇℃伅</view>
- <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍏朵粬淇℃伅</view>
- <view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">鍒跺崟淇℃伅</view>
- </view>
- <!-- 涓昏〃鍐呭 -->
- <view class="bill-main-contents">
- <!-- 鍩烘湰淇℃伅 -->
- <view class="bill-main-content" v-if="mainTabSelected == 1">
- <view class="form-item">
- <view class="left">鍗曟嵁鍙�</view>
- <view class="right disabled">
- <input type="text" :value="hform.HBillNo" disabled />
- </view>
- </view>
+ <view>
+ <!-- 涓昏〃鍖哄煙 -->
+ <view class="bill-main-area">
+ <!-- 涓昏〃椤电 -->
+ <view class="bill-main-tabs">
+ <view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">鍩烘湰淇℃伅</view>
+ <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍏朵粬淇℃伅</view>
+ <view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">鍒跺崟淇℃伅</view>
+ </view>
+ <!-- 涓昏〃鍐呭 -->
+ <view class="bill-main-contents">
+ <!-- 鍩烘湰淇℃伅 -->
+ <view class="bill-main-content" v-if="mainTabSelected == 1">
+ <view class="form-item">
+ <view class="left">鍗曟嵁鍙�</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HBillNo" disabled />
+ </view>
+ </view>
- <view class="form-item">
- <view class="left">鏃ユ湡</view>
- <view class="right">
- <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HDate">
- <view>{{ hform.HDate }}</view>
- </uni-datetime-picker>
- </view>
- </view>
+ <view class="form-item">
+ <view class="left">鏃ユ湡</view>
+ <view class="right">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HDate">
+ <view>{{ hform.HDate }}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
- <view class="form-item">
- <view class="left">婧愬崟鍗曞彿</view>
- <view class="right" :class="!hasSourceBill?'':'disabled'">
- <input type="text" :disabled="hasSourceBill" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�"
- v-model="hform.HSourceBillNo" @confirm="getSourceBillInfo(hform.HSourceBillNo)" />
- </view>
- <view class="icon-wrapper-big">
- <uni-icons class="right-icon" type="scan" style="
+ <view class="form-item">
+ <view class="left">婧愬崟鍗曞彿</view>
+ <view class="right" :class="!hasSourceBill?'':'disabled'">
+ <input type="text" :disabled="hasSourceBill" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�"
+ v-model="hform.HSourceBillNo" @confirm="getSourceBillInfo(hform.HSourceBillNo)" />
+ </view>
+ <view class="icon-wrapper-big">
+ <uni-icons class="right-icon" type="scan" style="
background-color: #3a78ff;
padding: 6rpx;
color: #fff;
border-radius: 100%;
" size="20" @click="toScanCode"></uni-icons>
- </view>
- </view>
- <view class="form-item" v-if="false">
- <view class="left">鐢熶骇璧勬簮</view>
- <view class="right">
- <uni-combox :candidates="GySourceNameList" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
- @update:modelValue="HSourceChange"></uni-combox>
- </view>
- </view>
- <view class="form-item" v-if="false">
- <view class="left">鐢熶骇鐝</view>
- <view class="right">
- <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
- v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
- </view>
- </view>
- <view class="form-item" v-if="false">
- <view class="left">浠诲姟鍗曞彿</view>
- <view class="right disabled">
- <input type="text" :value="hform.HICMOBillNo" disabled />
- </view>
- <view class="icon-wrapper-big"><uni-icons type="search" size="20"
- @click="showSelectorModule(hform, 5)"></uni-icons></view>
- </view>
- <view class="form-item" v-if="false">
- <view class="left">娴佽浆鍗″彿</view>
- <view class="right disabled">
- <input type="text" :value="hform.HProcExchBillNo" disabled />
- </view>
- <view class="icon-wrapper-big"><uni-icons type="search" size="20"
- @click="showSelectorModule(hform, 6)"></uni-icons></view>
- </view>
- <view class="form-item">
- <view class="left">浜у搧浠ｇ爜</view>
- <view class="right disabled">
- <input type="text" disabled :value="hform.HMaterNumber" />
- </view>
- <view class="icon-wrapper-big">
- <uni-icons type="search" size="20" @click="showSelectorModule(hform, 4)"></uni-icons>
- </view>
- </view>
- <view class="form-item">
- <view class="left">浜у搧鍚嶇О</view>
- <view class="right disabled">
- <input type="text" disabled :value="hform.HMaterName" />
- </view>
- </view>
- <view class="form-item">
- <view class="left">妫�楠屽憳</view>
- <view class="right">
- <uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="璇烽�夋嫨妫�楠屽憳"
- :v-model="hform.HFirstCheckEmpName"
- @update:modelValue="HFirstCheckEmpChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="left">妫�楠屾柟妗�</view>
- <view class="right disabled">
- <input type="text" disabled :value="this.hform.HQCSchemeName" />
- </view>
- <view class="icon-wrapper-big"><uni-icons type="search" size="20"
- @click="showSelectorModule(hform, 7)"></uni-icons></view>
- </view>
-
- <view class="form-item">
- <view class="left">鍒ゆ柇缁撹</view>
- <view class="right none-border">
- <radio-group @changer="checkResultChange">
- <label>
- <radio value="0" :checked="hform.HLastResult" /><text></text>
- 鍚堟牸
- </label>
- <view style="width: 20rpx; display: inline-block"></view>
- <label>
- <radio value="1" :checked="!hform.HLastResult" /><text></text>
- 涓嶅悎鏍�
- </label>
- </radio-group>
- </view>
- </view>
- <view class="form-item">
- <view class="left">宸ュ簭</view>
- <view class="right disabled">
- <input type="text" disabled :value="hform.HProcName" />
- </view>
- <view class="icon-wrapper-big"><uni-icons type="search" size="20"
- @click="showSelectorModule(hform, 8)"></uni-icons></view>
- </view>
-
- </view>
- <!-- 鍏朵粬淇℃伅 -->
- <view class="bill-main-content" v-if="mainTabSelected == 2">
- <view class="form-item">
- <view class="left">婧愬崟绫诲瀷</view>
- <view class="right" style="position: relative" :class="!hasSourceBill?'':'disabled'">
- <picker mode="selector" :range="HSourceBillTypeNameList" :disabled="hasSourceBill"
- @change="HSourceBillTypeNameChange">
- <input type="text" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" v-model="HSourceBillType" disabled/>
- <view class="picker-overlay"></view>
- </picker>
- </view>
- </view>
- <view class="form-item" v-if="false">
- <view class="left">鐢熶骇鐝</view>
- <view class="right">
- <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
- v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="left">寮傚父涓存椂澶勭悊鏂规</view>
- <view class="right">
- <input type="text" v-model="hform.HErrTreatment" value="" />
- </view>
- </view>
- <view class="form-item" v-if="false">
- <view class="left">浠诲姟鍗曟暟閲�</view>
- <view class="right">
- <input type="number" v-model="hform.HICMOQty" />
- </view>
- </view>
- <view class="form-item" v-if="false">
- <view class="left">娴佽浆鍗℃暟閲�</view>
- <view class="right">
- <input type="number" v-model="hform.HProcExchQty" />
- </view>
- </view>
- <view class="form-item">
- <view class="left">鎵瑰彿</view>
- <view class="right">
- <input type="text" value="" />
- </view>
- </view>
- <view class="form-item">
- <view class="left">澶囨敞</view>
- <view class="right">
- <input type="text" v-model="hform.HRemark" value="" />
- </view>
- </view>
- </view>
- <!-- 鍒跺崟淇℃伅 -->
- <view class="bill-main-content" v-if="mainTabSelected == 3">
- <view class="form-item">
- <view class="left">鍒跺崟浜�</view>
- <view class="right disabled">
- <input type="text" :value="hform.HMaker" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">鍒跺崟鏃ユ湡</view>
- <view class="right disabled">
- <input type="text" :value="hform.HMakeDate" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">瀹℃牳浜�</view>
- <view class="right disabled">
- <input type="text" :value="hform.HChecker" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">瀹℃牳鏃ユ湡</view>
- <view class="right disabled">
- <input type="text" :value="hform.HCheckDate" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">鍏抽棴浜�</view>
- <view class="right disabled">
- <input type="text" :value="hform.HCloseMan" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">鍏抽棴鏃ユ湡</view>
- <view class="right disabled">
- <input type="text" :value="hform.HCloseDate" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">淇敼浜�</view>
- <view class="right disabled">
- <input type="text" :value="hform.HUpDater" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">淇敼鏃ユ湡</view>
- <view class="right disabled">
- <input type="text" :value="hform.HUpDateDate" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">浣滃簾浜�</view>
- <view class="right disabled">
- <input type="text" :value="hform.HDeleteMan" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">浣滃簾鏃ユ湡</view>
- <view class="right disabled">
- <input type="text" :value="hform.HDeleteDate" disabled />
- </view>
- </view>
- </view>
- </view>
- </view>
- <!-- 瀛愯〃鍖哄煙 -->
- <view class="bill-sub-area">
- <!-- 瀛愯〃椤电 -->
- <view class="bill-sub-tabs">
- <view v-for="subTab in subTabs" :key="subTab.id" :class="subTab.id == subTabSelected ? 'selected' : ''"
- @tap="subTabSelected = subTab.id">{{ subTab.name }}</view>
- </view>
- <!-- 瀛愯〃鍐呭 -->
- <view class="bill-main-contents">
- <!-- 妫�楠岄」鐩� 鍛堢幇 -->
- <view v-if="subTabSelected == 1">
- <!-- 闇�閫氳繃鏄惧紡璋冪敤蹇界暐$event鍙傛暟 -->
- <view class="buttons" @tap="addCheckItem()">
- <uni-icons type="plus" style="margin-right: 10rpx" size="22"></uni-icons>鏂板
- </view>
- <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
- <view class="list" v-else>
- <uni-card v-for="checkItem in checkItems" :key="checkItem.num">
- <view class="card-detail">
- <view class="detail"> <text>搴忓彿锛�</text>{{ checkItem.num }} </view>
- <view class="detail editable">
- <view style="flex-shrink: 0"><text>妫�楠岄」鐩細</text></view>
- <input type="text" :value="checkItem.HQCCheckItemName" disabled="" />
- <view class="icon-wrapper"><uni-icons type="search" size="16"
- @click="showSelectorModule(checkItem, 2)"></uni-icons></view>
- </view>
- <view class="detail editable">
- <view style="flex-shrink: 0"><text>妫�楠屼华鍣細</text></view>
- <input type="text" :value="checkItem.HInspectInstruMentName" disabled="" />
- <view class="icon-wrapper"><uni-icons type="search" size="16"
- @click="showSelectorModule(checkItem, 3)"></uni-icons></view>
- </view>
- <view class="detail editable">
- <view><text>缁撹锛�</text></view>
- <view style="width: 4em">
- {{ checkItem.HResult == 1 ? "鍚堟牸" : "涓嶅悎鏍�" }}
- </view>
- <view>
- <switch style="width: 2em; transform: scale(0.7)"
- :checked="checkItem.HResult == 1"
- @change="HResultChange(checkItem.num, $event)" />
- </view>
- </view>
- <view class="detail editable" style="position: relative">
- <view style="flex-shrink: 0"><text>鍒嗘瀽鏂规硶锛�</text></view>
- <picker :range="arrayAnalysisMethod" range-key="name"
- @change="HAnalysisMethodChange(checkItem.num, $event)">
- <input disabled :value="getAnalysisMethodDisplay(checkItem.HAnalysisMethod)"
- placeholder="璇烽�夋嫨" />
- <view class="picker-overlay"></view>
- </picker>
- </view>
- <view class="detail editable">
- <view style="flex-shrink: 0"><text>閲嶇偣妫�鏌ワ細</text></view>
- <view>
- <switch type="checkbox" style="transform: scale(0.7)"
- :checked="checkItem.HKeyInspect"
- @change="HKeyInspectChange(checkItem, $event)" />
- </view>
- </view>
- <view class="detail" v-if="checkItem.HQCStd">
- <text>妫�楠屾爣鍑嗭細</text>{{ checkItem.HQCStd }}
- </view>
- <view class="detail" v-if="checkItem.HUnit">
- <text>鍗曚綅锛�</text>{{ checkItem.HUnit }}
- </view>
- <!-- 鍙湁瀹氶噺鍒嗘瀽鎵嶅惎鐢ㄦ楠屽�� -->
- <view class="detail editable" v-show="checkItem.HAnalysisMethod == 2">
- <text>妫�楠屽�硷細</text>
- <input type="text" class="editable-input" @blur="calcHResult(checkItem)" v-model="checkItem.HInspectValQ" />
- </view>
-
- <view class="detail" v-if="checkItem.HQCNote">
- <text>妫�楠岃褰曪細</text>{{ checkItem.HQCNote }}
- </view>
- <view class="detail" v-if="checkItem.HTargetVal">
- <text>鐩爣鍊硷細</text>{{ checkItem.HTargetVal }}
- </view>
- <view class="detail" v-if="checkItem.HUpLimit">
- <text>涓婇檺鍊硷細</text>{{ checkItem.HUpLimit }}
- </view>
- <view class="detail" v-if="checkItem.HDownLimit">
- <text>涓嬮檺鍊硷細</text>{{ checkItem.HDownLimit }}
- </view>
- <view class="detail" v-if="checkItem.HMax">
- <text>鏈�澶у�硷細</text>{{ checkItem.HMax }}
- </view>
- <view class="detail" v-if="checkItem.HMin">
- <text>鏈�灏忓�硷細</text>{{ checkItem.HMin }}
- </view>
- <view class="detail" v-if="checkItem.HAvg">
- <text>骞冲潎鍊硷細</text>{{ checkItem.HAvg }}
- </view>
- </view>
- <view style="height: 20rpx"></view>
- <view class="more">
- <view class="part" style="color: #da0000" @tap.stop="removeCheckItem(checkItem)">
- <uni-icons type="trash" style="color: #da0000; margin-right: 10rpx"
- size="18"></uni-icons>鍒犻櫎
- </view>
- </view>
- </uni-card>
- </view>
- </view>
- <!-- 鎶芥牱妫�楠� 鍛堢幇 -->
- <view v-if="subTabSelected == 2">
- <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
- <view class="list" v-else>
- <uni-card v-for="SamplingItem in checkItems" :key="SamplingItem.num">
- <view class="card-detail">
- <view class="detail"> <text>搴忓彿锛�</text>{{ SamplingItem.num }} </view>
- <view class="detail editable">
- <text>妫�楠岄」鐩細</text>{{ SamplingItem.HQCCheckItemName }}
- </view>
- <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
- <view class="detail editable" style="width: 100%">
- <view style="flex-shrink: 0"><text>鎶芥牱鏂规锛�</text></view>
- <input type="text" :value="SamplingItem.HSampleSchemeName" disabled />
- <view class="icon-wrapper"><uni-icons type="search" size="16"
- @click="showSelectorModule(SamplingItem, 1)"></uni-icons></view>
- </view>
- <view class="detail editable">
- <text>鎶芥牱绫诲瀷锛�</text>{{ SamplingItem.HSamplingType }}
- </view>
- <view class="detail editable">
- <text>妫�楠屾按骞筹細</text>{{ SamplingItem.HInspectionLevel }}
- </view>
- <view class="detail editable">
- <text>涓ユ牸搴︼細</text>{{ SamplingItem.HStrictness }}
- </view>
- <view class="detail editable">
- <text>AQL锛�</text>{{ SamplingItem.HAQL }}
- </view>
- <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
- <view class="detail editable">
- <text>鏍锋湰閲忥細</text>{{ SamplingItem.HSampleQty }}
- </view>
- <view class="detail editable">
- <text>鍏佽鏁帮細</text>{{ SamplingItem.HAcceptQty }}
- </view>
- <view class="detail editable">
- <text>鎷掔粷鏁帮細</text>{{ SamplingItem.HRejectQty }}
- </view>
- <view class="detail editable">
- <text>鏍锋湰涓嶅悎鏍兼暟锛�</text>{{ SamplingItem.HSampleUnRightQty }}
- </view>
- <view class="detail editable">
- <text>鏍锋湰鐮村潖鏁帮細</text>
- <view class="editable-input">
- <input type="number" v-model="SamplingItem.HSampleDamageQty" />
- </view>
- </view>
- <view class="detail editable">
- <text>妫�楠岀粨鏋滐細</text>
- <view style="border-radius: 15%; padding: 0 10rpx" :class="
+ </view>
+ </view>
+ <view class="form-item" v-if="false">
+ <view class="left">鐢熶骇璧勬簮</view>
+ <view class="right">
+ <uni-combox :candidates="GySourceNameList" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
+ @update:modelValue="HSourceChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item" v-if="false">
+ <view class="left">鐢熶骇鐝</view>
+ <view class="right">
+ <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
+ v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item" v-if="false">
+ <view class="left">浠诲姟鍗曞彿</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HICMOBillNo" disabled />
+ </view>
+ <view class="icon-wrapper-big"><uni-icons type="search" size="20"
+ @click="showSelectorModule(hform, 5)"></uni-icons></view>
+ </view>
+ <view class="form-item" v-if="false">
+ <view class="left">娴佽浆鍗″彿</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HProcExchBillNo" disabled />
+ </view>
+ <view class="icon-wrapper-big"><uni-icons type="search" size="20"
+ @click="showSelectorModule(hform, 6)"></uni-icons></view>
+ </view>
+ <view class="form-item">
+ <view class="left">浜у搧浠ｇ爜</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HMaterNumber" />
+ </view>
+ <view class="icon-wrapper-big">
+ <uni-icons type="search" size="20" @click="showSelectorModule(hform, 4)"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">浜у搧鍚嶇О</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HMaterName" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">妫�楠屽憳</view>
+ <view class="right">
+ <uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="璇烽�夋嫨妫�楠屽憳"
+ :v-model="hform.HFirstCheckEmpName"
+ @update:modelValue="HFirstCheckEmpChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">妫�楠屾柟妗�</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="this.hform.HQCSchemeName" />
+ </view>
+ <view class="icon-wrapper-big"><uni-icons type="search" size="20"
+ @click="showSelectorModule(hform, 7)"></uni-icons></view>
+ </view>
+
+ <view class="form-item">
+ <view class="left">鍒ゆ柇缁撹</view>
+ <view class="right none-border">
+ <radio-group @changer="checkResultChange">
+ <label>
+ <radio value="0" :checked="hform.HLastResult" /><text></text>
+ 鍚堟牸
+ </label>
+ <view style="width: 20rpx; display: inline-block"></view>
+ <label>
+ <radio value="1" :checked="!hform.HLastResult" /><text></text>
+ 涓嶅悎鏍�
+ </label>
+ </radio-group>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">宸ュ簭</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HProcName" />
+ </view>
+ <view class="icon-wrapper-big"><uni-icons type="search" size="20"
+ @click="showSelectorModule(hform, 8)"></uni-icons></view>
+ </view>
+
+ </view>
+ <!-- 鍏朵粬淇℃伅 -->
+ <view class="bill-main-content" v-if="mainTabSelected == 2">
+ <view class="form-item">
+ <view class="left">婧愬崟绫诲瀷</view>
+ <view class="right" style="position: relative" :class="!hasSourceBill?'':'disabled'">
+ <picker mode="selector" :range="HSourceBillTypeNameList" :disabled="hasSourceBill"
+ @change="HSourceBillTypeNameChange">
+ <input type="text" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" v-model="HSourceBillType" disabled />
+ <view class="picker-overlay"></view>
+ </picker>
+ </view>
+ </view>
+ <view class="form-item" v-if="false">
+ <view class="left">鐢熶骇鐝</view>
+ <view class="right">
+ <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
+ v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">寮傚父涓存椂澶勭悊鏂规</view>
+ <view class="right">
+ <input type="text" v-model="hform.HErrTreatment" value="" />
+ </view>
+ </view>
+ <view class="form-item" v-if="false">
+ <view class="left">浠诲姟鍗曟暟閲�</view>
+ <view class="right">
+ <input type="number" v-model="hform.HICMOQty" />
+ </view>
+ </view>
+ <view class="form-item" v-if="false">
+ <view class="left">娴佽浆鍗℃暟閲�</view>
+ <view class="right">
+ <input type="number" v-model="hform.HProcExchQty" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鎵瑰彿</view>
+ <view class="right">
+ <input type="text" value="" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">澶囨敞</view>
+ <view class="right">
+ <input type="text" v-model="hform.HRemark" value="" />
+ </view>
+ </view>
+ </view>
+ <!-- 鍒跺崟淇℃伅 -->
+ <view class="bill-main-content" v-if="mainTabSelected == 3">
+ <view class="form-item">
+ <view class="left">鍒跺崟浜�</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HMaker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鍒跺崟鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HMakeDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">瀹℃牳浜�</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HChecker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">瀹℃牳鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HCheckDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鍏抽棴浜�</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HCloseMan" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鍏抽棴鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HCloseDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">淇敼浜�</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HUpDater" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">淇敼鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HUpDateDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">浣滃簾浜�</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HDeleteMan" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">浣滃簾鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HDeleteDate" disabled />
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+ <!-- 瀛愯〃鍖哄煙 -->
+ <view class="bill-sub-area">
+ <!-- 瀛愯〃椤电 -->
+ <view class="bill-sub-tabs">
+ <view v-for="subTab in subTabs" :key="subTab.id" :class="subTab.id == subTabSelected ? 'selected' : ''"
+ @tap="subTabSelected = subTab.id">{{ subTab.name }}</view>
+ </view>
+ <!-- 瀛愯〃鍐呭 -->
+ <view class="bill-main-contents">
+ <!-- 妫�楠岄」鐩� 鍛堢幇 -->
+ <view v-if="subTabSelected == 1">
+ <!-- 闇�閫氳繃鏄惧紡璋冪敤蹇界暐$event鍙傛暟 -->
+ <view class="buttons" @tap="addCheckItem()">
+ <uni-icons type="plus" style="margin-right: 10rpx" size="22"></uni-icons>鏂板
+ </view>
+ <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
+ <view class="list" v-else>
+ <uni-card v-for="checkItem in checkItems" :key="checkItem.num">
+ <view class="card-detail">
+ <view class="detail"> <text>搴忓彿锛�</text>{{ checkItem.num }} </view>
+ <view class="detail editable">
+ <view style="flex-shrink: 0"><text>妫�楠岄」鐩細</text></view>
+ <input type="text" :value="checkItem.HQCCheckItemName" disabled="" />
+ <view class="icon-wrapper"><uni-icons type="search" size="16"
+ @click="showSelectorModule(checkItem, 2)"></uni-icons></view>
+ </view>
+ <view class="detail editable">
+ <view style="flex-shrink: 0"><text>妫�楠屼华鍣細</text></view>
+ <input type="text" :value="checkItem.HInspectInstruMentName" disabled="" />
+ <view class="icon-wrapper"><uni-icons type="search" size="16"
+ @click="showSelectorModule(checkItem, 3)"></uni-icons></view>
+ </view>
+ <view class="detail editable">
+ <view><text>缁撹锛�</text></view>
+ <view style="width: 4em">
+ {{ checkItem.HResult == 1 ? "鍚堟牸" : "涓嶅悎鏍�" }}
+ </view>
+ <view>
+ <switch style="width: 2em; transform: scale(0.7)"
+ :checked="checkItem.HResult == 1"
+ @change="HResultChange(checkItem.num, $event)" />
+ </view>
+ </view>
+ <view class="detail editable" style="position: relative">
+ <view style="flex-shrink: 0"><text>鍒嗘瀽鏂规硶锛�</text></view>
+ <picker :range="arrayAnalysisMethod" range-key="name"
+ @change="HAnalysisMethodChange(checkItem.num, $event)">
+ <input disabled :value="getAnalysisMethodDisplay(checkItem.HAnalysisMethod)"
+ placeholder="璇烽�夋嫨" />
+ <view class="picker-overlay"></view>
+ </picker>
+ </view>
+ <view class="detail editable">
+ <view style="flex-shrink: 0"><text>閲嶇偣妫�鏌ワ細</text></view>
+ <view>
+ <switch type="checkbox" style="transform: scale(0.7)"
+ :checked="checkItem.HKeyInspect"
+ @change="HKeyInspectChange(checkItem, $event)" />
+ </view>
+ </view>
+ <view class="detail" v-if="checkItem.HQCStd">
+ <text>妫�楠屾爣鍑嗭細</text>{{ checkItem.HQCStd }}
+ </view>
+ <view class="detail" v-if="checkItem.HUnit">
+ <text>鍗曚綅锛�</text>{{ checkItem.HUnit }}
+ </view>
+ <!-- 鍙湁瀹氶噺鍒嗘瀽鎵嶅惎鐢ㄦ楠屽�� -->
+ <view class="detail editable" v-show="checkItem.HAnalysisMethod == 2">
+ <text>妫�楠屽�硷細</text>
+ <input type="text" class="editable-input" @blur="calcHResult(checkItem)"
+ v-model="checkItem.HInspectValQ" />
+ </view>
+
+ <view class="detail" v-if="checkItem.HQCNote">
+ <text>妫�楠岃褰曪細</text>{{ checkItem.HQCNote }}
+ </view>
+ <view class="detail" v-if="checkItem.HTargetVal">
+ <text>鐩爣鍊硷細</text>{{ checkItem.HTargetVal }}
+ </view>
+ <view class="detail" v-if="checkItem.HUpLimit">
+ <text>涓婇檺鍊硷細</text>{{ checkItem.HUpLimit }}
+ </view>
+ <view class="detail" v-if="checkItem.HDownLimit">
+ <text>涓嬮檺鍊硷細</text>{{ checkItem.HDownLimit }}
+ </view>
+ <view class="detail" v-if="checkItem.HMax">
+ <text>鏈�澶у�硷細</text>{{ checkItem.HMax }}
+ </view>
+ <view class="detail" v-if="checkItem.HMin">
+ <text>鏈�灏忓�硷細</text>{{ checkItem.HMin }}
+ </view>
+ <view class="detail" v-if="checkItem.HAvg">
+ <text>骞冲潎鍊硷細</text>{{ checkItem.HAvg }}
+ </view>
+ </view>
+ <view style="height: 20rpx"></view>
+ <view class="more">
+ <view class="part" style="color: #da0000" @tap.stop="removeCheckItem(checkItem)">
+ <uni-icons type="trash" style="color: #da0000; margin-right: 10rpx"
+ size="18"></uni-icons>鍒犻櫎
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ </view>
+ <!-- 鎶芥牱妫�楠� 鍛堢幇 -->
+ <view v-if="subTabSelected == 2">
+ <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
+ <view class="list" v-else>
+ <uni-card v-for="SamplingItem in checkItems" :key="SamplingItem.num">
+ <view class="card-detail">
+ <view class="detail"> <text>搴忓彿锛�</text>{{ SamplingItem.num }} </view>
+ <view class="detail editable">
+ <text>妫�楠岄」鐩細</text>{{ SamplingItem.HQCCheckItemName }}
+ </view>
+ <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
+ <view class="detail editable" style="width: 100%">
+ <view style="flex-shrink: 0"><text>鎶芥牱鏂规锛�</text></view>
+ <input type="text" :value="SamplingItem.HSampleSchemeName" disabled />
+ <view class="icon-wrapper"><uni-icons type="search" size="16"
+ @click="showSelectorModule(SamplingItem, 1)"></uni-icons></view>
+ </view>
+ <view class="detail editable">
+ <text>鎶芥牱绫诲瀷锛�</text>{{ SamplingItem.HSamplingType }}
+ </view>
+ <view class="detail editable">
+ <text>妫�楠屾按骞筹細</text>{{ SamplingItem.HInspectionLevel }}
+ </view>
+ <view class="detail editable">
+ <text>涓ユ牸搴︼細</text>{{ SamplingItem.HStrictness }}
+ </view>
+ <view class="detail editable">
+ <text>AQL锛�</text>{{ SamplingItem.HAQL }}
+ </view>
+ <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
+ <view class="detail editable">
+ <text>鏍锋湰閲忥細</text>{{ SamplingItem.HSampleQty }}
+ </view>
+ <view class="detail editable">
+ <text>鍏佽鏁帮細</text>{{ SamplingItem.HAcceptQty }}
+ </view>
+ <view class="detail editable">
+ <text>鎷掔粷鏁帮細</text>{{ SamplingItem.HRejectQty }}
+ </view>
+ <view class="detail editable">
+ <text>鏍锋湰涓嶅悎鏍兼暟锛�</text>{{ SamplingItem.HSampleUnRightQty }}
+ </view>
+ <view class="detail editable">
+ <text>鏍锋湰鐮村潖鏁帮細</text>
+ <view class="editable-input">
+ <input type="number" v-model="SamplingItem.HSampleDamageQty" />
+ </view>
+ </view>
+ <view class="detail editable">
+ <text>妫�楠岀粨鏋滐細</text>
+ <view style="border-radius: 15%; padding: 0 10rpx" :class="
SamplingItem.HInspectResultToSee == '鍚堟牸'
? 'pass-background'
: SamplingItem.HInspectResultToSee == '涓嶅悎鏍�'
? 'unpass-background'
: ''
">
- {{ SamplingItem.HInspectResultToSee }}
- </view>
- </view>
- </view>
- </uni-card>
- </view>
- </view>
- <!-- 妫�娴嬪�� 鍛堢幇 -->
- <view v-else v-for="item in InspectModules" :key="item.id">
- <view v-if="subTabSelected == item.id">
- <InspectValueTemplateVue ref="InspectValueModules" :bind-key="item.id"
- @syncCheckData="InspectValueComplete" :bind-data="{
+ {{ SamplingItem.HInspectResultToSee }}
+ </view>
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ </view>
+ <!-- 妫�娴嬪�� 鍛堢幇 -->
+ <view v-else v-for="item in InspectModules" :key="item.id">
+ <view v-if="subTabSelected == item.id">
+ <InspectValueTemplateVue ref="InspectValueModules" :bind-key="item.id"
+ @syncCheckData="InspectValueComplete" :bind-data="{
data: checkItems[item.checkItemId],
list: InspectValues[item.checkItemId],
mode: 3 // 棣栨妫�娴嬪�兼ā鍧�
}">
- </InspectValueTemplateVue>
- </view>
- </view>
- </view>
- </view>
- <view style="height: 120rpx"></view>
- <view class="bottom-btn">
- <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
- <view style="flex: 1"></view>
- <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
- <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
- </view>
- <SampleSchemePopupVue v-if="enablePopupModule == PopupModuleNameList[1]" ref="listPopup"
- @update="SampleSchemeComplete" :bindKey="currentChechItemIDCache">
- </SampleSchemePopupVue>
- <CheckItemPopupVue v-if="enablePopupModule == PopupModuleNameList[2]" ref="listPopup"
- @update="CheckItemComplete" :bindKey="currentChechItemIDCache">
- </CheckItemPopupVue>
- <InspectMentPopupVue v-if="enablePopupModule == PopupModuleNameList[3]" ref="listPopup"
- @update="InspectMentComplete" :bindKey="currentChechItemIDCache">
- </InspectMentPopupVue>
- <MaterialPopupVue v-if="enablePopupModule == PopupModuleNameList[4]" ref="listPopup" @update="MaterComplete"
- :bindKey="0">
- </MaterialPopupVue>
- <ICMOBillPopupVue v-if="enablePopupModule == PopupModuleNameList[5]" ref="listPopup" @update="ICMOBillComplete"
- :bindKey="0"></ICMOBillPopupVue>
- <ProcExchBillPopupVue v-if="enablePopupModule == PopupModuleNameList[6]" ref="listPopup"
- @update="ProcExchBillComplete" :bindKey="0"></ProcExchBillPopupVue>
- <ProcessPopupVue v-if="enablePopupModule == PopupModuleNameList[8]" ref="listPopup" @update="HProcComplete"
- :bindKey="0"></ProcessPopupVue>
- <CheckProjectPopupVue v-if="enablePopupModule == PopupModuleNameList[7]" ref="listPopup"
- @update="HQCSchemeComplete" :bindKey="0"></CheckProjectPopupVue>
- </view>
+ </InspectValueTemplateVue>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view style="height: 120rpx"></view>
+ <view class="bottom-btn">
+ <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <view style="flex: 1"></view>
+ <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+ <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ </view>
+ <SampleSchemePopupVue v-if="enablePopupModule == PopupModuleNameList[1]" ref="listPopup"
+ @update="SampleSchemeComplete" :bindKey="currentChechItemIDCache">
+ </SampleSchemePopupVue>
+ <CheckItemPopupVue v-if="enablePopupModule == PopupModuleNameList[2]" ref="listPopup"
+ @update="CheckItemComplete" :bindKey="currentChechItemIDCache">
+ </CheckItemPopupVue>
+ <InspectMentPopupVue v-if="enablePopupModule == PopupModuleNameList[3]" ref="listPopup"
+ @update="InspectMentComplete" :bindKey="currentChechItemIDCache">
+ </InspectMentPopupVue>
+ <MaterialPopupVue v-if="enablePopupModule == PopupModuleNameList[4]" ref="listPopup" @update="MaterComplete"
+ :bindKey="0">
+ </MaterialPopupVue>
+ <ICMOBillPopupVue v-if="enablePopupModule == PopupModuleNameList[5]" ref="listPopup" @update="ICMOBillComplete"
+ :bindKey="0"></ICMOBillPopupVue>
+ <ProcExchBillPopupVue v-if="enablePopupModule == PopupModuleNameList[6]" ref="listPopup"
+ @update="ProcExchBillComplete" :bindKey="0"></ProcExchBillPopupVue>
+ <ProcessPopupVue v-if="enablePopupModule == PopupModuleNameList[8]" ref="listPopup" @update="HProcComplete"
+ :bindKey="0"></ProcessPopupVue>
+ <CheckProjectPopupVue v-if="enablePopupModule == PopupModuleNameList[7]" ref="listPopup"
+ @update="HQCSchemeComplete" :bindKey="0"></CheckProjectPopupVue>
+ </view>
</template>
<script>
- import dayjs from "dayjs";
- import {
- CommonUtils
- } from "../../../utils/common";
- import InspectValueTemplateVue from "@/components/ZLGL/InspectValueTemplate.vue";
- import SampleSchemePopupVue from "@/components/ZLGL/SampleSchemePopup.vue";
- import CheckItemPopupVue from "@/components/ZLGL/CheckItemPopup.vue";
- import InspectMentPopupVue from "../../../components/ZLGL/InspectMentPopup.vue";
- import MaterialPopupVue from "../../../components/ZLGL/MaterialPopup.vue";
- import ICMOBillPopupVue from "../../../components/ZLGL/ICMOBillPopup.vue";
- import ProcExchBillPopupVue from "../../../components/ZLGL/ProcExchBillPopup.vue";
- import ProcessPopupVue from "../../../components/ZLGL/ProcessPopup.vue";
- import CheckProjectPopupVue from "../../../components/ZLGL/CheckProjectPopup.vue";
- import {
- getUserInfo
- } from "../../../utils/auth";
- import {
- MpaasScan
- } from "../../../utils/mpaasScan";
- export default {
- components: {
- InspectValueTemplateVue,
- SampleSchemePopupVue,
- CheckItemPopupVue,
- InspectMentPopupVue,
- MaterialPopupVue,
- ICMOBillPopupVue,
- ProcExchBillPopupVue,
- ProcessPopupVue,
- CheckProjectPopupVue,
- },
- computed: {
- judgeConclusion: {
- get() {
- return true;
- },
- },
- },
- data() {
- return {
- operationType: 1,
+ import dayjs from "dayjs";
+ import {
+ CommonUtils
+ } from "../../../utils/common";
+ import InspectValueTemplateVue from "@/components/ZLGL/InspectValueTemplate.vue";
+ import SampleSchemePopupVue from "@/components/ZLGL/SampleSchemePopup.vue";
+ import CheckItemPopupVue from "@/components/ZLGL/CheckItemPopup.vue";
+ import InspectMentPopupVue from "../../../components/ZLGL/InspectMentPopup.vue";
+ import MaterialPopupVue from "../../../components/ZLGL/MaterialPopup.vue";
+ import ICMOBillPopupVue from "../../../components/ZLGL/ICMOBillPopup.vue";
+ import ProcExchBillPopupVue from "../../../components/ZLGL/ProcExchBillPopup.vue";
+ import ProcessPopupVue from "../../../components/ZLGL/ProcessPopup.vue";
+ import CheckProjectPopupVue from "../../../components/ZLGL/CheckProjectPopup.vue";
+ import {
+ getUserInfo
+ } from "../../../utils/auth";
+ import {
+ MpaasScan
+ } from "../../../utils/mpaasScan";
+ export default {
+ components: {
+ InspectValueTemplateVue,
+ SampleSchemePopupVue,
+ CheckItemPopupVue,
+ InspectMentPopupVue,
+ MaterialPopupVue,
+ ICMOBillPopupVue,
+ ProcExchBillPopupVue,
+ ProcessPopupVue,
+ CheckProjectPopupVue,
+ },
+ computed: {
+ judgeConclusion: {
+ get() {
+ return true;
+ },
+ },
+ },
+ data() {
+ return {
+ operationType: 1,
- mainTabSelected: 1,
- subTabSelected: 1,
+ mainTabSelected: 1,
+ subTabSelected: 1,
- // 婧愬崟鐘舵�佹帶鍒�
- hasSourceBill: false,
+ // 婧愬崟鐘舵�佹帶鍒�
+ hasSourceBill: false,
- // 鎺у埗褰撳墠鏄剧ず鐨勫脊绐楁ā鍧�
- enablePopupModule: "",
- PopupModuleNameList: [
- "",
- "SampleScheme",
- "CheckItem",
- "InspectMent",
- "Material",
- "ICMOBill",
- "ProcExchBill",
- "QCScheme",
- "Process",
- ],
- // 褰撳墠鎿嶄綔鐨勬楠屽崟ID缂撳瓨
- currentChechItemIDCache: -1,
+ // 鎺у埗褰撳墠鏄剧ず鐨勫脊绐楁ā鍧�
+ enablePopupModule: "",
+ PopupModuleNameList: [
+ "",
+ "SampleScheme",
+ "CheckItem",
+ "InspectMent",
+ "Material",
+ "ICMOBill",
+ "ProcExchBill",
+ "QCScheme",
+ "Process",
+ ],
+ // 褰撳墠鎿嶄綔鐨勬楠屽崟ID缂撳瓨
+ currentChechItemIDCache: -1,
- // uni-combox 閫夋嫨鍣ㄤ娇鐢�
- // 鐢熶骇璧勬簮
- GySourceList: [],
- GySourceNameList: [],
- // 鐝
- GyWorkShiftList: [],
- GyWorkShiftNameList: [],
- // 妫�楠屽憳
- GyFirstCheckEmpList: [],
- GyFirstCheckEmpNameList: [],
+ // uni-combox 閫夋嫨鍣ㄤ娇鐢�
+ // 鐢熶骇璧勬簮
+ GySourceList: [],
+ GySourceNameList: [],
+ // 鐝
+ GyWorkShiftList: [],
+ GyWorkShiftNameList: [],
+ // 妫�楠屽憳
+ GyFirstCheckEmpList: [],
+ GyFirstCheckEmpNameList: [],
- // 妫�楠屾柟妗�
- arrayAnalysisMethod: [{
- value: 1,
- name: "瀹氭�у垎鏋�",
- },
- {
- value: 2,
- name: "瀹氶噺鍒嗘瀽",
- },
- {
- value: 3,
- name: "鍏朵粬鍒嗘瀽",
- },
- ],
- ArrayAnalysisMethodValue: [1, 2, 3],
- // 瀛愯〃 椤电淇℃伅
- subTabs: {
- 1: {
- id: "1",
- name: "妫�楠岄」鐩�",
- },
- 2: {
- id: "2",
- name: "鎶芥牱妫�楠�",
- },
- },
+ // 妫�楠屾柟妗�
+ arrayAnalysisMethod: [{
+ value: 1,
+ name: "瀹氭�у垎鏋�",
+ },
+ {
+ value: 2,
+ name: "瀹氶噺鍒嗘瀽",
+ },
+ {
+ value: 3,
+ name: "鍏朵粬鍒嗘瀽",
+ },
+ ],
+ ArrayAnalysisMethodValue: [1, 2, 3],
+ // 瀛愯〃 椤电淇℃伅
+ subTabs: {
+ 1: {
+ id: "1",
+ name: "妫�楠岄」鐩�",
+ },
+ 2: {
+ id: "2",
+ name: "鎶芥牱妫�楠�",
+ },
+ },
- // 婧愬崟绫诲瀷
- HSourceBillType: "鐢熶骇姹囨姤鍗�",
- HSourceBillTypeValueList: ["3771"],
- HSourceBillTypeNameList: [
- "鐢熶骇姹囨姤鍗�"
- ],
- // 涓昏〃灞炴��
- hform: {
- HSourceBillType: "3711",
- HSourceBillNo: "",
- HBillNo: "",
- HInterID: "0",
- HDate: dayjs(new Date()).format("YYYY-MM-DD"),
- HSourceName: "",
- HSourceID: "0",
- HShiftsName: "",
- HShiftsID: "0",
- HICMOBillNo: "",
- HICMOInterID: "0",
- HICMOEntryID: "1",
- HICMOQty: "0",
- HProcExchBillNo: "",
- HProcExchInterID: "0",
- HProcExchEntryID: "0",
- HProcExchQty: "0",
- HMaterNumber: "",
- HMaterID: "0",
- HMaterName: "",
- HFirstCheckEmpName: "",
- HFirstCheckEmp: 0,
- HQCSchemeName: "",
- HQCSchemeID: "0",
- HBatchNo: "",
- HLastResult: true, // 榛樿鍚堟牸
- HProcName: "",
- HProcID: "0",
- HTakeSampleCheckBillNo: "", // 鍙栨牱鍗�
- HTakeSampleCheckBillID: "0",
- HRemark: "",
- HErrTreatment: "", // 寮傚父涓存椂澶勭悊鏂规
- HMaker: getUserInfo()["Czymc"] || "",
- HChecker: "",
- HCloseMan: "",
- HMakeDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
- HCheckDate: "",
- HCloseDate: "",
- HUpDater: "",
- HDeleteMan: "",
- HUpDateDate: "",
- HDeleteDate: "",
- HResult: 1,
- HAnalysisMethod: "",
+ // 婧愬崟绫诲瀷
+ HSourceBillType: "鐢熶骇姹囨姤鍗�",
+ HSourceBillTypeValueList: ["3771"],
+ HSourceBillTypeNameList: [
+ "鐢熶骇姹囨姤鍗�"
+ ],
+ // 涓昏〃灞炴��
+ hform: {
+ HSourceBillType: "3711",
+ HSourceBillNo: "",
+ HBillNo: "",
+ HInterID: "0",
+ HDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HSourceName: "",
+ HSourceID: "0",
+ HShiftsName: "",
+ HShiftsID: "0",
+ HICMOBillNo: "",
+ HICMOInterID: "0",
+ HICMOEntryID: "1",
+ HICMOQty: "0",
+ HProcExchBillNo: "",
+ HProcExchInterID: "0",
+ HProcExchEntryID: "0",
+ HProcExchQty: "0",
+ HMaterNumber: "",
+ HMaterID: "0",
+ HMaterName: "",
+ HFirstCheckEmpName: "",
+ HFirstCheckEmp: 0,
+ HQCSchemeName: "",
+ HQCSchemeID: "0",
+ HBatchNo: "",
+ HLastResult: true, // 榛樿鍚堟牸
+ HProcName: "",
+ HProcID: "0",
+ HTakeSampleCheckBillNo: "", // 鍙栨牱鍗�
+ HTakeSampleCheckBillID: "0",
+ HRemark: "",
+ HErrTreatment: "", // 寮傚父涓存椂澶勭悊鏂规
+ HMaker: getUserInfo()["Czymc"] || "",
+ HChecker: "",
+ HCloseMan: "",
+ HMakeDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
+ HCheckDate: "",
+ HCloseDate: "",
+ HUpDater: "",
+ HDeleteMan: "",
+ HUpDateDate: "",
+ HDeleteDate: "",
+ HResult: 1,
+ HAnalysisMethod: "",
- HResDec: "",
- HStatus: 1,
+ HResDec: "",
+ HStatus: 1,
- HMainSourceBillType: "",
- HMainSourceInterID: "0",
- HMainSourceEntryID: "1",
- HMainSourceBillNo: "",
- },
- // 妫�楠岄」鐩拰鎶芥牱妫�楠� 鍊�
- checkItems: {},
- // 妫�娴嬪�兼ā鍧�
- InspectModules: {},
- // 妫�娴嬪��
- InspectValues: {},
- };
- },
- methods: {
- // 妫�楠屽�� 璁＄畻鏄惁鍚堟牸
- calcHResult(item){
- // 闈炴娊妫�鏉′欢涓嬪垽鏂粨璁�
- console.log('item: ',item);
- if(item.HSampleSchemeID) {
- return
- }
-
- if(item.HInspectValQ >= item.HDownLimit && item.HInspectValQ <= item.HUpLimit){
- this.checkItems[item.num].HResult = 1
- return
- }
-
- this.checkItems[item.num].HResult = 2
- },
- // 婧愬崟绫诲瀷閫夋嫨
- HSourceBillTypeNameChange(e) {
- this.HSourceBillType = this.HSourceBillTypeNameList[e.detail.value];
- this.hform.HSourceBillType = this.HSourceBillTypeValueList[e.detail.value];
- },
- toScanCode() {
- MpaasScan.scanCode((res) => {
- if (res) {
- this.getSourceBillInfo(HBarCode);
- }
- });
- },
- async getSourceBillInfo(HBarCode) {
- console.log('HBarCode: ', HBarCode);
- // 鏍规嵁鍗曟嵁绫诲瀷锛岃皟鐢ㄤ笉鍚岀殑涓嬫帹鍑芥暟
- if (this.hform.HSourceBillType == 3711) {
- // 宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
- await this.LoadingInformation_ICMOReportBill(HBarCode);
- if (
- (uni.getStorageSync("OrganizationID") == "7667152" &&
- uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
- (uni.getStorageSync("OrganizationID") == "100199" &&
- uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
- ) {
- await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
- }
- return;
- }
- // if (this.hform.HSourceBillType == 3790) {
- // // 宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
- // await this.LoadingInformation_StationInBill(HBarCode);
- // if (
- // (uni.getStorageSync("OrganizationID") == "7667152" &&
- // uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
- // (uni.getStorageSync("OrganizationID") == "100199" &&
- // uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
- // ) {
- // await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
- // }
- // return;
- // }
- if (this.hform.HSourceBillType == 3793) {
- // 宸ュ簭濮斿鎺ユ敹鍗曞垪琛ㄩ妫�
- await this.LoadingInformation_StationEntrustOutBill(HBarCode);
- if (
- (uni.getStorageSync("OrganizationID") == "7667152" &&
- uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
- (uni.getStorageSync("OrganizationID") == "100199" &&
- uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
- ) {
- await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
- }
- return;
- }
- if (this.hform.HSourceBillType == 3710) {
- // 鐢熶骇璁㈠崟鍒楄〃棣栨
- await this.LoadingInformation_ICMO(HBarCode);
- if (
- (uni.getStorageSync("OrganizationID") == "7667152" &&
- uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
- (uni.getStorageSync("OrganizationID") == "100199" &&
- uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
- ) {
- await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
- }
- return;
- }
- if (this.hform.HSourceBillType == 3772) {
- // 宸ュ簭娴佽浆鍗″垪琛ㄩ妫�
- await this.LoadingInformation_ProcExchange(HBarCode);
- if (
- (uni.getStorageSync("OrganizationID") == "7667152" &&
- uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
- (uni.getStorageSync("OrganizationID") == "100199" &&
- uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
- ) {
- await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
- }
- return;
- }
- },
- async GetCheckItemID() {
- if (!this.hform.HMaterName && !this.hform.HProcName) {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Web/GetCheckItemID",
- data: {
- HName: this.hform.HMaterName,
- HProName: this.hform.HProcName,
- HSourceID: this.hform.HSourceID,
- },
- });
+ HMainSourceBillType: "",
+ HMainSourceInterID: "0",
+ HMainSourceEntryID: "1",
+ HMainSourceBillNo: "",
+ },
+ // 妫�楠岄」鐩拰鎶芥牱妫�楠� 鍊�
+ checkItems: {},
+ // 妫�娴嬪�兼ā鍧�
+ InspectModules: {},
+ // 妫�娴嬪��
+ InspectValues: {},
+ };
+ },
+ methods: {
+ // 妫�楠屽�� 璁＄畻鏄惁鍚堟牸
+ calcHResult(item) {
+ // 闈炴娊妫�鏉′欢涓嬪垽鏂粨璁�
+ console.log('item: ', item);
+ if (item.HSampleSchemeID) {
+ return
+ }
- let {
- count,
- Message,
- data
- } = res.data;
+ if (item.HInspectValQ >= item.HDownLimit && item.HInspectValQ <= item.HUpLimit) {
+ this.checkItems[item.num].HResult = 1
+ return
+ }
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${Message}`,
- });
- return;
- }
+ this.checkItems[item.num].HResult = 2
+ },
+ // 婧愬崟绫诲瀷閫夋嫨
+ HSourceBillTypeNameChange(e) {
+ this.HSourceBillType = this.HSourceBillTypeNameList[e.detail.value];
+ this.hform.HSourceBillType = this.HSourceBillTypeValueList[e.detail.value];
+ },
+ toScanCode() {
+ MpaasScan.scanCode((res) => {
+ if (res) {
+ this.getSourceBillInfo(HBarCode);
+ }
+ });
+ },
+ async getSourceBillInfo(HBarCode) {
+ console.log('HBarCode: ', HBarCode);
+ // 鏍规嵁鍗曟嵁绫诲瀷锛岃皟鐢ㄤ笉鍚岀殑涓嬫帹鍑芥暟
+ if (this.hform.HSourceBillType == 3711) {
+ // 宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
+ await this.LoadingInformation_ICMOReportBill(HBarCode);
+ if (
+ (uni.getStorageSync("OrganizationID") == "7667152" &&
+ uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
+ (uni.getStorageSync("OrganizationID") == "100199" &&
+ uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
+ ) {
+ await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+ }
+ return;
+ }
+ // if (this.hform.HSourceBillType == 3790) {
+ // // 宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
+ // await this.LoadingInformation_StationInBill(HBarCode);
+ // if (
+ // (uni.getStorageSync("OrganizationID") == "7667152" &&
+ // uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
+ // (uni.getStorageSync("OrganizationID") == "100199" &&
+ // uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
+ // ) {
+ // await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+ // }
+ // return;
+ // }
+ if (this.hform.HSourceBillType == 3793) {
+ // 宸ュ簭濮斿鎺ユ敹鍗曞垪琛ㄩ妫�
+ await this.LoadingInformation_StationEntrustOutBill(HBarCode);
+ if (
+ (uni.getStorageSync("OrganizationID") == "7667152" &&
+ uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
+ (uni.getStorageSync("OrganizationID") == "100199" &&
+ uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
+ ) {
+ await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+ }
+ return;
+ }
+ if (this.hform.HSourceBillType == 3710) {
+ // 鐢熶骇璁㈠崟鍒楄〃棣栨
+ await this.LoadingInformation_ICMO(HBarCode);
+ if (
+ (uni.getStorageSync("OrganizationID") == "7667152" &&
+ uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
+ (uni.getStorageSync("OrganizationID") == "100199" &&
+ uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
+ ) {
+ await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+ }
+ return;
+ }
+ if (this.hform.HSourceBillType == 3772) {
+ // 宸ュ簭娴佽浆鍗″垪琛ㄩ妫�
+ await this.LoadingInformation_ProcExchange(HBarCode);
+ if (
+ (uni.getStorageSync("OrganizationID") == "7667152" &&
+ uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
+ (uni.getStorageSync("OrganizationID") == "100199" &&
+ uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
+ ) {
+ await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+ }
+ return;
+ }
+ },
+ async GetCheckItemID() {
+ if (!this.hform.HMaterName && !this.hform.HProcName) {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Web/GetCheckItemID",
+ data: {
+ HName: this.hform.HMaterName,
+ HProName: this.hform.HProcName,
+ HSourceID: this.hform.HSourceID,
+ },
+ });
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
- this.hform.HQCSchemeID = data[0].hmainid;
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
- this.get_CheckItem();
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${err}`,
- });
- }
- }
- },
- //#region 涓�鑷�
- async LoadingInformation_ProcExchange(HBarCode) {
- // 宸ュ簭娴佽浆鍗�
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/CheckBill/get_ProcessExchangeBill_ByBillNo",
- data: {
- HBillNo: HBarCode,
- user: getUserInfo()["Czymc"],
- },
- });
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${Message}`,
+ });
+ return;
+ }
- let {
- count,
- Message,
- data
- } = res.data;
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+ this.hform.HQCSchemeID = data[0].hmainid;
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${Message}`,
- });
- return;
- }
- this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
- this.hform.HProcExchInterID = data[0].HProcExchInterID;
- this.hform.HProcExchEntryID = data[0].HProcExchEntryID || 0;
- this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
- this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
- this.hform.HICMOInterID = data[0].HICMOInterID;
- this.hform.HICMOQty = data[0].HICMOQty || 0;
- this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
- this.hform.HSourceID = data[0].HSourceID || 0;
- this.hform.HMaterID = data[0].HMaterID;
- this.hform.HMaterName = data[0].浜у搧鍚嶇О;
- this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
- this.hform.HMainSourceBillType = data[0].HBillType;
- this.hform.HMainSourceInterID = data[0].HInterID;
- this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
- this.hform.HProcName = data[0].褰撳墠宸ュ簭;
- this.hform.HBatchNo = data[0].鎵瑰彿;
+ this.get_CheckItem();
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${err}`,
+ });
+ }
+ }
+ },
+ //#region 涓�鑷�
+ async LoadingInformation_ProcExchange(HBarCode) {
+ // 宸ュ簭娴佽浆鍗�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/CheckBill/get_ProcessExchangeBill_ByBillNo",
+ data: {
+ HBillNo: HBarCode,
+ user: getUserInfo()["Czymc"],
+ },
+ });
- this.hasSourceBill = true
- this.get_CheckItem();
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${err}`,
- });
- }
- },
- //#endregion
-
- //#region 淇敼
- async LoadingInformation_ICMO(HBarCode) {
- // 鐢熶骇璁㈠崟
- try {
- let sWhere="and 鍗曟嵁鍙�='"+HBarCode+"'"
- console.log(sWhere)
- let res = await CommonUtils.doRequest2Async({
- url: "/LEMS/MES_IF_ICMOBillList_Json",
- data: {
- sWhere: sWhere,
- user: getUserInfo()["Czymc"],
- },
- });
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
- let {
- count,
- Message,
- data
- } = res.data;
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${Message}`,
+ });
+ return;
+ }
+ this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
+ this.hform.HProcExchInterID = data[0].HProcExchInterID;
+ this.hform.HProcExchEntryID = data[0].HProcExchEntryID || 0;
+ this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+ this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
+ this.hform.HICMOInterID = data[0].HICMOInterID;
+ this.hform.HICMOQty = data[0].HICMOQty || 0;
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
+ this.hform.HSourceID = data[0].HSourceID || 0;
+ this.hform.HMaterID = data[0].HMaterID;
+ this.hform.HMaterName = data[0].浜у搧鍚嶇О;
+ this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+ this.hform.HMainSourceBillType = data[0].HBillType;
+ this.hform.HMainSourceInterID = data[0].HInterID;
+ this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+ this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+ this.hform.HBatchNo = data[0].鎵瑰彿;
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${Message}`,
- });
- return;
- }
- //鐢熶骇鏀�
- //this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
- //this.hform.HProcExchInterID = data[0].HProcExchInterID;
- //this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
- //this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
- this.hform.HICMOBillNo = data[0].鍗曟嵁鍙�;
- this.hform.HICMOInterID = data[0].hmainid;
- this.hform.HICMOQty = data[0].鐢熶骇浠诲姟鍗曟暟閲�;
- this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
- this.hform.HSourceID = data[0].HSourceID;
- this.hform.HMaterID = data[0].HMaterID;
- this.hform.HMaterNumber=data[0].浜у搧浠ｇ爜
- this.hform.HMaterName = data[0].浜у搧鍚嶇О;
- this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
- this.hform.HMainSourceBillType = data[0].鍗曟嵁绫诲瀷;
- this.hform.HMainSourceInterID = data[0].HInterID;
- this.hform.HICMOEntryID = data[0].HEntryID || 1;
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
- this.hform.HProcName = data[0].褰撳墠宸ュ簭;
- this.hasSourceBill = true
- this.get_CheckItem();
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${err}`,
- });
- }
- },
- //#endregion
-
- //#region 涓�鑷�
- async LoadingInformation_StationEntrustOutBill(HBarCode) {
- // 宸ュ簭濮斿鎺ユ敹鍗�
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Cj_StationEntrustOutBill/list",
- data: {
- sWhere: ` and HBillNo = '${HBarCode}'`,
- },
- });
+ this.hasSourceBill = true
+ this.get_CheckItem();
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${err}`,
+ });
+ }
+ },
+ //#endregion
- let {
- count,
- Message,
- data
- } = res.data;
+ //#region 淇敼
+ async LoadingInformation_ICMO(HBarCode) {
+ // 鐢熶骇璁㈠崟
+ try {
+ let sWhere = "and 鍗曟嵁鍙�='" + HBarCode + "'"
+ console.log(sWhere)
+ let res = await CommonUtils.doRequest2Async({
+ url: "/LEMS/MES_IF_ICMOBillList_Json",
+ data: {
+ sWhere: sWhere,
+ user: getUserInfo()["Czymc"],
+ },
+ });
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${Message}`,
- });
- return;
- }
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
- HProcExchBillNo = data[0].娴佽浆鍗″彿;
- HProcExchInterID = data[0].HProcExchInterID;
- HProcExchEntryID = data[0].HProcExchEntryID;
- HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
- HICMOBillNo = data[0].鐢熶骇璁㈠崟鍙�;
- HICMOInterID = data[0].HICMOInterID;
- HICMOQty = data[0].HICMOQty;
- HSourceName = data[0].鐢熶骇璧勬簮;
- HSourceID = data[0].HSourceID;
- HMaterID = data[0].HMaterID;
- HMaterName = data[0].浜у搧鍚嶇О;
- HMainSourceBillNo = data[0].鍗曟嵁鍙�;
- HMainSourceBillType = data[0].HBillType;
- HMainSourceInterID = data[0].hmainid;
- HICMOEntryID = data[0].HICMOEntryID || 1;
- this.hasSourceBill = true
- this.get_CheckItem();
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${err}`,
- });
- }
- },
- //#endregion
-
- async LoadingInformation_ICMOReportBill(HBarCode) {
- // 鐢熶骇姹囨姤鍗�
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/QC_LastPieceCheckBill/get_ICMOReportBill_Tmp_getByBillNo",
- data: {
- HBillNo: HBarCode,
- user: getUserInfo()["Czymc"],
- },
- });
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${Message}`,
+ });
+ return;
+ }
+ //鐢熶骇鏀�
+ //this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
+ //this.hform.HProcExchInterID = data[0].HProcExchInterID;
+ //this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
+ //this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+ this.hform.HICMOBillNo = data[0].鍗曟嵁鍙�;
+ this.hform.HICMOInterID = data[0].hmainid;
+ this.hform.HICMOQty = data[0].鐢熶骇浠诲姟鍗曟暟閲�;
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
+ this.hform.HSourceID = data[0].HSourceID;
+ this.hform.HMaterID = data[0].HMaterID;
+ this.hform.HMaterNumber = data[0].浜у搧浠ｇ爜
+ this.hform.HMaterName = data[0].浜у搧鍚嶇О;
+ this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+ this.hform.HMainSourceBillType = data[0].鍗曟嵁绫诲瀷;
+ this.hform.HMainSourceInterID = data[0].HInterID;
+ this.hform.HICMOEntryID = data[0].HEntryID || 1;
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+ this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+ this.hasSourceBill = true
+ this.get_CheckItem();
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${err}`,
+ });
+ }
+ },
+ //#endregion
- let {
- count,
- Message,
- data
- } = res.data;
+ //#region 涓�鑷�
+ async LoadingInformation_StationEntrustOutBill(HBarCode) {
+ // 宸ュ簭濮斿鎺ユ敹鍗�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Cj_StationEntrustOutBill/list",
+ data: {
+ sWhere: ` and HBillNo = '${HBarCode}'`,
+ },
+ });
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鐢熶骇姹囨姤鍗� 閿欒: ${Message}`,
- });
- return;
- }
- //change_inlife
- this.hform.HMainSourceEntryID=data[0].HEntryID||1;
- this.hform.HMaterNumber=data[0].HMaterNumber;
- this.hform.HICMOBillNo = data[0].HICMOBillNo;
- this.hform.HICMOInterID = data[0].HICMOInterID;
- this.hform.HICMOQty = data[0].HICMOQty;
- this.hform.HSourceName = data[0].HSourceName;
- this.hform.HSourceID = data[0].HSourceID;
- this.hform.HMaterID = data[0].HMaterID;
- this.hform.HMaterName = data[0].HMaterName;
- this.hform.HMainSourceBillNo = data[0].HBillNo;
- this.hform.HMainSourceBillType = data[0].HBillType;
- this.hform.HMainSourceInterID = data[0].HInterID;
- this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
-
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
- for (let i = 0; i < data.length; i++) {
- this.addCheckItem(data[i])
- }
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${Message}`,
+ });
+ return;
+ }
- this.hasSourceBill = true
- this.get_CheckItem();
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鐢熶骇姹囨姤鍗� 閿欒: ${err}`,
- });
- }
- },
- // 妫�楠屽憳鍒濆鍖�
- async InitHEmp() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Gy_Employee/list",
- data: {
- sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync(
+ HProcExchBillNo = data[0].娴佽浆鍗″彿;
+ HProcExchInterID = data[0].HProcExchInterID;
+ HProcExchEntryID = data[0].HProcExchEntryID;
+ HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+ HICMOBillNo = data[0].鐢熶骇璁㈠崟鍙�;
+ HICMOInterID = data[0].HICMOInterID;
+ HICMOQty = data[0].HICMOQty;
+ HSourceName = data[0].鐢熶骇璧勬簮;
+ HSourceID = data[0].HSourceID;
+ HMaterID = data[0].HMaterID;
+ HMaterName = data[0].浜у搧鍚嶇О;
+ HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+ HMainSourceBillType = data[0].HBillType;
+ HMainSourceInterID = data[0].hmainid;
+ HICMOEntryID = data[0].HICMOEntryID || 1;
+ this.hasSourceBill = true
+ this.get_CheckItem();
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${err}`,
+ });
+ }
+ },
+ //#endregion
+
+ async LoadingInformation_ICMOReportBill(HBarCode) {
+ // 鐢熶骇姹囨姤鍗�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/QC_LastPieceCheckBill/get_ICMOReportBill_Tmp_getByBillNo",
+ data: {
+ HBillNo: HBarCode,
+ user: getUserInfo()["Czymc"],
+ },
+ });
+
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
+
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鐢熶骇姹囨姤鍗� 閿欒: ${Message}`,
+ });
+ return;
+ }
+ //change_inlife
+ this.hform.HMainSourceEntryID = data[0].HEntryID || 1;
+ this.hform.HMaterNumber = data[0].HMaterNumber;
+ this.hform.HICMOBillNo = data[0].HICMOBillNo;
+ this.hform.HICMOInterID = data[0].HICMOInterID;
+ this.hform.HICMOQty = data[0].HICMOQty;
+ this.hform.HSourceName = data[0].HSourceName;
+ this.hform.HSourceID = data[0].HSourceID;
+ this.hform.HMaterID = data[0].HMaterID;
+ this.hform.HMaterName = data[0].HMaterName;
+ this.hform.HMainSourceBillNo = data[0].HBillNo;
+ this.hform.HMainSourceBillType = data[0].HBillType;
+ this.hform.HMainSourceInterID = data[0].HInterID;
+ this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+
+
+ for (let i = 0; i < data.length; i++) {
+ this.addCheckItem(data[i])
+ }
+
+ this.hasSourceBill = true
+ this.get_CheckItem();
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鐢熶骇姹囨姤鍗� 閿欒: ${err}`,
+ });
+ }
+ },
+ // 妫�楠屽憳鍒濆鍖�
+ async InitHEmp() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Gy_Employee/list",
+ data: {
+ sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync(
"Organization"
- )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' order by 閮ㄩ棬浠ｇ爜`,
- user: getUserInfo()["Czymc"],
- Organization: uni.getStorageSync("Organization"),
- },
- });
+ )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' order by 閮ㄩ棬浠ｇ爜 and HDeptID = ${uni.getStorageSync("HDeptID")}`,
+ ,
+ user: getUserInfo()["Czymc"],
+ Organization: uni.getStorageSync("Organization"),
+ },
+ });
- let {
- data,
- Message,
- count
- } = res.data;
+ let {
+ data,
+ Message,
+ count
+ } = res.data;
- if (count == 1) {
- console.log("data: ", data);
- this.GyFirstCheckEmpList = data;
- this.GyFirstCheckEmpNameList = Array.from(data).map((e) => e["鑱屽憳鍚嶇О"]);
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍒濆鍖栨楠屽憳澶辫触: ${Message}`,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍒濆鍖栨楠屽憳澶辫触: ${err}`,
- });
- }
- },
- async HFirstCheckEmpChange(e) {
- console.log("閫変腑妫�楠屽憳: ", e);
- let index = this.GyFirstCheckEmpList.findIndex((elem) => elem["鑱屽憳鍚嶇О"] == e);
- if (index == -1) {
- this.hform.HFirstCheckEmp = 0;
- this.hform.HFirstCheckEmpName = "";
- return;
- }
+ if (count == 1) {
+ console.log("data: ", data);
+ this.GyFirstCheckEmpList = data;
+ this.GyFirstCheckEmpNameList = Array.from(data).map((e) => e["鑱屽憳鍚嶇О"]);
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栨楠屽憳澶辫触: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栨楠屽憳澶辫触: ${err}`,
+ });
+ }
+ },
+ async HFirstCheckEmpChange(e) {
+ console.log("閫変腑妫�楠屽憳: ", e);
+ let index = this.GyFirstCheckEmpList.findIndex((elem) => elem["鑱屽憳鍚嶇О"] == e);
+ if (index == -1) {
+ this.hform.HFirstCheckEmp = 0;
+ this.hform.HFirstCheckEmpName = "";
+ return;
+ }
- this.hform.HFirstCheckEmp = this.GyFirstCheckEmpList[index]["HItemID"];
- this.hform.HFirstCheckEmpName = this.GyFirstCheckEmpList[index]["鑱屽憳鍚嶇О"];
- },
- // 鐢熶骇鐝鍒濆鍖�
- async InitHWorkShift() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Gy_ShiftsController/Get_Gy_WorkShiftList",
- data: {
- sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync(
+ this.hform.HFirstCheckEmp = this.GyFirstCheckEmpList[index]["HItemID"];
+ this.hform.HFirstCheckEmpName = this.GyFirstCheckEmpList[index]["鑱屽憳鍚嶇О"];
+ },
+ // 鐢熶骇鐝鍒濆鍖�
+ async InitHWorkShift() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Gy_ShiftsController/Get_Gy_WorkShiftList",
+ data: {
+ sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync(
"Organization"
)}'`,
- HMaker: getUserInfo()["Czymc"],
- },
- });
+ HMaker: getUserInfo()["Czymc"],
+ },
+ });
- let {
- data,
- Message,
- count
- } = res.data;
+ let {
+ data,
+ Message,
+ count
+ } = res.data;
- if (count == 1) {
- console.log("data: ", data);
- this.GyWorkShiftList = data;
- this.GyWorkShiftNameList = Array.from(data).map((e) => e["鐝鍚嶇О"]);
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍒濆鍖栫彮娆″け璐�: ${Message}`,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍒濆鍖栫彮娆″け璐�: ${err}`,
- });
- }
- },
- async HWorkShiftChange(e) {
- console.log("閫変腑鐝: ", e);
- let index = this.GyWorkShiftList.findIndex((elem) => elem["鐝鍚嶇О"] == e);
- if (index == -1) {
- this.hform.HWorkShiftID = 0;
- this.hform.HWorkShiftName = "";
- return;
- }
+ if (count == 1) {
+ console.log("data: ", data);
+ this.GyWorkShiftList = data;
+ this.GyWorkShiftNameList = Array.from(data).map((e) => e["鐝鍚嶇О"]);
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栫彮娆″け璐�: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栫彮娆″け璐�: ${err}`,
+ });
+ }
+ },
+ async HWorkShiftChange(e) {
+ console.log("閫変腑鐝: ", e);
+ let index = this.GyWorkShiftList.findIndex((elem) => elem["鐝鍚嶇О"] == e);
+ if (index == -1) {
+ this.hform.HWorkShiftID = 0;
+ this.hform.HWorkShiftName = "";
+ return;
+ }
- this.hform.HWorkShiftID = this.GySourceList[index]["HInterID"];
- this.hform.HWorkShiftName = this.GySourceList[index]["鐝鍚嶇О"];
- },
- // 鐢熶骇璧勬簮鏇存柊
- // 鐢熶骇璧勬簮鍒濆鍖�
- async InitHSource() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Gy_Source/list",
- data: {
- sWhere: `and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'') != '' and HUSEORGID = '100038'`,
- user: getUserInfo()["Czymc"],
- },
- });
+ this.hform.HWorkShiftID = this.GySourceList[index]["HInterID"];
+ this.hform.HWorkShiftName = this.GySourceList[index]["鐝鍚嶇О"];
+ },
+ // 鐢熶骇璧勬簮鏇存柊
+ // 鐢熶骇璧勬簮鍒濆鍖�
+ async InitHSource() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Gy_Source/list",
+ data: {
+ sWhere: `and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'') != '' and HUSEORGID = '100038'`,
+ user: getUserInfo()["Czymc"],
+ },
+ });
- let {
- data,
- Message,
- count
- } = res.data;
+ let {
+ data,
+ Message,
+ count
+ } = res.data;
- if (count == 1) {
- this.GySourceList = data;
- this.GySourceNameList = Array.from(data).map((e) => e["鐢熶骇璧勬簮鍚嶇О"]);
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${Message}`,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${err}`,
- });
- }
- },
- // 鐢熶骇璧勬簮鏇存柊
- async HSourceChange(e) {
- console.log("閫変腑鐢熶骇璧勬簮: ", e);
- let index = this.GySourceList.findIndex((elem) => elem["鐢熶骇璧勬簮鍚嶇О"] == e);
- if (index == -1) {
- this.hform.HSourceID = 0;
- this.hform.HSourceName = "";
- return;
- }
+ if (count == 1) {
+ this.GySourceList = data;
+ this.GySourceNameList = Array.from(data).map((e) => e["鐢熶骇璧勬簮鍚嶇О"]);
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${err}`,
+ });
+ }
+ },
+ // 鐢熶骇璧勬簮鏇存柊
+ async HSourceChange(e) {
+ console.log("閫変腑鐢熶骇璧勬簮: ", e);
+ let index = this.GySourceList.findIndex((elem) => elem["鐢熶骇璧勬簮鍚嶇О"] == e);
+ if (index == -1) {
+ this.hform.HSourceID = 0;
+ this.hform.HSourceName = "";
+ return;
+ }
- this.hform.HSourceID = this.GySourceList[index]["HItemID"];
- this.hform.HSourceName = this.GySourceList[index]["鐢熶骇璧勬簮鍚嶇О"];
+ this.hform.HSourceID = this.GySourceList[index]["HItemID"];
+ this.hform.HSourceName = this.GySourceList[index]["鐢熶骇璧勬簮鍚嶇О"];
- this.get_ICMOBillStatusList();
- this.get_QC_TakeSampleCheckBillList();
- this.GetCheckItemID();
- },
- // 鏄剧ず寮圭獥
- async showSelectorModule(item, index) {
- this.currentChechItemIDCache = item.num || 0; // 0 琛ㄧず娌℃湁浠讳綍瀛愯〃琚�変腑
- this.enablePopupModule = this.PopupModuleNameList[index];
- console.log("this.$refs: ", this.$refs);
- await this.$nextTick();
- if (index == 7) {
- // 妫�楠屾柟妗堥渶瑕侀澶栦紶閫掑伐搴忓拰鐗╂枡鍚嶇О涓や釜鍙傛暟
- this.$refs.listPopup.setRequiredInfo(item.HMaterName, item.HProcName);
- }
+ this.get_ICMOBillStatusList();
+ this.get_QC_TakeSampleCheckBillList();
+ this.GetCheckItemID();
+ },
+ // 鏄剧ず寮圭獥
+ async showSelectorModule(item, index) {
+ this.currentChechItemIDCache = item.num || 0; // 0 琛ㄧず娌℃湁浠讳綍瀛愯〃琚�変腑
+ this.enablePopupModule = this.PopupModuleNameList[index];
+ console.log("this.$refs: ", this.$refs);
+ await this.$nextTick();
+ if (index == 7) {
+ // 妫�楠屾柟妗堥渶瑕侀澶栦紶閫掑伐搴忓拰鐗╂枡鍚嶇О涓や釜鍙傛暟
+ this.$refs.listPopup.setRequiredInfo(item.HMaterName, item.HProcName);
+ }
- this.$refs.listPopup.showPopup();
- },
- getAnalysisMethodDisplay(val) {
- console.log("AnalysisMethodVal: ", val);
- if (val) {
- return this.arrayAnalysisMethod.find((e) => e.value == val).name;
- }
- return "";
- },
- checkResultChange(event) {
- console.log("event: ", event);
- },
- // 妫�楠岄」鐩柊澧炶
- addCheckItem(resource) {
- let ordinal = this.getObjLength(this.checkItems) + 1;
- let checkItem = {
- num: ordinal,
- HInterID: this.hform.HInterID,
- HQCCheckItemID: "",
- HQCCheckItemNumber: "",
- HQCCheckItemName: "",
- HInspectInstruMentID: "0",
- HInspectInstruMentNumber: "",
- HInspectInstruMentName: "",
- HQCStd: "",
- HUnit: "",
- HQCNote: "",
- HAnalysisMethod: "",
- HResult: 1,
- HMax: "",
- HMin: "",
- HAvg: "",
- HRemark: "",
- HKeyInspect: false,
- HStatus: 1,
- HSampleSchemeID: "",
- HUnitID: 0,
- HInspectVal: "",
- HTargetVal: "",
- HUpLimit: "",
- HDownLimit: "",
- HUpOffSet: "",
- HDownOffSet: "",
- HSampleDamageQty: 0,
- HSampleSchemeName: "",
- HSampleQty: 0,
- HAcceptQty: 0,
- HInspectionLevel: "",
- HRejectQty: 0,
- HStrictness: "",
- HSampleUnRightQty: 0,
- HAQL: "",
- HSamplingType: "",
- HInspectResultToSee: "",
- };
- if (resource) {
- // 閫氳繃涓昏〃妫�楠屾柟妗堝甫鍑虹殑妫�楠岄」鐩�
- Object.assign(checkItem, resource);
- }
- this.$set(this.checkItems, ordinal, checkItem);
- this.$nextTick(() => {
- // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
- this.setInspectValModule(this.checkItems[ordinal]);
- });
- },
- // 妫�楠岄」鐩垹闄よ
- removeCheckItem(item) {
- uni.showModal({
- title: "娓╅Θ鎻愮ず",
- content: `纭瑕佸垹闄ょ${item.num}琛屽悧锛熷垹闄ゅ悗涓嶈兘鎭㈠`,
- success: (res) => {
- if (res.confirm) {
- this.$delete(this.checkItems, item.num);
- this.$delete(this.subTabs, `_${item.num}`);
- this.$forceUpdate();
- this.refreshCheckItemNum();
- }
- },
- });
- },
- async refreshCheckItemNum() {
- await this.$nextTick();
- // 閲嶆帓搴忓彿
- let num = 1;
- let checkItemsCache = {};
- for (let s in this.checkItems) {
- checkItemsCache[num] = this.checkItems[s];
- checkItemsCache[num].num = num;
- num++;
- }
- this.checkItems = checkItemsCache;
- },
- getObjLength(obj) {
- return Object.keys(obj).length;
- },
- // 缁撹淇敼
- HResultChange(id, e) {
- console.log("e: ", e);
- this.checkItems[id]["HResult"] = e.detail.value ? 1 : 2;
+ this.$refs.listPopup.showPopup();
+ },
+ getAnalysisMethodDisplay(val) {
+ console.log("AnalysisMethodVal: ", val);
+ if (val) {
+ return this.arrayAnalysisMethod.find((e) => e.value == val).name;
+ }
+ return "";
+ },
+ checkResultChange(event) {
+ console.log("event: ", event);
+ },
+ // 妫�楠岄」鐩柊澧炶
+ addCheckItem(resource) {
+ let ordinal = this.getObjLength(this.checkItems) + 1;
+ let checkItem = {
+ num: ordinal,
+ HInterID: this.hform.HInterID,
+ HQCCheckItemID: "",
+ HQCCheckItemNumber: "",
+ HQCCheckItemName: "",
+ HInspectInstruMentID: "0",
+ HInspectInstruMentNumber: "",
+ HInspectInstruMentName: "",
+ HQCStd: "",
+ HUnit: "",
+ HQCNote: "",
+ HAnalysisMethod: "",
+ HResult: 1,
+ HMax: "",
+ HMin: "",
+ HAvg: "",
+ HRemark: "",
+ HKeyInspect: false,
+ HStatus: 1,
+ HSampleSchemeID: "",
+ HUnitID: 0,
+ HInspectVal: "",
+ HTargetVal: "",
+ HUpLimit: "",
+ HDownLimit: "",
+ HUpOffSet: "",
+ HDownOffSet: "",
+ HSampleDamageQty: 0,
+ HSampleSchemeName: "",
+ HSampleQty: 0,
+ HAcceptQty: 0,
+ HInspectionLevel: "",
+ HRejectQty: 0,
+ HStrictness: "",
+ HSampleUnRightQty: 0,
+ HAQL: "",
+ HSamplingType: "",
+ HInspectResultToSee: "",
+ };
+ if (resource) {
+ // 閫氳繃涓昏〃妫�楠屾柟妗堝甫鍑虹殑妫�楠岄」鐩�
+ Object.assign(checkItem, resource);
+ }
+ this.$set(this.checkItems, ordinal, checkItem);
+ this.$nextTick(() => {
+ // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
+ this.setInspectValModule(this.checkItems[ordinal]);
+ });
+ },
+ // 妫�楠岄」鐩垹闄よ
+ removeCheckItem(item) {
+ uni.showModal({
+ title: "娓╅Θ鎻愮ず",
+ content: `纭瑕佸垹闄ょ${item.num}琛屽悧锛熷垹闄ゅ悗涓嶈兘鎭㈠`,
+ success: (res) => {
+ if (res.confirm) {
+ this.$delete(this.checkItems, item.num);
+ this.$delete(this.subTabs, `_${item.num}`);
+ this.$forceUpdate();
+ this.refreshCheckItemNum();
+ }
+ },
+ });
+ },
+ async refreshCheckItemNum() {
+ await this.$nextTick();
+ // 閲嶆帓搴忓彿
+ let num = 1;
+ let checkItemsCache = {};
+ for (let s in this.checkItems) {
+ checkItemsCache[num] = this.checkItems[s];
+ checkItemsCache[num].num = num;
+ num++;
+ }
+ this.checkItems = checkItemsCache;
+ },
+ getObjLength(obj) {
+ return Object.keys(obj).length;
+ },
+ // 缁撹淇敼
+ HResultChange(id, e) {
+ console.log("e: ", e);
+ this.checkItems[id]["HResult"] = e.detail.value ? 1 : 2;
- this.HCheckLastResult();
- },
- // 姣忔妫�楠岄」鐩殑缁撹鏇存柊锛岄兘瑕佸垽鏂渶缁堢粨璁�
- HCheckLastResult() {
- let unPassNum = 0;
- for (var key in this.checkItems) {
- if (!(this.checkItems[key]["HResult"] == 1)) {
- unPassNum++;
- }
- }
+ this.HCheckLastResult();
+ },
+ // 姣忔妫�楠岄」鐩殑缁撹鏇存柊锛岄兘瑕佸垽鏂渶缁堢粨璁�
+ HCheckLastResult() {
+ let unPassNum = 0;
+ for (var key in this.checkItems) {
+ if (!(this.checkItems[key]["HResult"] == 1)) {
+ unPassNum++;
+ }
+ }
- if (unPassNum > 0) {
- this.hform.HLastResult = false;
- return;
- }
- this.hform.HLastResult = true;
- },
- // 妫�楠屾柟妗堜慨鏀�
- HAnalysisMethodChange(id, e) {
- console.log("e: ", e);
- this.checkItems[id]["HAnalysisMethod"] = this.arrayAnalysisMethod[e.detail.value][
- "value"
- ];
+ if (unPassNum > 0) {
+ this.hform.HLastResult = false;
+ return;
+ }
+ this.hform.HLastResult = true;
+ },
+ // 妫�楠屾柟妗堜慨鏀�
+ HAnalysisMethodChange(id, e) {
+ console.log("e: ", e);
+ this.checkItems[id]["HAnalysisMethod"] = this.arrayAnalysisMethod[e.detail.value][
+ "value"
+ ];
- // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
- this.setInspectValModule(this.checkItems[id]);
- },
- // 閲嶇偣妫�鏌ヤ慨鏀�
- HKeyInspectChange(id, e) {
- console.log("e: ", e);
- this.checkItems[id]["HKeyInspect"] = e.detail.value;
- },
- // 妫�楠岄」鐩繑鍥�
- async CheckItemComplete(e) {
- console.log("CheckItemRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.checkItems[key], {
- HQCCheckItemID: data["HItemID"],
- HQCCheckItemNumber: data["浠ｇ爜"],
- HQCCheckItemName: data["鍚嶇О"],
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- }
- },
- // 妫�楠屾柟妗堣繑鍥�
- async SampleSchemeComplete(e) {
- console.log("SampleSchemeRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.checkItems[key], {
- HSampleSchemeID: data["hmainid"],
- HSampleSchemeNumber: data["鎶芥牱鏂规浠ｇ爜"],
- HSampleSchemeName: data["鎶芥牱鏂规鍚嶇О"],
- HSampleQty: data["鏍锋湰閲�"] || 0,
- HAcceptQty: data["鍏佽鏁�"] || 0,
- HInspectionLevel: data["妫�楠屾按骞�"],
- HRejectQty: data["鎷掔粷鏁�"] || 0,
- HStrictness: data["涓ユ牸搴�"],
- HSampleUnRightQty: data["鏍锋湰涓嶅悎鏍兼暟"] || 0,
- HAQL: data["AQL"],
- HSamplingType: data["鎶芥牱绫诲瀷"],
- HInspectResultToSee: data["妫�楠岀粨鏋�"],
- HUpLimit: data["涓婇檺鍊�"] || 0,
- HDownLimit: data["涓嬮檺鍊�"] || 0,
- HSampleDamageQty: data["鏍锋湰鐮村潖鏁�"] || 0,
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- this.setInspectValModule(this.checkItems[key]);
+ // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
+ this.setInspectValModule(this.checkItems[id]);
+ },
+ // 閲嶇偣妫�鏌ヤ慨鏀�
+ HKeyInspectChange(id, e) {
+ console.log("e: ", e);
+ this.checkItems[id]["HKeyInspect"] = e.detail.value;
+ },
+ // 妫�楠岄」鐩繑鍥�
+ async CheckItemComplete(e) {
+ console.log("CheckItemRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.checkItems[key], {
+ HQCCheckItemID: data["HItemID"],
+ HQCCheckItemNumber: data["浠ｇ爜"],
+ HQCCheckItemName: data["鍚嶇О"],
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ }
+ },
+ // 妫�楠屾柟妗堣繑鍥�
+ async SampleSchemeComplete(e) {
+ console.log("SampleSchemeRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.checkItems[key], {
+ HSampleSchemeID: data["hmainid"],
+ HSampleSchemeNumber: data["鎶芥牱鏂规浠ｇ爜"],
+ HSampleSchemeName: data["鎶芥牱鏂规鍚嶇О"],
+ HSampleQty: data["鏍锋湰閲�"] || 0,
+ HAcceptQty: data["鍏佽鏁�"] || 0,
+ HInspectionLevel: data["妫�楠屾按骞�"],
+ HRejectQty: data["鎷掔粷鏁�"] || 0,
+ HStrictness: data["涓ユ牸搴�"],
+ HSampleUnRightQty: data["鏍锋湰涓嶅悎鏍兼暟"] || 0,
+ HAQL: data["AQL"],
+ HSamplingType: data["鎶芥牱绫诲瀷"],
+ HInspectResultToSee: data["妫�楠岀粨鏋�"],
+ HUpLimit: data["涓婇檺鍊�"] || 0,
+ HDownLimit: data["涓嬮檺鍊�"] || 0,
+ HSampleDamageQty: data["鏍锋湰鐮村潖鏁�"] || 0,
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ this.setInspectValModule(this.checkItems[key]);
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- }
- },
- // 妫�楠屼华鍣ㄨ繑鍥�
- async InspectMentComplete(e) {
- console.log("InspectInstruMentRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.checkItems[key], {
- HInspectInstruMentID: data["HItemID"],
- HInspectInstruMentNumber: data["妫�楠屼华鍣ㄤ唬鐮�"],
- HInspectInstruMentName: data["妫�楠屼华鍣ㄥ悕绉�"],
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- }
- },
- // 浜у搧浠ｇ爜杩斿洖
- async MaterComplete(e) {
- console.log("MaterRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.hform, {
- HMaterNumber: data["鐗╂枡浠ｇ爜"],
- HMaterName: data["鐗╂枡鍚嶇О"],
- HMaterID: data["HItemID"],
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- this.GetCheckItemID();
- }
- },
- // 浠诲姟鍗曡繑鍥�
- async ICMOBillComplete(e) {
- console.log("ICMOBillRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.hform, {
- HICMOInterID: data.hmainid,
- HICMOEntryID: data.HEntryID || 1,
- HICMOBillNo: data.鍗曟嵁鍙�,
- HMaterNumber: data.浜у搧浠ｇ爜,
- HMaterName: data.浜у搧鍚嶇О,
- HMaterID: data.HMaterID,
- HICMOQty: data.鐢熶骇浠诲姟鍗曟暟閲�,
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- }
- },
- // 娴佽浆鍗¤繑鍥�
- async ProcExchBillComplete(e) {
- console.log("ProcExchBillRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.hform, {
- HProcExchInterID: data.hmainid,
- HProcExchEntryID: data.hsubid,
- HProcExchBillNo: data.鍗曟嵁鍙�,
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- }
- },
- // 妫�楠屾柟妗�(涓昏〃)杩斿洖
- async HQCSchemeComplete(e) {
- console.log("HQCSchemeRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.hform, {
- HQCSchemeID: data.hmainid,
- HQCSchemeName: data.妫�楠屾柟妗堝悕绉�,
- });
- await this.get_CheckItem();
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- }
- },
- // 宸ュ簭杩斿洖
- async HProcComplete(e) {
- console.log(" HProcRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.hform, {
- HProcName: data["宸ュ簭鍚嶇О"],
- HProcID: data["HItemID"],
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- await this.GetCheckItemID();
- await this.get_ICMOBillStatusList();
- await this.get_QC_TakeSampleCheckBillList();
- }
- },
-
- //
- async get_QC_TakeSampleCheckBillList() {
- // 鍙栨牱鍗曟煡璇�
- let HProcID = this.hform.HProcID;
- let HProcExchInterId = this.hform.HProcExchInterID;
- let sWhere = "";
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ }
+ },
+ // 妫�楠屼华鍣ㄨ繑鍥�
+ async InspectMentComplete(e) {
+ console.log("InspectInstruMentRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.checkItems[key], {
+ HInspectInstruMentID: data["HItemID"],
+ HInspectInstruMentNumber: data["妫�楠屼华鍣ㄤ唬鐮�"],
+ HInspectInstruMentName: data["妫�楠屼华鍣ㄥ悕绉�"],
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ }
+ },
+ // 浜у搧浠ｇ爜杩斿洖
+ async MaterComplete(e) {
+ console.log("MaterRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.hform, {
+ HMaterNumber: data["鐗╂枡浠ｇ爜"],
+ HMaterName: data["鐗╂枡鍚嶇О"],
+ HMaterID: data["HItemID"],
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ this.GetCheckItemID();
+ }
+ },
+ // 浠诲姟鍗曡繑鍥�
+ async ICMOBillComplete(e) {
+ console.log("ICMOBillRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.hform, {
+ HICMOInterID: data.hmainid,
+ HICMOEntryID: data.HEntryID || 1,
+ HICMOBillNo: data.鍗曟嵁鍙�,
+ HMaterNumber: data.浜у搧浠ｇ爜,
+ HMaterName: data.浜у搧鍚嶇О,
+ HMaterID: data.HMaterID,
+ HICMOQty: data.鐢熶骇浠诲姟鍗曟暟閲�,
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ }
+ },
+ // 娴佽浆鍗¤繑鍥�
+ async ProcExchBillComplete(e) {
+ console.log("ProcExchBillRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.hform, {
+ HProcExchInterID: data.hmainid,
+ HProcExchEntryID: data.hsubid,
+ HProcExchBillNo: data.鍗曟嵁鍙�,
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ }
+ },
+ // 妫�楠屾柟妗�(涓昏〃)杩斿洖
+ async HQCSchemeComplete(e) {
+ console.log("HQCSchemeRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.hform, {
+ HQCSchemeID: data.hmainid,
+ HQCSchemeName: data.妫�楠屾柟妗堝悕绉�,
+ });
+ await this.get_CheckItem();
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ }
+ },
+ // 宸ュ簭杩斿洖
+ async HProcComplete(e) {
+ console.log(" HProcRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.hform, {
+ HProcName: data["宸ュ簭鍚嶇О"],
+ HProcID: data["HItemID"],
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ await this.GetCheckItemID();
+ await this.get_ICMOBillStatusList();
+ await this.get_QC_TakeSampleCheckBillList();
+ }
+ },
- if (HProcID == "0" || HProcID == "") {
- CommonUtils.showTips({
- message: "璇烽�夋嫨宸ュ簭",
- });
- return;
- }
+ //
+ async get_QC_TakeSampleCheckBillList() {
+ // 鍙栨牱鍗曟煡璇�
+ let HProcID = this.hform.HProcID;
+ let HProcExchInterId = this.hform.HProcExchInterID;
+ let sWhere = "";
- sWhere = " and 宸ュ簭娴佽浆鍗′富鍐呯爜='" + HProcExchInterID + "' and HProcID=" + HProcID;
+ if (HProcID == "0" || HProcID == "") {
+ CommonUtils.showTips({
+ message: "璇烽�夋嫨宸ュ簭",
+ });
+ return;
+ }
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "//QC_TakeSampleCheckBill/QC_TakeSampleCheckBillMainList",
- data: {
- sWhere: sWhere,
- user: getUserInfo()["Czymc"],
- },
- });
+ sWhere = " and 宸ュ簭娴佽浆鍗′富鍐呯爜='" + HProcExchInterID + "' and HProcID=" + HProcID;
- let {
- data,
- count,
- Message
- } = res.data;
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${Message}`,
- });
- }
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "//QC_TakeSampleCheckBill/QC_TakeSampleCheckBillMainList",
+ data: {
+ sWhere: sWhere,
+ user: getUserInfo()["Czymc"],
+ },
+ });
- this.hform.HTakeSampleCheckBillID = data[0]["hmainid"];
- this.hform.HTakeSampleCheckBillNo = data[0]["鍗曟嵁鍙�"];
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${err}`,
- });
- }
- },
- async get_ICMOBillStatusList() {
- let sWhere = "";
- let HProcID = this.hform.HProcID;
- let HSourceID = this.hform.HSourceID;
- let HProcExchInterId = this.hform.HProcExchInterID;
+ let {
+ data,
+ count,
+ Message
+ } = res.data;
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${Message}`,
+ });
+ }
- if (HProcID != "0") {
- sWhere += " and HProcID=" + HProcID;
- }
- if (HSourceID != "0") {
- sWhere += " and HSourceID=" + HSourceID;
- }
+ this.hform.HTakeSampleCheckBillID = data[0]["hmainid"];
+ this.hform.HTakeSampleCheckBillNo = data[0]["鍗曟嵁鍙�"];
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${err}`,
+ });
+ }
+ },
+ async get_ICMOBillStatusList() {
+ let sWhere = "";
+ let HProcID = this.hform.HProcID;
+ let HSourceID = this.hform.HSourceID;
+ let HProcExchInterId = this.hform.HProcExchInterID;
- sWhere += " and HSourceInterID=" + HProcExchInterID;
+ if (HProcID != "0") {
+ sWhere += " and HProcID=" + HProcID;
+ }
+ if (HSourceID != "0") {
+ sWhere += " and HSourceID=" + HSourceID;
+ }
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/CheckBill/GetICMOBillStatusList",
- data: {
- sWhere: sWhere,
- user: getUserInfo()["Czymc"],
- },
- });
+ sWhere += " and HSourceInterID=" + HProcExchInterID;
- let {
- data,
- count,
- Message
- } = res.data;
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${Message}`,
- });
- }
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/CheckBill/GetICMOBillStatusList",
+ data: {
+ sWhere: sWhere,
+ user: getUserInfo()["Czymc"],
+ },
+ });
- this.hform.HProcID = data[0]["HProcID"];
- this.hform.HProcName = data[0]["宸ュ簭"];
- this.hform.HSourceID = data[0]["HSourceID"];
- this.hform.HSourceName = data[0]["鐢熶骇璧勬簮"];
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${err}`,
- });
- }
- },
- setInspectValModule(checkItem) {
- console.log("checkItem: ", checkItem);
- if (!checkItem || !checkItem.HAnalysisMethod || !checkItem.HSampleSchemeID) {
- return;
- }
- // 鍖哄垎妫�楠屽�奸〉绛惧拰闈欐�侀〉绛撅紝妫�楠屽�奸〉绛剧殑id浠寮�澶�
- this.$set(this.InspectModules, `_${checkItem.num}`, {
- id: `_${checkItem.num}`,
- checkItemId: checkItem.num,
- });
- console.log(" this.arrayAnalysisMethod: ", checkItem.HAnalysisMethod);
- let analysisMethodName = this.arrayAnalysisMethod.find(
- (e) => e.value == checkItem.HAnalysisMethod
- ).name;
- this.$set(this.subTabs, `_${checkItem.num}`, {
- id: `_${checkItem.num}`,
- name: `${analysisMethodName}-${checkItem.HQCCheckItemName}`,
- });
- },
- InspectValueUpdate(e) {
- console.log("e: ", e);
- let {
- data,
- list
- } = e;
- this.checkItems[data.num] = Object.assign(this.checkItems[data.num], data);
- this.$set(this.InspectValues, `${data.num}`, list);
- },
- // 甯﹀嚭妫�楠岄」鐩�
- async get_CheckItem() {
- // 棣栧厛娓呯┖妫�楠岄」鐩� 鍜� 妫�楠屽��
- this.checkItems = {}
- for (let key in this.subTabs) {
- if (key.substring(1) == "_") {
- this.$delete(this.subTabs, key)
- }
- }
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Web/GetCheckItemByCheckProjectID_Sec",
- data: {
- CheckProjectID: this.hform.HQCSchemeID || 0,
- HBatchQty: this.hform.HProcExchQty || 0,
- },
- });
+ let {
+ data,
+ count,
+ Message
+ } = res.data;
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${Message}`,
+ });
+ }
- let {
- data,
- count,
- Message
- } = res.data;
+ this.hform.HProcID = data[0]["HProcID"];
+ this.hform.HProcName = data[0]["宸ュ簭"];
+ this.hform.HSourceID = data[0]["HSourceID"];
+ this.hform.HSourceName = data[0]["鐢熶骇璧勬簮"];
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${err}`,
+ });
+ }
+ },
+ setInspectValModule(checkItem) {
+ console.log("checkItem: ", checkItem);
+ if (!checkItem || !checkItem.HAnalysisMethod || !checkItem.HSampleSchemeID) {
+ return;
+ }
+ // 鍖哄垎妫�楠屽�奸〉绛惧拰闈欐�侀〉绛撅紝妫�楠屽�奸〉绛剧殑id浠寮�澶�
+ this.$set(this.InspectModules, `_${checkItem.num}`, {
+ id: `_${checkItem.num}`,
+ checkItemId: checkItem.num,
+ });
+ console.log(" this.arrayAnalysisMethod: ", checkItem.HAnalysisMethod);
+ let analysisMethodName = this.arrayAnalysisMethod.find(
+ (e) => e.value == checkItem.HAnalysisMethod
+ ).name;
+ this.$set(this.subTabs, `_${checkItem.num}`, {
+ id: `_${checkItem.num}`,
+ name: `${analysisMethodName}-${checkItem.HQCCheckItemName}`,
+ });
+ },
+ InspectValueUpdate(e) {
+ console.log("e: ", e);
+ let {
+ data,
+ list
+ } = e;
+ this.checkItems[data.num] = Object.assign(this.checkItems[data.num], data);
+ this.$set(this.InspectValues, `${data.num}`, list);
+ },
+ // 甯﹀嚭妫�楠岄」鐩�
+ async get_CheckItem() {
+ // 棣栧厛娓呯┖妫�楠岄」鐩� 鍜� 妫�楠屽��
+ this.checkItems = {}
+ for (let key in this.subTabs) {
+ if (key.substring(1) == "_") {
+ this.$delete(this.subTabs, key)
+ }
+ }
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Web/GetCheckItemByCheckProjectID_Sec",
+ data: {
+ CheckProjectID: this.hform.HQCSchemeID || 0,
+ HBatchQty: this.hform.HProcExchQty || 0,
+ },
+ });
- if (count == 1) {
- for (var i = 0; i < data.length; i++) {
- let checkItem = {
- HQCCheckItemID: data[i]["HQCCheckItemID"],
- HQCCheckItemNumber: data[i]["妫�楠岄」鐩唬鐮�"],
- HQCCheckItemName: data[i]["妫�楠岄」鐩�"],
- HInspectInstruMentID: data[i]["HInspectInstruMentID"],
- HInspectInstruMentNumber: data[i]["妫�楠屼华鍣ㄤ唬鐮�"],
- HInspectInstruMentName: data[i]["妫�楠屼华鍣�"],
- HQCStd: data[i]["HQCStd"],
- HUnit: data[i]["鍗曚綅鍚嶇О"],
- HQCNote: "",
- HAnalysisMethod: data[i]["鍒嗘瀽鏂规硶"],
- HResult: data[i]["榛樿缁撹"],
- HMax: "",
- HMin: "",
- HAvg: "",
- HRemark: "",
- HKeyInspect: data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false,
- HStatus: 0,
- HSampleSchemeID: data[i]["HSampleSchemeID"],
- HUnitID: data[i]["HUnitID"],
- HInspectVal: "",
- HTargetVal: "",
- HUpLimit: data[i].涓婇檺鍊�,
- HDownLimit: data[i].涓嬮檺鍊�,
- HUpOffSet: "",
- HDownOffSet: "",
- HSampleDamageQty: "0",
- HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
- HSampleQty: data[i].鏍锋湰閲�,
- HAcceptQty: data[i].鍏佽鏁�,
- HInspectionLevel: data[i].妫�楠屾按骞�,
- HRejectQty: data[i].鎷掔粷鏁�,
- HStrictness: data[i].涓ユ牸搴�,
- HSampleUnRightQty: 0,
- HAQL: data[i].AQL,
- HSamplingType: data[i].鎶芥牱绫诲瀷,
- HCompareSymbol: data[i].姣旇緝绗�,
- HTargetVal: data[i].鐩爣鍊� || 0,
- };
+ let {
+ data,
+ count,
+ Message
+ } = res.data;
- this.addCheckItem(checkItem);
- }
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${Message} `,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${err} `,
- });
- }
- },
- async getMaxBillNo() {
- try {
- let res = await CommonUtils.doRequest2Sync({
- url: "/Web/GetMAXNum",
- data: {
- HBillType: "7501",
- },
- });
+ if (count == 1) {
+ for (var i = 0; i < data.length; i++) {
+ let checkItem = {
+ HQCCheckItemID: data[i]["HQCCheckItemID"],
+ HQCCheckItemNumber: data[i]["妫�楠岄」鐩唬鐮�"],
+ HQCCheckItemName: data[i]["妫�楠岄」鐩�"],
+ HInspectInstruMentID: data[i]["HInspectInstruMentID"],
+ HInspectInstruMentNumber: data[i]["妫�楠屼华鍣ㄤ唬鐮�"],
+ HInspectInstruMentName: data[i]["妫�楠屼华鍣�"],
+ HQCStd: data[i]["HQCStd"],
+ HUnit: data[i]["鍗曚綅鍚嶇О"],
+ HQCNote: "",
+ HAnalysisMethod: data[i]["鍒嗘瀽鏂规硶"],
+ HResult: data[i]["榛樿缁撹"],
+ HMax: "",
+ HMin: "",
+ HAvg: "",
+ HRemark: "",
+ HKeyInspect: data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false,
+ HStatus: 0,
+ HSampleSchemeID: data[i]["HSampleSchemeID"],
+ HUnitID: data[i]["HUnitID"],
+ HInspectVal: "",
+ HTargetVal: "",
+ HUpLimit: data[i].涓婇檺鍊�,
+ HDownLimit: data[i].涓嬮檺鍊�,
+ HUpOffSet: "",
+ HDownOffSet: "",
+ HSampleDamageQty: "0",
+ HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
+ HSampleQty: data[i].鏍锋湰閲�,
+ HAcceptQty: data[i].鍏佽鏁�,
+ HInspectionLevel: data[i].妫�楠屾按骞�,
+ HRejectQty: data[i].鎷掔粷鏁�,
+ HStrictness: data[i].涓ユ牸搴�,
+ HSampleUnRightQty: 0,
+ HAQL: data[i].AQL,
+ HSamplingType: data[i].鎶芥牱绫诲瀷,
+ HCompareSymbol: data[i].姣旇緝绗�,
+ HTargetVal: data[i].鐩爣鍊� || 0,
+ };
- if (!res) {
- return;
- }
+ this.addCheckItem(checkItem);
+ }
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${Message} `,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${err} `,
+ });
+ }
+ },
+ async getMaxBillNo() {
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Web/GetMAXNum",
+ data: {
+ HBillType: "7501",
+ },
+ });
- let {
- data,
- Message,
- count
- } = res.data;
- if (count == 1) {
- this.hform.HInterID = data[0].HInterID;
- this.hform.HBillNo = data[0].HBillNo;
- } else {
- throw Message;
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: "鑾峰彇鍗曟嵁鍙峰紓甯�: " + err,
- });
- }
- },
- // 妫�楠屽�艰繑鍥炲��
- InspectValueComplete(e) {
- console.log("e: ", e);
- let key = e.num;
- e.HStatus = e.HStatus ? 1 : 0
- if (e.HResult2 == '') {
- e.HResult2 = this.checkItems[key].HResult
- }
- Object.assign(this.checkItems[key], e);
- this.checkItems[key].HInspectResultToSee = this.checkItems[key].HResult2;
- this.checkItems[key].HResult = this.checkItems[key].HResult2 == '鍚堟牸' ? 1 : 2;
+ if (!res) {
+ return;
+ }
- this.HCheckLastResult();
+ let {
+ data,
+ Message,
+ count
+ } = res.data;
+ if (count == 1) {
+ this.hform.HInterID = data[0].HInterID;
+ this.hform.HBillNo = data[0].HBillNo;
+ } else {
+ throw Message;
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鑾峰彇鍗曟嵁鍙峰紓甯�: " + err,
+ });
+ }
+ },
+ // 妫�楠屽�艰繑鍥炲��
+ InspectValueComplete(e) {
+ console.log("e: ", e);
+ let key = e.num;
+ e.HStatus = e.HStatus ? 1 : 0
+ if (e.HResult2 == '') {
+ e.HResult2 = this.checkItems[key].HResult
+ }
+ Object.assign(this.checkItems[key], e);
+ this.checkItems[key].HInspectResultToSee = this.checkItems[key].HResult2;
+ this.checkItems[key].HResult = this.checkItems[key].HResult2 == '鍚堟牸' ? 1 : 2;
- },
- checkSubmitValidate() {
- // if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
- // CommonUtils.showTips({
- // message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
- // });
- // return false;
- // }
+ this.HCheckLastResult();
- if (this.hform.HFirstCheckEmp == 0) {
- CommonUtils.showTips({
- message: "妫�楠屽憳鏈�夋嫨锛�",
- });
- return false;
- }
+ },
+ checkSubmitValidate() {
+ // if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
+ // CommonUtils.showTips({
+ // message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
+ // });
+ // return false;
+ // }
- for (let key in this.checkItems) {
- if (!this.checkItems[key].HQCCheckItemID) {
- CommonUtils.showTips({
- message: `绗�${this.checkItems[key].num}琛屾楠岄」鐩笉鑳戒负绌�!`,
- });
- return false;
- }
+ if (this.hform.HFirstCheckEmp == 0) {
+ CommonUtils.showTips({
+ message: "妫�楠屽憳鏈�夋嫨锛�",
+ });
+ return false;
+ }
- if (
- this.checkItems[key].HSampleSchemeID == "" ||
- this.checkItems[key].HSampleSchemeID == null
- ) {
- this.checkItems[key].HSampleSchemeID = 0;
- }
- if (
- this.checkItems[key].HSampleQty == "" ||
- this.checkItems[key].HSampleQty == null
- ) {
- this.checkItems[key].HSampleQty = 0;
- }
- if (
- this.checkItems[key].HSampleDamageQty == "" ||
- this.checkItems[key].HSampleDamageQty == null
- ) {
- this.checkItems[key].HSampleDamageQty = 0;
- }
- if (
- this.checkItems[key].HAcceptQty == "" ||
- this.checkItems[key].HAcceptQty == null
- ) {
- this.checkItems[key].HAcceptQty = 0;
- }
- if (
- this.checkItems[key].HRejectQty == "" ||
- this.checkItems[key].HRejectQty == null
- ) {
- this.checkItems[key].HRejectQty = 0;
- }
- if (
- this.checkItems[key].HSampleUnRightQty == "" ||
- this.checkItems[key].HSampleUnRightQty == 0
- ) {
- this.checkItems[key].HSampleUnRightQty = 0;
- }
- if (this.checkItems[key].HUnitID == "") {
- this.checkItems[key].HUnitID = 0;
- }
- }
+ for (let key in this.checkItems) {
+ if (!this.checkItems[key].HQCCheckItemID) {
+ CommonUtils.showTips({
+ message: `绗�${this.checkItems[key].num}琛屾楠岄」鐩笉鑳戒负绌�!`,
+ });
+ return false;
+ }
- return true;
- },
- async submit() {
- if (!this.checkSubmitValidate()) {
- return;
- }
- try {
- console.log('this.$refs: ', this.$refs);
- // 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
- if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules.length >
- 0) {
- // 鍔犺浇鏈夋楠屽�兼ā鍧�
- await this.$refs.InspectValueModules[0].set_SaveValue();
- this.InspectValues[0] = this.$refs.InspectValueModules[0].InSpectValues;
- await this.InspectValueComplete(this.$refs.InspectValueModules[0].checkData)
- }
- let InspectValuesTrans = [];
- let HInterID = this.hform.HInterID;
- for (let key in this.InspectValues) {
- let HEntryID = key;
+ if (
+ this.checkItems[key].HSampleSchemeID == "" ||
+ this.checkItems[key].HSampleSchemeID == null
+ ) {
+ this.checkItems[key].HSampleSchemeID = 0;
+ }
+ if (
+ this.checkItems[key].HSampleQty == "" ||
+ this.checkItems[key].HSampleQty == null
+ ) {
+ this.checkItems[key].HSampleQty = 0;
+ }
+ if (
+ this.checkItems[key].HSampleDamageQty == "" ||
+ this.checkItems[key].HSampleDamageQty == null
+ ) {
+ this.checkItems[key].HSampleDamageQty = 0;
+ }
+ if (
+ this.checkItems[key].HAcceptQty == "" ||
+ this.checkItems[key].HAcceptQty == null
+ ) {
+ this.checkItems[key].HAcceptQty = 0;
+ }
+ if (
+ this.checkItems[key].HRejectQty == "" ||
+ this.checkItems[key].HRejectQty == null
+ ) {
+ this.checkItems[key].HRejectQty = 0;
+ }
+ if (
+ this.checkItems[key].HSampleUnRightQty == "" ||
+ this.checkItems[key].HSampleUnRightQty == 0
+ ) {
+ this.checkItems[key].HSampleUnRightQty = 0;
+ }
+ if (this.checkItems[key].HUnitID == "") {
+ this.checkItems[key].HUnitID = 0;
+ }
+ }
- InspectValuesTrans.push(
- `${JSON.stringify(this.InspectValues[key])}`
- );
- }
- let checkItemsArray = [];
- for (var key in this.checkItems) {
- let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]))
- delete checkItem.data
- checkItemsArray.push(checkItem);
- }
- console.log('checkItemsArray: ', checkItemsArray);
- let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(
+ return true;
+ },
+ async submit() {
+ if (!this.checkSubmitValidate()) {
+ return;
+ }
+ try {
+ console.log('this.$refs: ', this.$refs);
+ // 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
+ if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules
+ .length >
+ 0) {
+ // 鍔犺浇鏈夋楠屽�兼ā鍧�
+ await this.$refs.InspectValueModules[0].set_SaveValue();
+ this.InspectValues[0] = this.$refs.InspectValueModules[0].InSpectValues;
+ await this.InspectValueComplete(this.$refs.InspectValueModules[0].checkData)
+ }
+ let InspectValuesTrans = [];
+ let HInterID = this.hform.HInterID;
+ for (let key in this.InspectValues) {
+ let HEntryID = key;
+
+ InspectValuesTrans.push(
+ `${JSON.stringify(this.InspectValues[key])}`
+ );
+ }
+ let checkItemsArray = [];
+ for (var key in this.checkItems) {
+ let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]))
+ delete checkItem.data
+ checkItemsArray.push(checkItem);
+ }
+ console.log('checkItemsArray: ', checkItemsArray);
+ let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(
checkItemsArray
)};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0]}`;
- console.log("this.checkItems: ", this.checkItems);
+ console.log("this.checkItems: ", this.checkItems);
- let res = await CommonUtils.doRequest2Sync({
- url: "/QC_LastPieceCheckBill/set_SaveBill",
- data: {
- sMainSub: sMainSub,
- },
- method: "POST",
- });
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/QC_LastPieceCheckBill/set_SaveBill",
+ data: {
+ sMainSub: sMainSub,
+ },
+ method: "POST",
+ });
- if (!res) {
- return;
- }
+ if (!res) {
+ return;
+ }
- let {
- count,
- Message,
- data
- } = res.data;
- if (count == 1) {
- uni.showModal({
- title: "鎻愮ず",
- content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
- success: (res) => {
- if (res.confirm) {
- console.log("鐢ㄦ埛鐐瑰嚮纭畾");
- uni.redirectTo({
- url: "/pages/JIAOYAN/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2?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}`,
- });
- }
- },
- addNew() {
- uni.redirectTo({
- url: "/pages/ZLGL/shoujianjianyan/firstCheckBillList?operationType=1",
- });
- },
- goBack() {
- uni.navigateBack();
- },
- async RoadBillMain() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBill_Edit",
- data: {
- sWhere: ` and hmainid=${this.hform.HInterID}`,
- user: getUserInfo()["Czymc"],
- },
- });
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
+ if (count == 1) {
+ uni.showModal({
+ title: "鎻愮ず",
+ content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
+ success: (res) => {
+ if (res.confirm) {
+ console.log("鐢ㄦ埛鐐瑰嚮纭畾");
+ uni.redirectTo({
+ url: "/pages/JIAOYAN/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2?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}`,
+ });
+ }
+ },
+ addNew() {
+ uni.redirectTo({
+ url: "/pages/ZLGL/shoujianjianyan/firstCheckBillList?operationType=1",
+ });
+ },
+ goBack() {
+ uni.navigateBack();
+ },
+ async RoadBillMain() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBill_Edit",
+ data: {
+ sWhere: ` and hmainid=${this.hform.HInterID}`,
+ user: getUserInfo()["Czymc"],
+ },
+ });
- let {
- data,
- count,
- Message
- } = res.data;
+ let {
+ data,
+ count,
+ Message
+ } = res.data;
- if (count == 1) {
- console.log("RoadBillMain: : ", data);
- Object.assign(this.hform, {
- HInterID: data[0].hmainid,
- HBillNo: data[0].鍗曟嵁鍙�,
- HDate: dayjs(data[0].鏃ユ湡).format("YYYY-MM-DD"),
- HSourceID: data[0].HSourceID,
- HSourceName: data[0].鐢熶骇璧勬簮鍚嶇О,
- HICMOBillNo: data[0].浠诲姟鍗曞彿,
- HICMOQty: data[0].浠诲姟鍗曟暟閲�,
- HICMOInterID: data[0].HICMOInterID,
- HICMOEntryID: data[0].HICMOEntryID || 1,
- HMaterID: data[0].HMaterID,
- HMaterName: data[0].鐗╂枡鍚嶇О,
- HMaterNumber: data[0].鐗╂枡浠ｇ爜,
- HProcID: data[0].HProcID,
- HProcName: data[0].HProcName,
- HProcExchQty: data[0].HProcExchQty || 0,
- HProcExchBillNo: data[0].HProcExchBillNo,
- HProcExchInterID: data[0].HProcExchInterID,
- HProcExchEntryID: data[0].HProcExchEntryID || 0,
- HFirstCheckEmp: data[0].HFirstCheckEmp,
- HFirstCheckEmpName: data[0].璐ㄦ鍛樺悕绉�,
- HQCSchemeID: data[0].妫�楠屾柟妗圛D,
- HQCSchemeName: data[0].妫�楠屾柟妗堝悕绉�,
- HRemark: data[0].琛ㄥご澶囨敞,
- HMaker: data[0].鍒跺崟浜�,
- HMakeDate: data[0].鍒跺崟鏃ユ湡,
- HChecker: data[0].瀹℃牳浜�,
- HCheckDate: data[0].瀹℃牳鏃ユ湡,
- HCloseMan: data[0].鍏抽棴浜�,
- HCloseDate: data[0].鍏抽棴鏃ユ湡,
- HUpDateDate: data[0].淇敼鏃ユ湡,
- HDeleteDate: data[0].浣滃簾鏃ユ湡,
- HSampleSchemeID: data[0].HSampleSchemeID,
- HSampleSchemeName: data[0].鎶芥牱鏂规鍚嶇О,
- HSampleQty: data[0].鏍锋湰閲�,
- HSampleQty2: data[0].鏍锋湰閲�,
- HSampleDamageQty: data[0].鏍锋湰鐮村潖鏁�,
- HSamplingType: data[0].鎶芥牱绫诲瀷,
- HAcceptQty: data[0].鍏佽鏁�,
- HInspectionLevel: data[0].妫�楠屾按骞�,
- HRejectQty: data[0].鎷掔粷鏁�,
- HStrictness: data[0].涓ユ牸搴�,
- HSampleUnRightQty: data[0].鏍锋湰涓嶅悎鏍兼暟 || 0,
- HSampleUnRightQty2: data[0].鏍锋湰涓嶅悎鏍兼暟,
- HAQL: data[0].AQL,
- HUnitID: data[0].HUnitID,
- HUnit: data[0].鍗曚綅,
- HInspectValB: data[0].妫�娴嬪�煎熀纭�璧勬枡,
- HInspectVal: data[0].妫�娴嬪��,
- HTargetValB: data[0].鐩爣鍊煎熀纭�璧勬枡,
- HTargetVal: data[0].鐩爣鍊�,
- HUpLimit: data[0].涓婇檺鍊�,
- HDownLimit: data[0].涓嬮檺鍊�,
- HUpOffSet: data[0].涓婂亸宸�,
- HDownOffSet: data[0].涓嬪亸宸�,
- HEntryID: data[0].hsubid,
- HQCCheckItemName: data[0].妫�楠岄」鐩悕绉�,
- HQCCheckItemID: data[0].HQCCheckItemID,
- HShiftsID: data[0].HShiftsID,
- HShiftsName: data[0].鐝鍚嶇О,
- HErrTreatment: data[0].寮傚父涓存椂澶勭悊鏂规,
- HBatchNo: data[0].鎵瑰彿,
- HLastResult: data[0].鍒ゅ畾缁撹 == "鍚堟牸" ? true : false,
- HTakeSampleCheckBillID: data[0].HTakeSampleCheckBillID,
- HTakeSampleCheckBillNo: data[0].HTakeSampleCheckBillNo,
- HAnalysisMethod: function() {
- if (data[0].HAnalysisMethod == 1) {
- return '瀹氭�ф楠�'
- } else if (data[0].HAnalysisMethod == 2) {
- return '瀹氶噺妫�楠�'
- } else {
- return '鍏朵粬妫�楠�'
- }
- }(),
+ if (count == 1) {
+ console.log("RoadBillMain: : ", data);
+ Object.assign(this.hform, {
+ HInterID: data[0].hmainid,
+ HBillNo: data[0].鍗曟嵁鍙�,
+ HDate: dayjs(data[0].鏃ユ湡).format("YYYY-MM-DD"),
+ HSourceID: data[0].HSourceID,
+ HSourceName: data[0].鐢熶骇璧勬簮鍚嶇О,
+ HICMOBillNo: data[0].浠诲姟鍗曞彿,
+ HICMOQty: data[0].浠诲姟鍗曟暟閲�,
+ HICMOInterID: data[0].HICMOInterID,
+ HICMOEntryID: data[0].HICMOEntryID || 1,
+ HMaterID: data[0].HMaterID,
+ HMaterName: data[0].鐗╂枡鍚嶇О,
+ HMaterNumber: data[0].鐗╂枡浠ｇ爜,
+ HProcID: data[0].HProcID,
+ HProcName: data[0].HProcName,
+ HProcExchQty: data[0].HProcExchQty || 0,
+ HProcExchBillNo: data[0].HProcExchBillNo,
+ HProcExchInterID: data[0].HProcExchInterID,
+ HProcExchEntryID: data[0].HProcExchEntryID || 0,
+ HFirstCheckEmp: data[0].HFirstCheckEmp,
+ HFirstCheckEmpName: data[0].璐ㄦ鍛樺悕绉�,
+ HQCSchemeID: data[0].妫�楠屾柟妗圛D,
+ HQCSchemeName: data[0].妫�楠屾柟妗堝悕绉�,
+ HRemark: data[0].琛ㄥご澶囨敞,
+ HMaker: data[0].鍒跺崟浜�,
+ HMakeDate: data[0].鍒跺崟鏃ユ湡,
+ HChecker: data[0].瀹℃牳浜�,
+ HCheckDate: data[0].瀹℃牳鏃ユ湡,
+ HCloseMan: data[0].鍏抽棴浜�,
+ HCloseDate: data[0].鍏抽棴鏃ユ湡,
+ HUpDateDate: data[0].淇敼鏃ユ湡,
+ HDeleteDate: data[0].浣滃簾鏃ユ湡,
+ HSampleSchemeID: data[0].HSampleSchemeID,
+ HSampleSchemeName: data[0].鎶芥牱鏂规鍚嶇О,
+ HSampleQty: data[0].鏍锋湰閲�,
+ HSampleQty2: data[0].鏍锋湰閲�,
+ HSampleDamageQty: data[0].鏍锋湰鐮村潖鏁�,
+ HSamplingType: data[0].鎶芥牱绫诲瀷,
+ HAcceptQty: data[0].鍏佽鏁�,
+ HInspectionLevel: data[0].妫�楠屾按骞�,
+ HRejectQty: data[0].鎷掔粷鏁�,
+ HStrictness: data[0].涓ユ牸搴�,
+ HSampleUnRightQty: data[0].鏍锋湰涓嶅悎鏍兼暟 || 0,
+ HSampleUnRightQty2: data[0].鏍锋湰涓嶅悎鏍兼暟,
+ HAQL: data[0].AQL,
+ HUnitID: data[0].HUnitID,
+ HUnit: data[0].鍗曚綅,
+ HInspectValB: data[0].妫�娴嬪�煎熀纭�璧勬枡,
+ HInspectVal: data[0].妫�娴嬪��,
+ HTargetValB: data[0].鐩爣鍊煎熀纭�璧勬枡,
+ HTargetVal: data[0].鐩爣鍊�,
+ HUpLimit: data[0].涓婇檺鍊�,
+ HDownLimit: data[0].涓嬮檺鍊�,
+ HUpOffSet: data[0].涓婂亸宸�,
+ HDownOffSet: data[0].涓嬪亸宸�,
+ HEntryID: data[0].hsubid,
+ HQCCheckItemName: data[0].妫�楠岄」鐩悕绉�,
+ HQCCheckItemID: data[0].HQCCheckItemID,
+ HShiftsID: data[0].HShiftsID,
+ HShiftsName: data[0].鐝鍚嶇О,
+ HErrTreatment: data[0].寮傚父涓存椂澶勭悊鏂规,
+ HBatchNo: data[0].鎵瑰彿,
+ HLastResult: data[0].鍒ゅ畾缁撹 == "鍚堟牸" ? true : false,
+ HTakeSampleCheckBillID: data[0].HTakeSampleCheckBillID,
+ HTakeSampleCheckBillNo: data[0].HTakeSampleCheckBillNo,
+ HAnalysisMethod: function() {
+ if (data[0].HAnalysisMethod == 1) {
+ return '瀹氭�ф楠�'
+ } else if (data[0].HAnalysisMethod == 2) {
+ return '瀹氶噺妫�楠�'
+ } else {
+ return '鍏朵粬妫�楠�'
+ }
+ }(),
- });
+ });
- for (let i = 0; i < data.length; i++) {
- this.addCheckItem({
- HQCCheckItemID: data[i].HQCCheckItemID,
- HQCCheckItemNumber: data[i].妫�楠岄」鐩唬鐮�,
- HQCCheckItemName: data[i].妫�楠岄」鐩悕绉�,
- HInspectInstruMentID: data[i].HInspectInstruMentID,
- HInspectInstruMentNumber: data[i].妫�楠屼华鍣ㄤ唬鐮�,
- HInspectInstruMentName: data[i].妫�楠屼华鍣ㄥ悕绉�,
- HQCStd: data[i].妫�楠屾爣鍑�,
- HUnit: data[i].鍗曚綅鍚嶇О,
- HQCNote: data[i].妫�楠岃褰�,
- HResult: data[i].缁撹 == "鍚堟牸" ? 1 : 0,
- HMax: data[i].鏈�澶у��,
- HMin: data[i].鏈�灏忓��,
- HAvg: data[i].骞冲潎鍊�,
- HRemark: data[i].琛ㄤ綋澶囨敞,
- HAnalysisMethod: data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ?
- 1 : data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ?
- 2 : 3,
- HKeyInspect: data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
- HSampleSchemeID: data[i].HSampleSchemeID,
- HUnitID: data[i].HUnitID,
- HInspectVal: data[i].妫�娴嬪��,
- HTargetVal: data[i].鐩爣鍊�,
- HUpLimit: data[i].涓婇檺鍊�,
- HDownLimit: data[i].涓嬮檺鍊�,
- HUpOffSet: data[i].涓婂亸宸�,
- HDownOffSet: data[i].涓嬪亸宸�,
- HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
- HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
- HSampleQty: data[i].鏍锋湰閲�,
- HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
- HAcceptQty: data[i].鍏佽鏁�,
- HInspectionLevel: 0,
- HRejectQty: data[i].鎷掔粷鏁�,
- HStrictness: 0,
- HSampleUnRightQty: data[i].鏍锋湰涓嶅悎鏍兼暟,
- HAQL: data[i].AQL,
- HSamplingType: 0,
- HSamplingType: data[i].鎶芥牱绫诲瀷,
- HStrictness: data[i].涓ユ牸搴�,
- HInspectResultToSee: data[i].妫�楠岀粨鏋�
- });
+ for (let i = 0; i < data.length; i++) {
+ this.addCheckItem({
+ HQCCheckItemID: data[i].HQCCheckItemID,
+ HQCCheckItemNumber: data[i].妫�楠岄」鐩唬鐮�,
+ HQCCheckItemName: data[i].妫�楠岄」鐩悕绉�,
+ HInspectInstruMentID: data[i].HInspectInstruMentID,
+ HInspectInstruMentNumber: data[i].妫�楠屼华鍣ㄤ唬鐮�,
+ HInspectInstruMentName: data[i].妫�楠屼华鍣ㄥ悕绉�,
+ HQCStd: data[i].妫�楠屾爣鍑�,
+ HUnit: data[i].鍗曚綅鍚嶇О,
+ HQCNote: data[i].妫�楠岃褰�,
+ HResult: data[i].缁撹 == "鍚堟牸" ? 1 : 0,
+ HMax: data[i].鏈�澶у��,
+ HMin: data[i].鏈�灏忓��,
+ HAvg: data[i].骞冲潎鍊�,
+ HRemark: data[i].琛ㄤ綋澶囨敞,
+ HAnalysisMethod: data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ?
+ 1 : data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ?
+ 2 : 3,
+ HKeyInspect: data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
+ HSampleSchemeID: data[i].HSampleSchemeID,
+ HUnitID: data[i].HUnitID,
+ HInspectVal: data[i].妫�娴嬪��,
+ HTargetVal: data[i].鐩爣鍊�,
+ HUpLimit: data[i].涓婇檺鍊�,
+ HDownLimit: data[i].涓嬮檺鍊�,
+ HUpOffSet: data[i].涓婂亸宸�,
+ HDownOffSet: data[i].涓嬪亸宸�,
+ HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
+ HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
+ HSampleQty: data[i].鏍锋湰閲�,
+ HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
+ HAcceptQty: data[i].鍏佽鏁�,
+ HInspectionLevel: 0,
+ HRejectQty: data[i].鎷掔粷鏁�,
+ HStrictness: 0,
+ HSampleUnRightQty: data[i].鏍锋湰涓嶅悎鏍兼暟,
+ HAQL: data[i].AQL,
+ HSamplingType: 0,
+ HSamplingType: data[i].鎶芥牱绫诲瀷,
+ HStrictness: data[i].涓ユ牸搴�,
+ HInspectResultToSee: data[i].妫�楠岀粨鏋�
+ });
- }
+ }
- this.hasSourceBill = true
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍔犺浇鍗曟嵁澶辫触: ${Message}`,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍔犺浇鍗曟嵁澶辫触: ${err}`,
- });
- }
- },
- },
- async onLoad(e) {
- this.operationType = e.operationType || 1;
- this.hform.HInterID = e.linterid || 0;
- if (this.operationType == 1) {
- await this.getMaxBillNo();
- } else if (this.operationType == 2) {
+ this.hasSourceBill = true
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍔犺浇鍗曟嵁澶辫触: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍔犺浇鍗曟嵁澶辫触: ${err}`,
+ });
+ }
+ },
+ },
+ async onLoad(e) {
+ this.operationType = e.operationType || 1;
+ this.hform.HInterID = e.linterid || 0;
+ if (this.operationType == 1) {
+ await this.getMaxBillNo();
+ } else if (this.operationType == 2) {
- } else if (this.operationType == 3) {
- await this.RoadBillMain();
- }
+ } else if (this.operationType == 3) {
+ await this.RoadBillMain();
+ }
- await this.InitHSource();
- await this.InitHWorkShift();
- await this.InitHEmp();
- },
- };
+ await this.InitHSource();
+ await this.InitHWorkShift();
+ await this.InitHEmp();
+ },
+ };
</script>
<style lang="scss" scoped>
- input {
- width: inherit;
- font-size: 26rpx;
- }
+ input {
+ width: inherit;
+ font-size: 26rpx;
+ }
- .uni-input {
- padding: 0;
- }
+ .uni-input {
+ padding: 0;
+ }
- .bill-main-tabs,
- .bill-sub-tabs {
- box-sizing: border-box;
- width: 730rpx;
- display: flex;
- flex-direction: row;
- flex-wrap: nowrap;
- gap: 20rpx;
- flex-shrink: 0;
- overflow-x: auto;
- border-bottom: 1px solid #ddd;
- padding: 20rpx 10rpx;
- white-space: nowrap;
+ .bill-main-tabs,
+ .bill-sub-tabs {
+ box-sizing: border-box;
+ width: 730rpx;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: nowrap;
+ gap: 20rpx;
+ flex-shrink: 0;
+ overflow-x: auto;
+ border-bottom: 1px solid #ddd;
+ padding: 20rpx 10rpx;
+ white-space: nowrap;
- view {
- width: auto;
- font-size: 26rpx;
- color: #555;
- text-align: center;
- padding: 16rpx 0;
- }
+ view {
+ width: auto;
+ font-size: 26rpx;
+ color: #555;
+ text-align: center;
+ padding: 16rpx 0;
+ }
- .selected {
- color: #3a78ff;
- font-weight: bold;
- border-bottom: 3px solid #3a78ff;
- }
- }
+ .selected {
+ color: #3a78ff;
+ font-weight: bold;
+ border-bottom: 3px solid #3a78ff;
+ }
+ }
- .bill-main-content,
- .bill-sub-content {
- box-sizing: border-box;
- padding: 0 30rpx 0 30rpx;
- display: flex;
- flex-direction: column;
+ .bill-main-content,
+ .bill-sub-content {
+ box-sizing: border-box;
+ padding: 0 30rpx 0 30rpx;
+ display: flex;
+ flex-direction: column;
- .form-item {
- width: 100%;
- display: flex;
- align-items: center;
- font-size: 26rpx;
- padding: 6rpx 0;
+ .form-item {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ font-size: 26rpx;
+ padding: 6rpx 0;
- .left {
- width: 208rpx;
+ .left {
+ width: 208rpx;
- text {
- color: red;
- font-weight: bold;
- }
- }
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
- .right {
- // width: 450rpx;
- padding: 8rpx 20rpx;
- font-size: 26rpx;
- flex: 1;
- border-radius: 22rpx;
- border: 1px solid #acacac;
+ .right {
+ // width: 450rpx;
+ padding: 8rpx 20rpx;
+ font-size: 26rpx;
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
- .uni-combox {
- padding: 0;
- height: auto;
+ .uni-combox {
+ padding: 0;
+ height: auto;
- .uni-input-placeholder,
- .uni-input-input {
- font-size: 26rpx;
- }
- }
+ .uni-input-placeholder,
+ .uni-input-input {
+ font-size: 26rpx;
+ }
+ }
- .uni-combox::v-deep input {
- height: inherit;
- font-size: 26rpx;
- }
- }
+ .uni-combox::v-deep input {
+ height: inherit;
+ font-size: 26rpx;
+ }
+ }
- .disabled {
- border: 1px solid #e4e4e4;
- background-color: #e4e4e4;
- }
+ .disabled {
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
- .none-border {
- border: none;
- }
- }
- }
+ .none-border {
+ border: none;
+ }
+ }
+ }
- .bottom-btn {
- box-sizing: border-box;
- width: 100%;
- height: 120rpx;
- position: fixed;
- bottom: 0;
- left: 0;
- background-color: #fff;
- box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
- padding: 30rpx 40rpx 40rpx 40rpx;
- display: flex;
- flex-direction: row;
- gap: 10rpx;
+ .bottom-btn {
+ box-sizing: border-box;
+ width: 100%;
+ height: 120rpx;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ background-color: #fff;
+ box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+ padding: 30rpx 40rpx 40rpx 40rpx;
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
- button {
- border-radius: 50rpx;
- width: 180rpx;
- height: 66rpx;
- line-height: 66rpx;
- font-size: 28rpx;
- }
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
- .btn-a {
- background-color: #3a78ff;
- color: #fff;
- }
+ .btn-a {
+ background-color: #3a78ff;
+ color: #fff;
+ }
- .btn-b {
- background-color: #41a863;
- color: #fff;
- }
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
- .btn-c {
- background-color: #acacac;
- color: #fff;
- // position: absolute;
- // right: 120rpx;
- }
+ .btn-c {
+ background-color: #acacac;
+ color: #fff;
+ // position: absolute;
+ // right: 120rpx;
+ }
- .btn-d {
- background-color: #ff8901;
- color: #fff;
- }
- }
+ .btn-d {
+ background-color: #ff8901;
+ color: #fff;
+ }
+ }
- .buttons {
- box-sizing: border-box;
- width: 100%;
- display: flex;
- justify-content: center;
- padding: 10rpx 0;
+ .buttons {
+ box-sizing: border-box;
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ padding: 10rpx 0;
- button {
- border-radius: 50rpx;
- width: 180rpx;
- height: 66rpx;
- line-height: 66rpx;
- font-size: 26rpx;
- }
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 26rpx;
+ }
- .btn-a {
- background-color: #acacac;
- color: #fff;
- }
+ .btn-a {
+ background-color: #acacac;
+ color: #fff;
+ }
- .btn-b {
- background-color: #41a863;
- color: #fff;
- }
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
- .btn-c {
- background-color: #3a78ff;
- color: #fff;
- }
- }
+ .btn-c {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
- .list {
- width: 100%;
+ .list {
+ width: 100%;
- .card-detail {
- width: 100%;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
- align-items: center;
- line-height: 120%;
- gap: 10rpx 0;
+ .card-detail {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ align-items: center;
+ line-height: 120%;
+ gap: 10rpx 0;
- input {
- font-size: 26rpx;
- }
+ input {
+ font-size: 26rpx;
+ }
- .detail {
- // width: 50%;
- box-sizing: border-box;
- font-size: 26rpx;
- color: #555;
- padding-right: 20rpx;
+ .detail {
+ // width: 50%;
+ box-sizing: border-box;
+ font-size: 26rpx;
+ color: #555;
+ padding-right: 20rpx;
- text {
- color: #999;
- font-size: 26rpx;
- }
- }
+ text {
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
- .editable {
- width: 50%;
- display: inline-flex;
- flex-direction: row;
- align-items: center;
+ .editable {
+ width: 50%;
+ display: inline-flex;
+ flex-direction: row;
+ align-items: center;
- text {
- flex-shrink: 0;
- }
+ text {
+ flex-shrink: 0;
+ }
.editable-input {
border: 1px solid #acacac;
@@ -2236,57 +2239,57 @@
}
}
- .icon-wrapper {
- background-color: #3a78ff;
- border-radius: 100%;
- width: 40rpx;
- height: 40rpx;
- display: flex;
- justify-content: center;
- align-items: center;
- flex-shrink: 0;
+ .icon-wrapper {
+ background-color: #3a78ff;
+ border-radius: 100%;
+ width: 40rpx;
+ height: 40rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-shrink: 0;
- .uni-icons {
- color: #fff !important;
- }
- }
+ .uni-icons {
+ color: #fff !important;
+ }
+ }
- .icon-wrapper-big {
- background-color: #3a78ff;
- border-radius: 100%;
- width: 50rpx;
- height: 50rpx;
- display: flex;
- justify-content: center;
- align-items: center;
- flex-shrink: 0;
- margin-left: 20rpx;
+ .icon-wrapper-big {
+ background-color: #3a78ff;
+ border-radius: 100%;
+ width: 50rpx;
+ height: 50rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-shrink: 0;
+ margin-left: 20rpx;
- .uni-icons {
- color: #fff !important;
- }
- }
+ .uni-icons {
+ color: #fff !important;
+ }
+ }
- .more {
- color: #888;
- font-size: 22rpx;
- display: flex;
- border-top: 1px solid #eee;
- padding-top: 10rpx;
+ .more {
+ color: #888;
+ font-size: 22rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 10rpx;
- .part {
- width: 100%;
- text-align: center;
- }
- }
+ .part {
+ width: 100%;
+ text-align: center;
+ }
+ }
- .pass-background {
- background-color: #cee3f2;
- border: none;
- }
+ .pass-background {
+ background-color: #cee3f2;
+ border: none;
+ }
- .unpass-background {
- background-color: #f0d6e3;
- border: none;
- }
+ .unpass-background {
+ background-color: #f0d6e3;
+ border: none;
+ }
</style>
\ No newline at end of file
diff --git a/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill.vue b/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill.vue
index 37289d2..d4c288a 100644
--- a/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill.vue
+++ b/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill.vue
@@ -512,7 +512,8 @@
getHEmpList() {
CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
(res) => {
if (res.data.count == 1) {
diff --git a/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue b/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
index 68a3253..39ec9a8 100644
--- a/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
+++ b/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
@@ -292,6 +292,34 @@
</view>
<xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
<BillSelectorPopupVue @update="billSelectHandler" ref="billSelector" :Type="'DJ'"></BillSelectorPopupVue>
+
+ <!-- 鐢ㄤ簬杈撳叆鏍囧噯鍊� 涓婇檺鍊� 涓嬮檺鍊肩殑寮瑰嚭灞� -->
+ <uni-popup ref="inputPopup" :mask-click="false" >
+ <view class="inputPopup">
+ <view class="form-item">
+ <view class="title">鏍囧噯鍊�:</view>
+ <view class="right">
+ <input type="number" v-model="selectTechParamItem.item.HStd" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">涓婇檺鍊�:</view>
+ <view class="right">
+ <input type="number" v-model="selectTechParamItem.item.HMax" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">涓嬮檺鍊�:</view>
+ <view class="right">
+ <input type="number" v-model="selectTechParamItem.item.HMin" />
+ </view>
+ </view>
+ <view style="display: flex; flex-direction: row;">
+ <button size="mini" plain="true" type="primary" @click="inputPopupClose(1)">纭</button>
+ <button size="mini" plain="true" type="warn" @click="inputPopupClose(0)">鍙栨秷</button>
+ </view>
+ </view>
+ </uni-popup>
</view>
</template>
@@ -322,6 +350,15 @@
HBillType: '3919',
operationType: 1,
uploadOptions: {},
+
+ selectTechParamItem: {
+ index: -1,
+ item: {
+ HStd: 0,
+ HMax: 0,
+ HMin: 0
+ }
+ },
HTechParams: [], // 宸ヨ壓鍙傛暟
@@ -407,7 +444,13 @@
},
methods: {
modifyCheckValue(index, item) {
- console.log('item: ',item, 'index: ', index);
+ console.log('item: ', item, 'index: ', index);
+ this.selectTechParamItem = {
+ index,
+ item: JSON.parse(JSON.stringify(item))
+ }
+
+ this.$refs.inputPopup.open()
},
billSelectHandler(billData) {
console.log('billData: ', billData);
@@ -599,6 +642,24 @@
this.hform.HBarCode = cb
this.GetMessageByBarCode(cb)
})
+ },
+ inputPopupClose(type) {
+ if(type == 1) {
+ // 纭
+ let index = this.selectTechParamItem.index
+ let item = this.selectTechParamItem.item
+
+ this.HTechParams[index] = item
+ }
+ this.selectTechParamItem = {
+ index: -1,
+ item: {
+ HStd: 0,
+ HMax: 0,
+ HMin: 0
+ }
+ },
+ this.$refs.inputPopup.close()
},
async GetMessageByBarCode(HBarCode) {
try {
@@ -1070,5 +1131,10 @@
</script>
<style lang="scss" scoped>
- @import "@/pages/MJGL/style/MJBillStyle.scss"
+ @import "@/pages/MJGL/style/MJBillStyle.scss";
+
+ .inputPopup {
+ background-color: #fff;
+ padding: 20rpx;
+ }
</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipDotCheckTaskReport/Sb_EquipDotCheckTaskReport.vue b/pages/MJGL/Sb_EquipDotCheckTaskReport/Sb_EquipDotCheckTaskReport.vue
index b747365..c0fb52e 100644
--- a/pages/MJGL/Sb_EquipDotCheckTaskReport/Sb_EquipDotCheckTaskReport.vue
+++ b/pages/MJGL/Sb_EquipDotCheckTaskReport/Sb_EquipDotCheckTaskReport.vue
@@ -13,7 +13,12 @@
<view class="card-detail">
<view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
:key="index">
- <text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
+ <template v-if="field.ColmType == 'DateTime'">
+ <text>{{field.ColmCols}}锛�</text>{{dayjs(item[field.ColmCols]).format("YYYY-MM-DD HH:mm:ss")}}
+ </template>
+ <template v-else>
+ <text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
+ </template>
</view>
</view>
<view class="more" v-if="showDetail == index && operations != index">
@@ -35,9 +40,9 @@
<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="op3" size="mini" v-if="tabs == 0" plain @tap.stop="pushBill(0, item)">涓嬫帹娲惧伐鍗�</button>
+ <!-- <button class="op3" size="mini" v-if="tabs == 0" plain @tap.stop="pushBill(0, item)">涓嬫帹娲惧伐鍗�</button>
<button class="op3" size="mini" v-if="tabs == 1" plain @tap.stop="pushBill(1, item)">涓嬫帹缁翠慨鍗�</button>
- <button class="op3" size="mini" v-if="tabs == 2" plain @tap.stop="pushBill(2, item)">涓嬫帹楠屾敹鍗�</button>
+ <button class="op3" size="mini" v-if="tabs == 2" plain @tap.stop="pushBill(2, item)">涓嬫帹楠屾敹鍗�</button> -->
<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
</uni-card>
diff --git a/pages/MJGL/Sb_EquipRepairCheckTaskReport/Sb_EquipRepairCheckTaskReport.vue b/pages/MJGL/Sb_EquipRepairCheckTaskReport/Sb_EquipRepairCheckTaskReport.vue
index c060bd6..8e695c7 100644
--- a/pages/MJGL/Sb_EquipRepairCheckTaskReport/Sb_EquipRepairCheckTaskReport.vue
+++ b/pages/MJGL/Sb_EquipRepairCheckTaskReport/Sb_EquipRepairCheckTaskReport.vue
@@ -1,22 +1,226 @@
<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 == 2 ? 'on':''" @tap="switchTab(2)">宸查獙鏀�</view>
+ </view>
+
+ <!-- 璁惧鐐规浠诲姟鍒楄〃 -->
+ <view class="list" v-for="(item,index) in reportBillsDisplay" :key="index">
+ <uni-card :title="item.鏁呴殰鐧昏鍗曞彿" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+ <view class="card-detail">
+ <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
+ :key="index">
+ <template v-if="field.ColmType == 'DateTime'">
+ <text>{{field.ColmCols}}锛�</text>{{dayjs(item[field.ColmCols]).format('YYYY-MM-DD HH:mm:ss')}}
+ </template>
+ <template v-else>
+ <text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
+ </template>
+ </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="op3" size="mini" v-if="tabs == 0" plain @tap.stop="pushBill(0, item)">涓嬫帹娲惧伐鍗�</button>
+ <button class="op3" size="mini" v-if="tabs == 1" plain @tap.stop="pushBill(1, item)">涓嬫帹缁翠慨鍗�</button>
+ <button class="op3" size="mini" v-if="tabs == 2" plain @tap.stop="pushBill(2, item)">涓嬫帹楠屾敹鍗�</button> -->
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="reportBillsDisplay.length == 0">鏆傛棤鏁版嵁</view>
</view>
</template>
<script>
+ import {
+ getUserInfo
+ } from '../../../utils/auth';
+ import {
+ CommonUtils
+ } from '../../../utils/common';
+ import dayjs from 'dayjs';
export default {
+ // 鍣ㄥ叿鏁呴殰鐧昏璺熻釜 妯″潡
+ name: 'Sc_MouldRepairCheckTaskReport',
data() {
return {
-
- }
+ dayjs,
+ CommonUtils,
+ tabs: 0,
+ showDetail: -1,
+ operations: -1,
+
+ reportBillsDisplay: [],
+ reportBillsAwaitRepair: [], // 寰呯淮淇�
+ reportBillsRepaired: [], // 宸茬淮淇�
+ reportBillsChecked: [], // 宸查獙鏀�
+ HFieldList: [], // 瀛楁鍒楄〃
+ };
},
methods: {
-
+ pushBill(tab, item) {
+ console.log('item: ', item);
+ let Query = `&HBillNo=${item['鏁呴殰鐧昏鍗曞彿']}&HInterID=${item['HInterID']}&HSourceBillType=3907`
+ if (tab == 0) {
+ uni.navigateTo({
+ url: '/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill?operationType=4' +
+ Query
+ })
+ } else if (tab == 1) {
+ uni.navigateTo({
+ url: '/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill?operationType=5' + Query +
+ `&HSendWorkID=${item.HSendWorkID}`
+ })
+ } else if (tab == 2) {
+ uni.navigateTo({
+ url: '/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill?operationType=4' +
+ Query + `&HSendWorkID=${item.HSendWorkID}`
+ })
+ }
+ },
+ switchTab(tabIndex) {
+ this.tabs = tabIndex
+ switch (tabIndex) {
+ case 0:
+ this.reportBillsDisplay = this.reportBillsAwaitRepair;
+ break;
+ case 1:
+ this.reportBillsDisplay = this.reportBillsRepaired;
+ break;
+ case 2:
+ this.reportBillsDisplay = this.reportBillsChecked;
+ break;
+ }
+ },
+ async getRepairList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Sb_EquipRepairCheckTaskReport/RepairCheckList',
+ data: {
+ user: getUserInfo()["HEmpName"]
+ }
+ })
+
+ let {
+ count,
+ data,
+ Message,
+ list
+ } = res.data
+ if (count == 1) {
+ console.log('data: ', data);
+
+ this.reportBillsAwaitRepair = data.h_p_Sb_EquipRepairCheckTaskReport
+ this.reportBillsRepaired = data.h_p_Sb_EquipRepairCheckTaskReport1
+ this.reportBillsChecked = data.h_p_Sb_EquipRepairCheckTaskReport2
+
+ let fieldList = CommonUtils.fieldListFilterRole({
+ ExcludeKeys: ['鏁呴殰鐧昏鍗曞彿'],
+ FieldList: list
+ })
+
+ if (fieldList.status == false) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇琛ㄥ崟缁撴瀯澶辫触: ${fieldList.Message}`
+ })
+ }
+
+ this.HFieldList = fieldList.data
+
+ this.switchTab(0)
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鏁呴殰鐧昏鍗曞紓甯�: ${Message}`
+ })
+ }
+
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鏁呴殰鐧昏鍗曞紓甯�: ${err}`
+ })
+ }
+ }
+ },
+ onShow() {
+ this.getRepairList()
}
}
</script>
-<style>
+<style lang="scss">
+ @import "@/pages/MJGL/style/MJBillStyle.scss";
-</style>
+ .more {
+ color: #888;
+ font-size: 26rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: 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>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue b/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue
index e4bd830..ffffe2a 100644
--- a/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue
+++ b/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue
@@ -12,7 +12,12 @@
<view class="card-detail">
<view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
:key="index">
- <text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
+ <template v-if="field.ColmType == 'DateTime'">
+ <text>{{field.ColmCols}}锛�</text>{{dayjs(item[field.ColmCols]).format('YYYY-MM-DD HH:mm:ss')}}
+ </template>
+ <template v-else>
+ <text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
+ </template>
</view>
</view>
<view class="more" v-if="showDetail == index && operations != index">
diff --git a/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue b/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
index 517724b..ed70cdf 100644
--- a/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
+++ b/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
@@ -453,6 +453,7 @@
data: {
Employee: '',
HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
}
})
let {
diff --git a/pages/MJGL/Sc_MouldDotCheckTaskReport/Sc_MouldDotCheckTaskReport.vue b/pages/MJGL/Sc_MouldDotCheckTaskReport/Sc_MouldDotCheckTaskReport.vue
index c04bbbe..0fc9e54 100644
--- a/pages/MJGL/Sc_MouldDotCheckTaskReport/Sc_MouldDotCheckTaskReport.vue
+++ b/pages/MJGL/Sc_MouldDotCheckTaskReport/Sc_MouldDotCheckTaskReport.vue
@@ -13,7 +13,12 @@
<view class="card-detail">
<view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
:key="index">
- <text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
+ <template v-if="field.ColmType == 'DateTime'">
+ <text>{{field.ColmCols}}锛�</text>{{dayjs(item[field.ColmCols]).format("YYYY-MM-DD HH:mm:ss")}}
+ </template>
+ <template v-else>
+ <text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
+ </template>
</view>
</view>
<view class="more" v-if="showDetail == index && operations != index">
diff --git a/pages/MJGL/Sc_MouldRepairCheckTaskReport/Sc_MouldRepairCheckTaskReport.vue b/pages/MJGL/Sc_MouldRepairCheckTaskReport/Sc_MouldRepairCheckTaskReport.vue
index c060bd6..2d2a0e7 100644
--- a/pages/MJGL/Sc_MouldRepairCheckTaskReport/Sc_MouldRepairCheckTaskReport.vue
+++ b/pages/MJGL/Sc_MouldRepairCheckTaskReport/Sc_MouldRepairCheckTaskReport.vue
@@ -1,22 +1,226 @@
<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 == 2 ? 'on':''" @tap="switchTab(2)">宸查獙鏀�</view>
+ </view>
+
+ <!-- 璁惧鐐规浠诲姟鍒楄〃 -->
+ <view class="list" v-for="(item,index) in reportBillsDisplay" :key="index">
+ <uni-card :title="item.鏁呴殰鐧昏鍗曞彿" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+ <view class="card-detail">
+ <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
+ :key="index">
+ <template v-if="field.ColmType == 'DateTime'">
+ <text>{{field.ColmCols}}锛�</text>{{dayjs(item[field.ColmCols]).format('YYYY-MM-DD HH:mm:ss')}}
+ </template>
+ <template v-else>
+ <text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
+ </template>
+ </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="op3" size="mini" v-if="tabs == 0" plain @tap.stop="pushBill(0, item)">涓嬫帹娲惧伐鍗�</button>
+ <button class="op3" size="mini" v-if="tabs == 1" plain @tap.stop="pushBill(1, item)">涓嬫帹缁翠慨鍗�</button>
+ <button class="op3" size="mini" v-if="tabs == 2" plain @tap.stop="pushBill(2, item)">涓嬫帹楠屾敹鍗�</button> -->
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="reportBillsDisplay.length == 0">鏆傛棤鏁版嵁</view>
</view>
</template>
<script>
+ import {
+ getUserInfo
+ } from '../../../utils/auth';
+ import {
+ CommonUtils
+ } from '../../../utils/common';
+ import dayjs from 'dayjs';
export default {
+ // 鍣ㄥ叿鏁呴殰鐧昏璺熻釜 妯″潡
+ name: 'Sc_MouldRepairCheckTaskReport',
data() {
return {
-
- }
+ dayjs,
+ CommonUtils,
+ tabs: 0,
+ showDetail: -1,
+ operations: -1,
+
+ reportBillsDisplay: [],
+ reportBillsAwaitRepair: [], // 寰呯淮淇�
+ reportBillsRepaired: [], // 宸茬淮淇�
+ reportBillsChecked: [], // 宸查獙鏀�
+ HFieldList: [], // 瀛楁鍒楄〃
+ };
},
methods: {
-
+ pushBill(tab, item) {
+ console.log('item: ', item);
+ let Query = `&HBillNo=${item['鏁呴殰鐧昏鍗曞彿']}&HInterID=${item['HInterID']}&HSourceBillType=3907`
+ if (tab == 0) {
+ uni.navigateTo({
+ url: '/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill?operationType=4' +
+ Query
+ })
+ } else if (tab == 1) {
+ uni.navigateTo({
+ url: '/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill?operationType=5' + Query +
+ `&HSendWorkID=${item.HSendWorkID}`
+ })
+ } else if (tab == 2) {
+ uni.navigateTo({
+ url: '/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill?operationType=4' +
+ Query + `&HSendWorkID=${item.HSendWorkID}`
+ })
+ }
+ },
+ switchTab(tabIndex) {
+ this.tabs = tabIndex
+ switch (tabIndex) {
+ case 0:
+ this.reportBillsDisplay = this.reportBillsAwaitRepair;
+ break;
+ case 1:
+ this.reportBillsDisplay = this.reportBillsRepaired;
+ break;
+ case 2:
+ this.reportBillsDisplay = this.reportBillsChecked;
+ break;
+ }
+ },
+ async getRepairList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Sc_MouldRepairCheckTaskReport/RepairCheckList',
+ data: {
+ user: getUserInfo()["HEmpName"]
+ }
+ })
+
+ let {
+ count,
+ data,
+ Message,
+ list
+ } = res.data
+ if (count == 1) {
+ console.log('data: ', data);
+
+ this.reportBillsAwaitRepair = data.h_p_Sc_MouldRepairCheckTaskReport
+ this.reportBillsRepaired = data.h_p_Sc_MouldRepairCheckTaskReport1
+ this.reportBillsChecked = data.h_p_Sc_MouldRepairCheckTaskReport2
+
+ let fieldList = CommonUtils.fieldListFilterRole({
+ ExcludeKeys: ['鏁呴殰鐧昏鍗曞彿'],
+ FieldList: list
+ })
+
+ if (fieldList.status == false) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇琛ㄥ崟缁撴瀯澶辫触: ${fieldList.Message}`
+ })
+ }
+
+ this.HFieldList = fieldList.data
+
+ this.switchTab(0)
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鏁呴殰鐧昏鍗曞紓甯�: ${Message}`
+ })
+ }
+
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇鏁呴殰鐧昏鍗曞紓甯�: ${err}`
+ })
+ }
+ }
+ },
+ onShow() {
+ this.getRepairList()
}
}
</script>
-<style>
+<style lang="scss">
+ @import "@/pages/MJGL/style/MJBillStyle.scss";
-</style>
+ .more {
+ color: #888;
+ font-size: 26rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: 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>
\ No newline at end of file
diff --git a/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue b/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue
index de29416..e751e90 100644
--- a/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue
+++ b/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue
@@ -13,7 +13,12 @@
<view class="card-detail">
<view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
:key="index">
- <text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
+ <template v-if="field.ColmType == 'DateTime'">
+ <text>{{ field.ColmCols }}锛�</text>{{dayjs(item[field.ColmCols]).format('YYYY-MM-DD HH:mm:ss')}}
+ </template>
+ <template v-else>
+ <text>{{ field.ColmCols }}锛�</text>{{item[field.ColmCols]}}
+ </template>
</view>
</view>
<view class="more" v-if="showDetail == index && operations != index">
diff --git a/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue b/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
index a5f50be..2737e7a 100644
--- a/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
+++ b/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
@@ -661,6 +661,7 @@
data: {
Employee: '',
HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
}
})
let {
diff --git a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
index 80f9ae8..cda482c 100644
--- a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
+++ b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
@@ -548,7 +548,8 @@
getHEmpList() {
CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
(res) => {
if (res.data.count == 1) {
diff --git a/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue b/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
index be6402d..9801f8d 100644
--- a/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
+++ b/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
@@ -528,7 +528,8 @@
getHEmpList() {
CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
(res) => {
if (res.data.count == 1) {
diff --git a/pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBill.vue b/pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBill.vue
index 8aeaff3..1cca73b 100644
--- a/pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBill.vue
+++ b/pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBill.vue
@@ -563,7 +563,8 @@
getHEmpList() {
CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
(res) => {
if (res.data.count == 1) {
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue
index da967e7..39db21a 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue
@@ -647,7 +647,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue
index 3598e8f..66d1b06 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue
@@ -554,7 +554,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue
index 2593f59..f9e341a 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue
@@ -576,7 +576,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue
index bebc62f..f0d4309 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue
@@ -565,7 +565,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue
index 647d145..f422f3d 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue
@@ -548,7 +548,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/ZLGL/QuYangHuangYang/QC_BackSampleCheckBill/QC_BackSampleCheckBill.vue b/pages/ZLGL/QuYangHuangYang/QC_BackSampleCheckBill/QC_BackSampleCheckBill.vue
index a0529d6..282cd82 100644
--- a/pages/ZLGL/QuYangHuangYang/QC_BackSampleCheckBill/QC_BackSampleCheckBill.vue
+++ b/pages/ZLGL/QuYangHuangYang/QC_BackSampleCheckBill/QC_BackSampleCheckBill.vue
@@ -332,7 +332,8 @@
url: '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
resFunction: (res) => {
let {
diff --git a/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue b/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
index 099c58f..219a397 100644
--- a/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
+++ b/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
@@ -368,7 +368,8 @@
url: '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
resFunction: (res) => {
let {
diff --git a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
index e2a006c..94b83f9 100644
--- a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
+++ b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
@@ -737,7 +737,7 @@
let res = await CommonUtils.doRequest2Async({
url: "/Gy_Employee/list",
data: {
- sWhere: ` and 绂佺敤鏍囪 = '' `,
+ sWhere: ` and 绂佺敤鏍囪 = '' and HDeptID = ${uni.getStorageSync("HDeptID")}`,
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
diff --git a/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBill.vue b/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBill.vue
index 8f6b8f9..84d03b8 100644
--- a/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBill.vue
+++ b/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBill.vue
@@ -954,7 +954,7 @@
data: {
sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync(
"Organization"
- )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' `,
+ )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' and HDeptID = ${uni.getStorageSync("HDeptID")}`,
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
diff --git a/pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill.vue b/pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill.vue
index cdb7f20..2a65126 100644
--- a/pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill.vue
+++ b/pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill.vue
@@ -1231,7 +1231,7 @@
data: {
sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync(
"Organization"
- )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' `,
+ )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' and HDeptID = ${uni.getStorageSync("HDeptID")}`,
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
diff --git a/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue b/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
index 69f8643..6289239 100644
--- a/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
+++ b/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
@@ -1231,7 +1231,7 @@
data: {
sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync(
"Organization"
- )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' `,
+ )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' and HDeptID = ${uni.getStorageSync("HDeptID")}`,
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
diff --git a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
index a5ac33c..2dadc29 100644
--- a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
+++ b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
@@ -713,7 +713,8 @@
url: '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
})
diff --git a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
index d69bb9f..b4f4dd9 100644
--- a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -1249,7 +1249,7 @@
let res = await CommonUtils.doRequest2Async({
url: "/Gy_Employee/list",
data: {
- sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' `,
+ sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' and HDeptID = ${uni.getStorageSync("HDeptID")}`,
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
diff --git a/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue b/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
index a0652a0..d4b95a4 100644
--- a/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
+++ b/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
@@ -1283,7 +1283,7 @@
data: {
sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync(
"Organization"
- )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !=''`,
+ )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' and HDeptID = ${uni.getStorageSync("HDeptID")}`,
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
diff --git a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
index 99c211b..f8ffbdb 100644
--- a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
+++ b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -1262,7 +1262,7 @@
let res = await CommonUtils.doRequest2Async({
url: "/Gy_Employee/list",
data: {
- sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' `,
+ sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' and HDeptID = ${uni.getStorageSync("HDeptID")}`,
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
diff --git a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
index 4ebd73e..223086d 100644
--- a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
+++ b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -957,7 +957,8 @@
let res = await CommonUtils.doRequest2Async({
url: "/Gy_Employee/list",
data: {
- sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' `,
+ sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !=''
+ and HDeptID = ${uni.getStorageSync("HDeptID")}`,
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
diff --git a/pages/baogong/AddLineBind.vue b/pages/baogong/AddLineBind.vue
index 85f14cb..a83f47f 100644
--- a/pages/baogong/AddLineBind.vue
+++ b/pages/baogong/AddLineBind.vue
@@ -147,7 +147,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
}
});
diff --git a/pages/baogong/OA_ErrMsgBackBill.vue b/pages/baogong/OA_ErrMsgBackBill.vue
index bd8928a..0620f09 100644
--- a/pages/baogong/OA_ErrMsgBackBill.vue
+++ b/pages/baogong/OA_ErrMsgBackBill.vue
@@ -658,12 +658,14 @@
// 鑾峰彇浜哄憳鍒楄〃锛堥�氱敤鏂规硶锛�
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
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/baogong/ProductReportStepBillList.vue b/pages/baogong/ProductReportStepBillList.vue
index 1008631..019cfcc 100644
--- a/pages/baogong/ProductReportStepBillList.vue
+++ b/pages/baogong/ProductReportStepBillList.vue
@@ -253,7 +253,7 @@
getHEmpList(){
uni.request({
url: this.serverUrl + '/Web/GetEmployeeList_Json',
- data: { Employee: '',HGroupID:0 },
+ data: { Employee: '',HGroupID:0 , HDeptID: uni.getStorageSync("HDeptID")},
success: (res) => {
if(res.data.count == 1){
this.HEmpNameList = res.data.data
diff --git a/pages/caigouruku/POStockInBill.vue b/pages/caigouruku/POStockInBill.vue
index 3491855..f0bdd46 100644
--- a/pages/caigouruku/POStockInBill.vue
+++ b/pages/caigouruku/POStockInBill.vue
@@ -969,7 +969,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/caigoutuiliao/POStockInBackBill.vue b/pages/caigoutuiliao/POStockInBackBill.vue
index be89c9a..959ec4c 100644
--- a/pages/caigoutuiliao/POStockInBackBill.vue
+++ b/pages/caigoutuiliao/POStockInBackBill.vue
@@ -884,7 +884,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/fenbushidiaochudan/form_out.vue b/pages/fenbushidiaochudan/form_out.vue
index f9a66cf..c9688fa 100644
--- a/pages/fenbushidiaochudan/form_out.vue
+++ b/pages/fenbushidiaochudan/form_out.vue
@@ -1504,7 +1504,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/fenbushidiaorudan/form.vue b/pages/fenbushidiaorudan/form.vue
index fb28151..9351c55 100644
--- a/pages/fenbushidiaorudan/form.vue
+++ b/pages/fenbushidiaorudan/form.vue
@@ -1278,7 +1278,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/gongxuIn/Cj_StationInBill.vue b/pages/gongxuIn/Cj_StationInBill.vue
index b2c34b6..a98b0cf 100644
--- a/pages/gongxuIn/Cj_StationInBill.vue
+++ b/pages/gongxuIn/Cj_StationInBill.vue
@@ -566,7 +566,7 @@
getHEmpList(){
uni.request({
url: this.serverUrl + '/Web/GetEmployeeList_Json',
- data: { Employee: '',HGroupID:0 },
+ data: { Employee: '',HGroupID:0, HDeptID: uni.getStorageSync("HDeptID")},
success: (res) => {
if(res.data.count == 1){
this.HEmpNameList = res.data.data
diff --git a/pages/gongxuOut/Cj_StationOutBill.vue b/pages/gongxuOut/Cj_StationOutBill.vue
index bb69a6f..1ce8c9d 100644
--- a/pages/gongxuOut/Cj_StationOutBill.vue
+++ b/pages/gongxuOut/Cj_StationOutBill.vue
@@ -1087,7 +1087,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/gongxuOut/moneystatistics.vue b/pages/gongxuOut/moneystatistics.vue
index 1e0fec2..7ed5e42 100644
--- a/pages/gongxuOut/moneystatistics.vue
+++ b/pages/gongxuOut/moneystatistics.vue
@@ -299,7 +299,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/index/login.vue b/pages/index/login.vue
index 5e84733..7f44a3b 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -163,7 +163,7 @@
// 璇诲彇璇█鍖呭苟鍔犺浇
// let languagePack = await getLanguagePackJson(lang)
// this.$i18n.setLocaleMessage(lang, languagePack)
- this.$i18n.locale = lang
+ this.$i18n.locale = lang
},
onLanguageChangeHandler(e) {
//鍔ㄦ�佽幏鍙栧悗绔殑璇█鍖呮枃浠讹紝骞跺皢璇█鍖呭簲鐢ㄥ埌鍏ㄥ眬
diff --git a/pages/index/tab1.vue b/pages/index/tab1.vue
index ee7f882..5eaf4ed 100644
--- a/pages/index/tab1.vue
+++ b/pages/index/tab1.vue
@@ -9,7 +9,8 @@
<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
+ <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>
@@ -206,7 +207,7 @@
}
this.itemData.forEach((e, index) => {
- if(MessageIdentifier.data[e.text]) {
+ if(MessageIdentifier.data[e.text] != undefined) {
this.itemData[index]["corner"] = true
this.itemData[index]["cornerCount"] = MessageIdentifier.data[e.text]
}
@@ -258,7 +259,6 @@
moduleName: menuListName
}
})
- console.log('common module: ',res);
let {
data,
count,
@@ -312,9 +312,8 @@
Array.from(data).forEach((e, index) => {
if (index < this.itemData.length) {
if (MessageIdentifier.data[this.itemData[e["HIndex"]].text]) {
- this.itemData[e["HIndex"]]["corner"] = true,
- this.itemData[e["HIndex"]]["cornerCount"] = 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])
}
}
})
diff --git a/pages/index/tab3.vue b/pages/index/tab3.vue
index bc63997..02c704f 100644
--- a/pages/index/tab3.vue
+++ b/pages/index/tab3.vue
@@ -9,7 +9,8 @@
<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" style="z-index: 99 !important;" type="error" :max-num="99" size="normal" absolute
+ <uni-badge :text="item.cornerCount" style="z-index: 99 !important;" type="error" :max-num="99" size="normal"
+ absolute="rightTop"
:offset="[7, 7]">
<image :src="item.img" mode=""></image>
</uni-badge>
@@ -91,7 +92,6 @@
},
{
"img": "../../static/icon/icon8.png",
-
"text": "妯″叿淇濆吇浠诲姟",
"url": "/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport",
"id": 25,
@@ -109,6 +109,20 @@
"text": "妯″叿缁翠慨浠诲姟",
"url": "/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport",
"id": 27,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "璁惧寰呯偣妫�浠诲姟",
+ "url": "/pages/MJGL/Sb_EquipDotCheckTaskReport/Sb_EquipDotCheckTaskReport",
+ "id": 29,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "妯″叿寰呯偣妫�浠诲姟",
+ "url": "/pages/MJGL/Sc_MouldDotCheckTaskReport/Sc_MouldDotCheckTaskReport",
+ "id": 30,
"hidden": false
},
{
@@ -249,16 +263,37 @@
},
{
"img": "../../static/icon/icon8.png",
- "text": "璁惧鐐规浠诲姟",
- "url": "/pages/MJGL/Sb_EquipDotCheckTaskReport/Sb_EquipDotCheckTaskReport",
- "id": 29,
+ "text": "璁惧鏁呴殰鐧昏璺熻釜",
+ "url": "/pages/MJGL/Sb_EquipRepairCheckTaskReport/Sb_EquipRepairCheckTaskReport",
+ "id": 31,
"hidden": false
},
{
"img": "../../static/icon/icon8.png",
- "text": "鍣ㄥ叿鐐规浠诲姟",
- "url": "/pages/MJGL/Sc_MouldDotCheckTaskReport/Sc_MouldDotCheckTaskReport",
- "id": 30,
+ "text": "妯″叿鏁呴殰鐧昏璺熻釜",
+ "url": "/pages/MJGL/Sc_MouldRepairCheckTaskReport/Sc_MouldRepairCheckTaskReport",
+ "id": 32,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "寰呬笂妯℃煡璇�",
+ "url": "/pages/MJGL/Sc_MouldUpperAwaitQuery/Sc_MouldUpperAwaitQuery",
+ "id": 33,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "寰呭紑宸ユ煡璇�",
+ "url": "/pages/Cj_StationInBillAwaitQuery/Cj_StationInBillAwaitQuery",
+ "id": 34,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "寰呬笅妯℃煡璇�",
+ "url": "/pages/MJGL/Sc_MouldLowerBillAwaitQuery/Sc_MouldLowerBillAwaitQuery",
+ "id": 35,
"hidden": false
}
]
@@ -278,9 +313,8 @@
return
}
-
this.itemData.forEach((e, index) => {
- if (MessageIdentifier.data[e.text]) {
+ if (MessageIdentifier.data[e.text] != undefined) {
this.itemData[index]["corner"] = true
this.itemData[index]["cornerCount"] = MessageIdentifier.data[e.text]
}
@@ -319,9 +353,10 @@
Array.from(data).forEach((e, index) => {
if (index < this.itemData.length) {
if (MessageIdentifier.data[this.itemData[e["HIndex"]].text]) {
- this.itemData[e["HIndex"]]["corner"] = true,
- this.itemData[e["HIndex"]]["cornerCount"] = MessageIdentifier.data[this
- .itemData[e["HIndex"]].text]
+ // 浣跨敤$set 娣诲姞鍝嶅簲寮忔暟鎹�
+ this.$set(this.itemData[e["HIndex"]], "corner", true)
+ this.$set(this.itemData[e["HIndex"]], "cornerCount", MessageIdentifier.data[this.itemData[e["HIndex"]].text])
+
}
}
})
@@ -338,7 +373,6 @@
moduleName: menuListName
}
})
- console.log('common module: ', res);
let {
data,
count,
diff --git a/pages/qitachuku/qitachukudan.vue b/pages/qitachuku/qitachukudan.vue
index d4c09e5..bae7ba2 100644
--- a/pages/qitachuku/qitachukudan.vue
+++ b/pages/qitachuku/qitachukudan.vue
@@ -993,7 +993,8 @@
getHEmpList() {
CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
(res) => {
if (res.data.count == 1) {
diff --git a/pages/qitachuku_v2/OtherOutBill.vue b/pages/qitachuku_v2/OtherOutBill.vue
index bd8af71..713558e 100644
--- a/pages/qitachuku_v2/OtherOutBill.vue
+++ b/pages/qitachuku_v2/OtherOutBill.vue
@@ -980,7 +980,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/qitaruku/qitarukudan.vue b/pages/qitaruku/qitarukudan.vue
index ef21f53..9748e05 100644
--- a/pages/qitaruku/qitarukudan.vue
+++ b/pages/qitaruku/qitarukudan.vue
@@ -668,7 +668,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/qitaruku_v2/OtherInBill.vue b/pages/qitaruku_v2/OtherInBill.vue
index 0188a0f..cefc3c6 100644
--- a/pages/qitaruku_v2/OtherInBill.vue
+++ b/pages/qitaruku_v2/OtherInBill.vue
@@ -991,7 +991,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/shengchanbuliao/MateReplenishOutBill.vue b/pages/shengchanbuliao/MateReplenishOutBill.vue
index c495a63..e036d85 100644
--- a/pages/shengchanbuliao/MateReplenishOutBill.vue
+++ b/pages/shengchanbuliao/MateReplenishOutBill.vue
@@ -881,7 +881,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue b/pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue
index 70d4621..1615652 100644
--- a/pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue
+++ b/pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue
@@ -964,7 +964,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/shengchanrukushengdan/Kf_ProductInBill.vue b/pages/shengchanrukushengdan/Kf_ProductInBill.vue
index 0da6cb8..11e0023 100644
--- a/pages/shengchanrukushengdan/Kf_ProductInBill.vue
+++ b/pages/shengchanrukushengdan/Kf_ProductInBill.vue
@@ -995,7 +995,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/shengchantuiliao/MateOutBackBill.vue b/pages/shengchantuiliao/MateOutBackBill.vue
index 6b8b975..1811fbb 100644
--- a/pages/shengchantuiliao/MateOutBackBill.vue
+++ b/pages/shengchantuiliao/MateOutBackBill.vue
@@ -939,7 +939,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/shoujishouming/form.vue b/pages/shoujishouming/form.vue
index 463c353..c6df6a8 100644
--- a/pages/shoujishouming/form.vue
+++ b/pages/shoujishouming/form.vue
@@ -310,7 +310,7 @@
getHEmpList(){
uni.request({
url: this.serverUrl + '/Web/GetEmployeeList_Json',
- data: { Employee: '',HGroupID:0 },
+ data: { Employee: '',HGroupID:0, HDeptID: uni.getStorageSync("HDeptID") },
success: (res) => {
if(res.data.count == 1){
this.HEmpNameList = res.data.data
diff --git a/pages/weiwaigxIn/Cj_StationEntrustInBill.vue b/pages/weiwaigxIn/Cj_StationEntrustInBill.vue
index 9314202..d28034c 100644
--- a/pages/weiwaigxIn/Cj_StationEntrustInBill.vue
+++ b/pages/weiwaigxIn/Cj_StationEntrustInBill.vue
@@ -650,7 +650,7 @@
getHEmpList(){
uni.request({
url: this.serverUrl + '/Web/GetEmployeeList_Json',
- data: { Employee: '',HGroupID:0 },
+ data: { Employee: '',HGroupID:0, HDeptID: uni.getStorageSync("HDeptID") },
success: (res) => {
if(res.data.count == 1){
this.HEmpNameList = res.data.data
diff --git a/pages/weiwaigxOut/Cj_StationEntrustOutBill.vue b/pages/weiwaigxOut/Cj_StationEntrustOutBill.vue
index 284e082..87253e6 100644
--- a/pages/weiwaigxOut/Cj_StationEntrustOutBill.vue
+++ b/pages/weiwaigxOut/Cj_StationEntrustOutBill.vue
@@ -795,7 +795,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/weiwailingliao/Kf_EntrustOutBill.vue b/pages/weiwailingliao/Kf_EntrustOutBill.vue
index 4394a81..d7bc152 100644
--- a/pages/weiwailingliao/Kf_EntrustOutBill.vue
+++ b/pages/weiwailingliao/Kf_EntrustOutBill.vue
@@ -913,7 +913,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/weiwairuku/EntrustInBill.vue b/pages/weiwairuku/EntrustInBill.vue
index 61ae318..0f8e4b4 100644
--- a/pages/weiwairuku/EntrustInBill.vue
+++ b/pages/weiwairuku/EntrustInBill.vue
@@ -907,7 +907,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/xiaoshouchuku/SellOutBill.vue b/pages/xiaoshouchuku/SellOutBill.vue
index 725f02a..650f4b7 100644
--- a/pages/xiaoshouchuku/SellOutBill.vue
+++ b/pages/xiaoshouchuku/SellOutBill.vue
@@ -982,7 +982,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/xiaoshoutuihuo/ICStockBillMain.vue b/pages/xiaoshoutuihuo/ICStockBillMain.vue
index 952236c..4841a99 100644
--- a/pages/xiaoshoutuihuo/ICStockBillMain.vue
+++ b/pages/xiaoshoutuihuo/ICStockBillMain.vue
@@ -747,7 +747,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/pages/zhijiediaobo/MoveStockBill.vue b/pages/zhijiediaobo/MoveStockBill.vue
index d1d0cdb..d8567db 100644
--- a/pages/zhijiediaobo/MoveStockBill.vue
+++ b/pages/zhijiediaobo/MoveStockBill.vue
@@ -1524,7 +1524,8 @@
url: this.serverUrl + '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID: 0
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
},
success: (res) => {
if (res.data.count == 1) {
diff --git a/utils/WebSocketServices.js b/utils/WebSocketServices.js
index f083872..745782e 100644
--- a/utils/WebSocketServices.js
+++ b/utils/WebSocketServices.js
@@ -36,6 +36,7 @@
createConnect(userId, userName, count = 0, limit = 3) {
// 鐧诲綍寤虹珛杩炴帴鏃讹紝闇�瑕侀噸鏂拌幏鍙杊ttp鍦板潃锛屽彲鑳戒細鍙樻洿
this.wsUrl = CommonUtils.httpFormatWs();
+ //this.wsUrl = uni.getStorageSync("serverUrl") + "WebSocketHandler.ashx"
// 缂撳瓨鐢ㄦ埛淇℃伅锛堢敤浜庨噸杩烇級
this.currentUserId = userId;
this.currentUserName = userName;
diff --git a/utils/common.js b/utils/common.js
index 80c909d..25f2f50 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -501,13 +501,13 @@
httpUrl = httpUrl.substring(0, httpUrl.length - 1)
let BackSlashLast = httpUrl.lastIndexOf('/')
httpUrl = httpUrl.substring(0, BackSlashLast)
- httpUrl = "ws://" + httpUrl.split(":")[0]+":8888/ws"
+ httpUrl = "ws://" + httpUrl.split(":")[0]+":12345/ws"
}else if(httpUrl.indexOf("https://") === 0) {
httpUrl = httpUrl.replace("https://", "")
httpUrl = httpUrl.substring(0, httpUrl.length - 1)
let BackSlashLast = httpUrl.lastIndexOf('/')
httpUrl = httpUrl.substring(0, BackSlashLast)
- httpUrl = "wss://" + httpUrl.split(":")[0]+":8888/ws"
+ httpUrl = "wss://" + httpUrl.split(":")[0]+":12345/ws"
}else{
// 鎻愮ず浼犲叆杩炴帴閿欒
}
--
Gitblit v1.9.1