From b0bffe34022a062856ca9fedefeaa5ced90e7327 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期日, 25 一月 2026 16:40:40 +0800
Subject: [PATCH] 页面优化

---
 pages.json                                                                     |   14 
 pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue   |   65 +
 pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue                       | 1999 +++++++++++++++++++++++-----------------------
 pages/MJGL/shangmudan/MouldUpperBill.vue                                       |  201 +---
 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue   |   36 
 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue |   34 
 pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss                             |   37 
 pages/ZLGL/mojianjianyan/ProcessCheckBill.vue                                  |    8 
 pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue                           |   12 
 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue     |   36 
 pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue                              |    8 
 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue       |   38 
 pages/ZLGL/shoujianjianyan/firstCheckBill.vue                                  |    8 
 13 files changed, 1,239 insertions(+), 1,257 deletions(-)

diff --git a/pages.json b/pages.json
index 64a4f5c..bcc0c8f 100644
--- a/pages.json
+++ b/pages.json
@@ -230,13 +230,13 @@
                 "enablePullDownRefresh": true
             }
         },
-        // {
-        // 	"path": "pages/baogong/OA_ErrMsgBackBill",
-        // 	"style": {
-        // 		"navigationBarTitleText": "寮傚父鍙嶉鍗�",
-        // 		"enablePullDownRefresh": false
-        // 	}
-        // },
+        {
+        	"path": "pages/baogong/OA_ErrMsgBackBill",
+        	"style": {
+        		"navigationBarTitleText": "寮傚父鍙嶉鍗�",
+        		"enablePullDownRefresh": false
+        	}
+        },
         {
             "path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBillList",
             "style": {
diff --git a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
index 0b76675..0734c9f 100644
--- a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
+++ b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
@@ -21,14 +21,14 @@
 					size="20"></uni-icons>
 			</view>
 			<view class="form-item">
-				<view class="title">浠撳簱:</view>
+				<view class="title"><text>*</text>浠撳簱:</view>
 				<view class="right">
 					<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
 						@input="HWHNameChange"></uni-combox>
 				</view>
 			</view>
 			<view class="form-item">
-				<view class="title">浠撲綅:</view>
+				<view class="title"><text>*</text>浠撲綅:</view>
 				<view class="right" v-show="showHStockPlaceName">
 					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
 						v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
@@ -38,21 +38,21 @@
 				</view>
 			</view>
 			<view class="form-item">
-				<view class="title">鍙戝嚭浜�:</view>
+				<view class="title"><text>*</text>鍙戝嚭浜�:</view>
 				<view class="right">
 					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戝嚭浜�" v-model="hform.HKeeperName"
 						@input="HScatterUserChange"></uni-combox>
 				</view>
 			</view>
 			<view class="form-item">
-				<view class="title">棰嗙敤浜�:</view>
+				<view class="title"><text>*</text>棰嗙敤浜�:</view>
 				<view class="right">
 					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)棰嗙敤浜�" v-model="hform.HSecManagerName"
 						@input="HCollectUserChange"></uni-combox>
 				</view>
 			</view>
 			<view class="form-item">
-				<view class="title">閮ㄩ棬:</view>
+				<view class="title"><text>*</text>閮ㄩ棬:</view>
 				<view class="right">
 					<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
 						@input="HDeptNameChange"></uni-combox>
@@ -502,7 +502,7 @@
 			/* #region 浠撳簱浠撲綅鑾峰彇涓嬫媺妗� */
 			getHBaseList() {
 				CommonUtils.doRequest(
-					"/Web/GetWarehouseList_Json_New", {
+					"/Web/GetWarehouseList_Json_MJ", {
 						Warehouse: "",
 						HOrgID: uni.getStorageSync('OrganizationID')
 					},
diff --git a/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue b/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
index 2dec658..4b5060a 100644
--- a/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
+++ b/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
@@ -1,1055 +1,1066 @@
 <template>
-    <view>
-        <view class="form">
-            <view class="form-item">
-                <view class="title">鏉$爜</view>
-                <view class="right" style="width: 350rpx;">
-                    <input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="getCode(hform.HBarCode)"
-                        @blur="getCode(hform.HBarCode)" />
-                </view>
-                <uni-icons type="scan"
-                    style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
-                    size="20" @click="toScanCode"></uni-icons>
-            </view>
-            <view class="form-item" @click="searchModule">
-                <view class="title">鍣ㄥ叿</view>
-                <view class="righton" style="width: 350rpx;">
-                    <input placeholder="璇烽�夋嫨鍣ㄥ叿" />
-                </view>
-                <uni-icons type="search"
-                    style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
-                    size="20"></uni-icons>
-            </view>
-            <view class="form-item">
-                <view class="title">浠撳簱:</view>
-                <view class="right">
-                    <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
-                        @input="HWHNameChange"></uni-combox>
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">浠撲綅:</view>
-                <view class="right" v-show="showHStockPlaceName">
-                    <uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
-                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
-                </view>
-                <view class="righton" v-show="!showHStockPlaceName">
-                    <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="涓嶅彲鎿嶄綔" />
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">鍙戝嚭浜�:</view>
-                <view class="right">
-                    <uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戝嚭浜�" v-model="hform.HKeeperName"
-                        @input="HScatterUserChange"></uni-combox>
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">棰嗙敤浜�:</view>
-                <view class="right">
-                    <uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)棰嗙敤浜�" v-model="hform.HSecManagerName"
-                        @input="HCollectUserChange"></uni-combox>
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">閮ㄩ棬:</view>
-                <view class="right">
-                    <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
-                        @input="HDeptNameChange"></uni-combox>
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">寰�鏉ョ被鍨�:</view>
-                <view class="right">
-                    <uni-combox :candidates="['渚涘簲鍟�','瀹㈡埛','閮ㄩ棬']" placeholder="璇烽�夋嫨绫诲瀷" v-model="hform.TypeName"
-                        @input="HSelectTypeChange"></uni-combox>
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">寰�鏉ュ崟浣�:</view>
-                <view class="right">
-                    <uni-combox :candidates="arrayHSelectType" placeholder="璇烽�夋嫨" v-model="hform.HSupName"
-                        @input="HSupNameChange"></uni-combox>
-                </view>
-            </view>
-            <view class="tabs">
-                <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">琛ㄥご淇℃伅</view>
-                <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">妯″叿淇℃伅</view>
-            </view>
-            <view v-if="tabs == 0">
-                <view class="form-item">
-                    <view class="title">鏃ユ湡:</view>
-                    <view class="right">
-                        <picker mode="date" v-model="hform.HDate" @change="HDateChange">
-                            <view class="picker-overlay"></view>
-                            <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
-                        </picker>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">婧愬崟绫诲瀷:</view>
-                    <view class="right" v-show="showHMainSourceBillType">
-                        <picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
-                            >
-                            <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
-                                placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
-                            <view class="picker-overlay"></view>
-                        </picker>
-                    </view>
-                    <view class="righton" v-show="!showHMainSourceBillType">
-                        <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
-                            placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">婧愬崟鍗曞彿:</view>
-                    <view class="right" v-show="showHSourceBillNo">
-                        <!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
+	<view>
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鏉$爜</view>
+				<view class="right" style="width: 350rpx;">
+					<input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="getCode(hform.HBarCode)"
+						@blur="getCode(hform.HBarCode)" />
+				</view>
+				<uni-icons type="scan"
+					style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+					size="20" @click="toScanCode"></uni-icons>
+			</view>
+			<view class="form-item" @click="searchModule">
+				<view class="title">鍣ㄥ叿</view>
+				<view class="righton" style="width: 350rpx;">
+					<input placeholder="璇烽�夋嫨鍣ㄥ叿" />
+				</view>
+				<uni-icons type="search"
+					style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+					size="20"></uni-icons>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>浠撳簱:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+						@input="HWHNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>浠撲綅:</view>
+				<view class="right" v-show="showHStockPlaceName">
+					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+						v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
+				</view>
+				<view class="righton" v-show="!showHStockPlaceName">
+					<input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="涓嶅彲鎿嶄綔" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>鍙戝嚭浜�:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戝嚭浜�" v-model="hform.HKeeperName"
+						@input="HScatterUserChange"></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.HSecManagerName"
+						@input="HCollectUserChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>閮ㄩ棬:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+						@input="HDeptNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>寰�鏉ョ被鍨�:</view>
+				<view class="right">
+					<uni-combox :candidates="['渚涘簲鍟�','瀹㈡埛','閮ㄩ棬']" placeholder="璇烽�夋嫨绫诲瀷" v-model="hform.TypeName"
+						@input="HSelectTypeChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>寰�鏉ュ崟浣�:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHSelectType" placeholder="璇烽�夋嫨" v-model="hform.HSupName"
+						@input="HSupNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="tabs">
+				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">琛ㄥご淇℃伅</view>
+				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">妯″叿淇℃伅</view>
+			</view>
+			<view v-if="tabs == 0">
+				<view class="form-item">
+					<view class="title">鏃ユ湡:</view>
+					<view class="right">
+						<picker mode="date" v-model="hform.HDate" @change="HDateChange">
+							<view class="picker-overlay"></view>
+							<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+						</picker>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">婧愬崟绫诲瀷:</view>
+					<view class="right" v-show="showHMainSourceBillType">
+						<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType">
+							<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+								placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+							<view class="picker-overlay"></view>
+						</picker>
+					</view>
+					<view class="righton" v-show="!showHMainSourceBillType">
+						<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+							placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">婧愬崟鍗曞彿:</view>
+					<view class="right" v-show="showHSourceBillNo">
+						<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
                             v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
-                        <input :focus="HSourceBillNoFocus" type="text" name="HSourceBillNo"
-                            v-model="hform.HSourceBillNo"  placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+						<input :focus="HSourceBillNoFocus" type="text" name="HSourceBillNo"
+							v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
 
-                    </view>
-                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
-                        <uni-icons type="search" size="20" ></uni-icons>
-                    </view>
+					</view>
+					<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+						<uni-icons type="search" size="20"></uni-icons>
+					</view>
 
-                    <view class="righton" v-show="!showHSourceBillNo">
-                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍒跺崟浜�:</view>
-                    <view class="righton">
-                        <input name="HMaker" disabled v-model="hform.HMaker" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍗曟嵁鍙�:</view>
-                    <view class="righton">
-                        <input name="HBillNo" disabled v-model="hform.HBillNo" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍗曟嵁ID:</view>
-                    <view class="righton">
-                        <input name="HInterID" disabled v-model="hform.HInterID" />
-                    </view>
-                </view>
-            </view>
-            <view v-if="tabs==1">
-                <view class="list" v-for="(item,index) in HMouldList" :key="index">
-                    <uni-card :title="item.鍣ㄥ叿鍚嶇О" style="margin: 10px;" @tap="delMater(item, $event)">
-                        <!-- 鍣ㄥ叿浠g爜浣滀负鍙偣鍑婚摼鎺� -->
-                        <view class="card-header">
-                            <text class="link-text">鍣ㄥ叿鍙凤細{{item.鍣ㄥ叿鍙穧}</text>
-                        </view>
+					<view class="righton" v-show="!showHSourceBillNo">
+						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="righton">
+						<input name="HMaker" disabled v-model="hform.HMaker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input name="HBillNo" disabled v-model="hform.HBillNo" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁ID:</view>
+					<view class="righton">
+						<input name="HInterID" disabled v-model="hform.HInterID" />
+					</view>
+				</view>
+			</view>
+			<view v-if="tabs==1">
+				<view class="list" v-for="(item,index) in HMouldList" :key="index">
+					<uni-card :title="item.鍣ㄥ叿鍚嶇О" style="margin: 10px;" @tap="delMater(item, $event)">
+						<!-- 鍣ㄥ叿浠g爜浣滀负鍙偣鍑婚摼鎺� -->
+						<view class="card-header">
+							<text class="link-text">鍣ㄥ叿鍙凤細{{item.鍣ㄥ叿鍙穧}</text>
+						</view>
 
-                        <view class="card-detail">
-                            <view class="detail">
-                                <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
-                            </view>
-                            <view class="detail">
-                                <text>鍣ㄥ叿鏉$爜锛�</text>{{item.鍣ㄥ叿鏉$爜}}
-                            </view>
-                        </view>
-                    </uni-card>
-                </view>
-                <view class="over" v-if="HMouldList.length == 0">鏆傛棤鏁版嵁</view>
-            </view>
-            <view class="bottom-btn">
-                <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-                <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
-            </view>
-        </view>
-        <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
-            :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
-        <BillListPopupMouldVue @BillSelectComplete="MouldBillHandler" ref="billListMould"></BillListPopupMouldVue>
-    </view>
+						<view class="card-detail">
+							<view class="detail">
+								<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+							</view>
+							<view class="detail">
+								<text>鍣ㄥ叿鏉$爜锛�</text>{{item.鍣ㄥ叿鏉$爜}}
+							</view>
+						</view>
+					</uni-card>
+				</view>
+				<view class="over" v-if="HMouldList.length == 0">鏆傛棤鏁版嵁</view>
+			</view>
+			<view class="bottom-btn">
+				<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+			</view>
+		</view>
+		<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
+			:HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
+		<BillListPopupMouldVue @BillSelectComplete="MouldBillHandler" ref="billListMould"></BillListPopupMouldVue>
+	</view>
 </template>
 
 <script>
-    import getDateTime from '@/utils/getdateTime.js';
-    import {
-        getUserInfo
-    } from "@/utils/auth.js";
-    import {
-        CommonUtils
-    } from '@/utils/common';
-    import BillListPopupVue from '../../../components/BillListPopup/BillListPopup.vue';
-    import BillListPopupMouldVue from '../../../components/BillListPopup/BillListPopup_Mould.vue';
+	import getDateTime from '@/utils/getdateTime.js';
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
+	import {
+		CommonUtils
+	} from '@/utils/common';
+	import BillListPopupVue from '../../../components/BillListPopup/BillListPopup.vue';
+	import BillListPopupMouldVue from '../../../components/BillListPopup/BillListPopup_Mould.vue';
 
-    export default {
-        components: {
-            BillListPopupVue,
-            BillListPopupMouldVue
-        },
-        data() {
-            return {
-                HSourceBillNoFocus: false,
-                barCodeFocus: true, //鏉$爜鍏夋爣
-                userInfo: getUserInfo(),
-                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-                tabs: 0,
-                arrayHEmpName: [],
-                HEmpNameList: [],
-                arrayHWHName: [], //浠撳簱
-                HWHNameList: [],
-                arrayHStockPlaceName: [], //浠撲綅
-                HStockPlaceNameList: [],
-                arrayHDeptName: [], //閮ㄩ棬
-                HDeptNameList: [],
-                arrayHCusName: [],//瀹㈡埛
-                HCusNameList: [],
-                arrayHSupplierName: [], //渚涘簲鍟�
-                HSuplierList: [],
-                linterid: '',
-                HBillNo: '',
-                arrayHSelectType: [], // 寰�鏉ュ崟浣嶄笅鎷夊垪琛�
-                HSelectTypeList: [], // 寰�鏉ュ崟浣嶅畬鏁存暟鎹垪琛�
-                showHStockPlaceName: true,
-                HMouldList: [],
-                isEdit: false,
+	export default {
+		components: {
+			BillListPopupVue,
+			BillListPopupMouldVue
+		},
+		data() {
+			return {
+				HSourceBillNoFocus: false,
+				barCodeFocus: true, //鏉$爜鍏夋爣
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				tabs: 0,
+				arrayHEmpName: [],
+				HEmpNameList: [],
+				arrayHWHName: [], //浠撳簱
+				HWHNameList: [],
+				arrayHStockPlaceName: [], //浠撲綅
+				HStockPlaceNameList: [],
+				arrayHDeptName: [], //閮ㄩ棬
+				HDeptNameList: [],
+				arrayHCusName: [], //瀹㈡埛
+				HCusNameList: [],
+				arrayHSupplierName: [], //渚涘簲鍟�
+				HSuplierList: [],
+				linterid: '',
+				HBillNo: '',
+				arrayHSelectType: [], // 寰�鏉ュ崟浣嶄笅鎷夊垪琛�
+				HSelectTypeList: [], // 寰�鏉ュ崟浣嶅畬鏁存暟鎹垪琛�
+				showHStockPlaceName: true,
+				HMouldList: [],
+				isEdit: false,
 
-                showHMainSourceBillType: true,
-                showHSourceBillNo: true,
-                HMainSourceBillType: uni.getStorageSync('billTypeName_3803') ? uni.getStorageSync('billTypeName_3803') :
-                    '鎵嬪伐褰曞叆',
-                arrayHMainSourceBillType: ['鎵嬪伐褰曞叆'],
-                arrayHMainSourceBillValue: ['-1'],
+				showHMainSourceBillType: true,
+				showHSourceBillNo: true,
+				HMainSourceBillType: uni.getStorageSync('billTypeName_3803') ? uni.getStorageSync('billTypeName_3803') :
+					'鎵嬪伐褰曞叆',
+				arrayHMainSourceBillType: ['鎵嬪伐褰曞叆'],
+				arrayHMainSourceBillValue: ['-1'],
 
-                hform: {
-                    HBarCode: '',
-                    HInterID: '',
-                    HBillType: 3803,
-                    HWHName: getUserInfo().HWhName,
-                    HWHID: getUserInfo().HWhID,
-                    HStockPlaceName: getUserInfo().HSPName,
-                    HStockPlaceID: getUserInfo().HSPID,
-                    
-                    HDeptName: getUserInfo().HDeptName,
-                    HDeptID: getUserInfo().HDeptID,
-                    HSecManagerID: getUserInfo().HEmpID,
-                    HSecManagerName:  getUserInfo().HEmpName,
-                    HKeeperName: getUserInfo().HKeeperName,
-                    HKeeperID: getUserInfo().HKeeperID,//鍙戞枡浜�
-                    //婧愬崟淇℃伅
-                    HMainSourceBillType: uni.getStorageSync('billType_3803') ? uni.getStorageSync('billType_3803') :
-                        3849,
-                    HSourceBillNo: '', //CGDD000200
+				hform: {
+					HBarCode: '',
+					HInterID: '',
+					HBillType: 3803,
+					HWHName: getUserInfo().HWhName,
+					HWHID: getUserInfo().HWhID,
+					HStockPlaceName: getUserInfo().HSPName,
+					HStockPlaceID: getUserInfo().HSPID,
 
-                    //寰�鏉ョ被鍨�
-                    TypeName: uni.getStorageSync('typeName_3803'),
-                    HSupName: '', // 寰�鏉ュ崟浣嶉�変腑鐨勫��
-                    HSupID: '', // 寰�鏉ュ崟浣嶅搴旂殑ID
-                    HSupTypeID: uni.getStorageSync('typeID_3803') ? uni.getStorageSync('typeID_3803') : 0,
-                    HDate: getDateTime.dateTimeStr('y-m-d'),
-                    HMaker: uni.getStorageSync('HUserName'),
+					HDeptName: getUserInfo().HDeptName,
+					HDeptID: getUserInfo().HDeptID,
+					HSecManagerID: getUserInfo().HEmpID,
+					HSecManagerName: getUserInfo().HEmpName,
+					HKeeperName: getUserInfo().HEmpName,
+					HKeeperID: getUserInfo().HEmpID, //鍙戞枡浜�
+					// HKeeperName: getUserInfo().HKeeperName,
+					// HKeeperID: getUserInfo().HKeeperID,//鍙戞枡浜�
+					//婧愬崟淇℃伅
+					HMainSourceBillType: uni.getStorageSync('billType_3803') ? uni.getStorageSync('billType_3803') : 3849,
+					HSourceBillNo: '', //CGDD000200
 
-                    HRedBlueFlag: 'false',
-                    HStockOrgName: uni.getStorageSync('Organization'),
-                    HStockOrgID: uni.getStorageSync('OrganizationID'),
-                    HStockOutOrgID: uni.getStorageSync('OrganizationID'),
-                    HBarCode_B: '',
-                    HMouldName_B: '',
-                    HMouldID_B: '',
-                    HMouldCount_B: ''
-                }
-            }
-        },
-        methods: {
-            searchModule() {
-                this.$refs['billListMould'].showPopup()
-            },
-            MouldBillHandler(mould) {
-                if (!mould.enableMultiSourceBill) {
-                    let val = mould.val[0]
-                    this.hform.HBarCode = val['鏉$爜缂栧彿']
-                    this.getCode(this.hform.HBarCode)
-                }
-                this.$refs['billListMould'].exit()
-            },
-            HSupNameChange(e) {
-                let index = this.arrayHSelectType.findIndex(el => el == e)
-                let HSupInfo = this.HSelectTypeList[index]
-                console.log('HSupInfo: ', HSupInfo);
+					//寰�鏉ョ被鍨�
+					TypeName: uni.getStorageSync('typeName_3803'),
+					HSupName: '', // 寰�鏉ュ崟浣嶉�変腑鐨勫��
+					HSupID: '', // 寰�鏉ュ崟浣嶅搴旂殑ID
+					HSupTypeID: uni.getStorageSync('typeID_3803') ? uni.getStorageSync('typeID_3803') : 0,
+					HDate: getDateTime.dateTimeStr('y-m-d'),
+					HMaker: uni.getStorageSync('HUserName'),
 
-                this.hform.HSupID = HSupInfo.HItemID
-                this.hform.HSupName = HSupInfo['閮ㄩ棬鍚嶇О'] || HSupInfo['瀹㈡埛鍚嶇О'] || HSupInfo['渚涘簲鍟嗗悕绉�']
+					HRedBlueFlag: 'false',
+					HStockOrgName: uni.getStorageSync('Organization'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+					HStockOutOrgID: uni.getStorageSync('OrganizationID'),
+					HBarCode_B: '',
+					HMouldName_B: '',
+					HMouldID_B: '',
+					HMouldCount_B: ''
+				}
+			}
+		},
+		methods: {
+			searchModule() {
+				this.$refs['billListMould'].showPopup()
+			},
+			MouldBillHandler(mould) {
+				if (!mould.enableMultiSourceBill) {
+					let val = mould.val[0]
+					this.hform.HBarCode = val['鏉$爜缂栧彿']
+					this.getCode(this.hform.HBarCode)
+				}
+				this.$refs['billListMould'].exit()
+			},
+			HSupNameChange(e) {
+				let index = this.arrayHSelectType.findIndex(el => el == e)
+				let HSupInfo = this.HSelectTypeList[index]
+				console.log('HSupInfo: ', HSupInfo);
 
-                const pages = getCurrentPages()
-                // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
-                const currentPage = pages[pages.length - 1]
-                // 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
-                uni.setStorageSync(`${currentPage.route.split("/").pop()}_${this.hform.HBillType}`, {
-                    HSupName: HSupInfo['閮ㄩ棬鍚嶇О'] || HSupInfo['瀹㈡埛鍚嶇О'] || HSupInfo['渚涘簲鍟嗗悕绉�'],
-                    HSupID: HSupInfo.HItemID
-                })
-            },
-            loadCache() {
-                const pages = getCurrentPages()
-                // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
-                const currentPage = pages[pages.length - 1]
-                // 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
-                let cache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_${this.hform.HBillType}`)
+				this.hform.HSupID = HSupInfo.HItemID
+				this.hform.HSupName = HSupInfo['閮ㄩ棬鍚嶇О'] || HSupInfo['瀹㈡埛鍚嶇О'] || HSupInfo['渚涘簲鍟嗗悕绉�']
 
-                this.hform.HSupID = cache.HSupID
-                this.hform.HSupName = cache.HSupName
-            },
-            //鎵爜
-            toScanCode() {
-                var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
-                mpaasScanModule.mpaasScan({
-                    'hideAlbum': true,
-                    'timeoutInterval': '10', //瓒呮椂鏃堕棿
-                    'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
-                }, (ret) => {
-                    console.log(ret.resp_result)
-                    if (this.hform.HBarCode == '*') {
-                        this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
-                    } else {
-                        this.hform.HBarCode = ret.resp_result
-                    }
+				const pages = getCurrentPages()
+				// 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+				const currentPage = pages[pages.length - 1]
+				// 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
+				uni.setStorageSync(`${currentPage.route.split("/").pop()}_${this.hform.HBillType}`, {
+					HSupName: HSupInfo['閮ㄩ棬鍚嶇О'] || HSupInfo['瀹㈡埛鍚嶇О'] || HSupInfo['渚涘簲鍟嗗悕绉�'],
+					HSupID: HSupInfo.HItemID
+				})
+			},
+			loadCache() {
+				const pages = getCurrentPages()
+				// 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+				const currentPage = pages[pages.length - 1]
+				// 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
+				let cache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_${this.hform.HBillType}`)
 
-                    this.getCode(this.hform.HBarCode)
-                })
-            },
-            getNewData() {
-                CommonUtils.doRequest("/WEBSController/GetMaxBillNoAndID_Json", {
-                        HBillType: this.hform.HBillType
-                    },
-                    (res) => {
-                        let res1 = res.data;
-                        let {
-                            data,
-                            count
-                        } = res1
-                        if (count == 1) {
-                            this.hform.HInterID = data[0].HInterID
-                            this.hform.HBillNo = data[0].HBillNo
-                        } else {
-                            uni.showToast({
-                                title: data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    })
-            },
-            getCode(HBarCode) {
-                //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
-                if (!this.hform.HWHName) {
-                    this.hform.HWHID = 0
-                }
-                if (!this.hform.HStockPlaceName) {
-                    this.hform.HStockPlaceID = 0
-                }
-                var sHWHID = this.hform.HWHID
-                var sHSPID = this.hform.HStockPlaceID
-                var sOldBarCode = HBarCode;
-                var HDeleteFlag = sOldBarCode.substring(0, 1); //鍙栨潯鐮佺涓�涓瓧绗�
-                var sBarCode = sOldBarCode.slice(1); //鑾峰彇绗竴涓瓧绗︿互澶栫殑鍏ㄩ儴瀛楃
-                var sSourceBillNo = ""
-                var sSourceBillType = "-1"
-                if (HDeleteFlag == '*') {
-                    if (sBarCode == "") {
-                        uni.showToast({
-                            title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
-                            icon: 'none'
-                        });
-                    } else {
-                        uni.request({
-                            url: this.serverUrl + '/MouldController/set_DelMouldStockBillMain_Temp_Json',
-                            data: {
-                                HInterID: this.hform.HInterID,
-                                HBillType: this.hform.HBillType,
-                                HBarCode: sBarCode
-                            },
-                            success: (res) => {
-                                console.log('鍒犻櫎鏉$爜', res.data);
-                                this.hform.HBarCode = '';
-                                if (res.data.count == 1) {
-                                    this.hform.HQty = ''
-                                } else {
-                                    uni.showToast({
-                                        title: res.data.Message,
-                                        icon: 'none'
-                                    })
-                                }
-                            },
-                            fail: (res) => {
-                                console.log(res);
-                                uni.showToast({
-                                    title: '鎺ュ彛璇锋眰澶辫触',
-                                    icon: 'none'
-                                })
-                            },
-                        });
-                    }
-                } else {
-                    var sBarCode = this.hform.HBarCode
-                    uni.request({
-                        url: this.serverUrl + '/MouldController/Get_CheckTypeByMouldBarCode_Json',
-                        data: {
-                            sBarCode: sBarCode,
-                            HInterID: this.hform.HInterID,
-                            HBillType: this.hform.HBillType,
-                            HBillNo: this.hform.HBillNo,
-                            HMaker: this.hform.HMaker,
-                            HWhID: sHWHID,
-                            HSPID: sHSPID,
-                            HSCWhID: 0,
-                            HSCSPID: 0,
-                            HRedBlueFlag: this.hform.HRedBlueFlag,
-                            HSourceBillNo: sSourceBillNo,
-                            HSourceBillType: sSourceBillType,
-                            HStockOrgID: this.hform.HStockOrgID,
-                            HStockOutOrgID: this.hform.HStockOutOrgID,
-                        },
-                        success: (res) => {
-                            console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
-                            this.hform.HBarCode = ''
-                            if (res.data.count == 1) {
-                                this.tabs = 1
-                                this.DisBillEntryList()
-                            } else {
-                                uni.showToast({
-                                    title: res.data.Message,
-                                    icon: 'none'
-                                })
-                            }
-                        },
-                        fail: (res) => {
-                            console.log(res);
-                            uni.showToast({
-                                title: '鎺ュ彛璇锋眰澶辫触',
-                                icon: 'none'
-                            })
-                        },
-                    })
-                }
-            },
-            //浠撳簱鐩戝惉浜嬩欢
-            HWHNameChange(e) {
-                for (var i = 0; i < this.HWHNameList.length; i++) {
-                    if (this.HWHNameList[i]["HName"] == e) {
-                        this.hform.HWHName = this.HWHNameList[i]["HName"]
-                        this.hform.HWHID = this.HWHNameList[i].HItemID
+				this.hform.HSupID = cache.HSupID
+				this.hform.HSupName = cache.HSupName
+			},
+			//鎵爜
+			toScanCode() {
+				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+				mpaasScanModule.mpaasScan({
+					'hideAlbum': true,
+					'timeoutInterval': '10', //瓒呮椂鏃堕棿
+					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+				}, (ret) => {
+					console.log(ret.resp_result)
+					if (this.hform.HBarCode == '*') {
+						this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+					} else {
+						this.hform.HBarCode = ret.resp_result
+					}
 
-                        this.showHStockPlaceName = this.HWHNameList[i].HIsStockMgr
-                    }
-                }
-            },
-            HStockPlaceNameChange(e) {
-                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
-                    if (this.HStockPlaceNameList[i]["HWhName"] == e) {
-                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
-                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i]["HWhName"]
-                    }
-                }
-            },
-            HScatterUserChange(e) {
-                for (var i = 0; i < this.HEmpNameList.length; i++) {
-                    if (this.HEmpNameList[i].HName == e) {
-                        this.hform.HKeeperID = this.HEmpNameList[i].HItemID
-                        this.hform.HKeeperName = this.HEmpNameList[i].HName
-                    }
-                }
-            },
-            HCollectUserChange(e) {
-                for (var i = 0; i < this.HEmpNameList.length; i++) {
-                    if (this.HEmpNameList[i].HName == e) {
-                        this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
-                        this.hform.HSecManagerName = this.HEmpNameList[i].HName
-                    }
-                }
-            },
-            /* #region 浠撳簱浠撲綅鑾峰彇涓嬫媺妗� */
-            getHBaseList() {
-                CommonUtils.doRequest(
-                    "/Web/GetWarehouseList_Json_New", {
-                        Warehouse: "",
-                        HOrgID: uni.getStorageSync('OrganizationID')
-                    },
-                    (res) => {
-                        let res1 = res.data
-                        let {
-                            data,
-                            count
-                        } = res1
-                        if (count == 1) {
-                            this.HWHNameList = data
-                            for (var i = 0; i < data.length; i++) {
-                                this.arrayHWHName[i] = data[i]["HName"]
-                            }
-                        } else {
-                            uni.showToast({
-                                title: '浠撳簱鏁版嵁璇锋眰澶辫触',
-                                icon: 'none'
-                            })
-                        }
-                    },
-                )
-                CommonUtils.doRequest(
-                    "/WEBSController/GetStockPlaceList_Json", {
-                        StockPlace: '',
-                        HWhID: this.hform.HWHID,
-                        HStockOrgID: uni.getStorageSync('OrganizationID')
-                    },
-                    (res) => {
-                        let res1 = res.data
-                        console.log(res1)
-                        let {
-                            data,
-                            count
-                        } = res1
-                        if (count == 1) {
-                            this.HStockPlaceNameList = data
-                            for (var i = 0; i < data.length; i++) {
-                                this.arrayHStockPlaceName[i] = data[i]["HWhName"]
-                            }
-                        } 
-                    },
-                )
-            },
-            /* #endregion */
-            getHEmpList() {
-                CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
-                        Employee: '',
-                        HGroupID: 0
-                    },
-                    (res) => {
-                        if (res.data.count == 1) {
-                            this.HEmpNameList = res.data.data
-                            for (var i = 0; i < res.data.data.length; i++) {
-                                this.arrayHEmpName[i] = res.data.data[i].HName
-                            }
-                            this.$forceUpdate();
-                        } else {
-                            uni.showToast({
-                                title: '浜哄憳鏁版嵁璇锋眰澶辫触',
-                                icon: 'none'
-                            })
-                        }
-                    },
-                )
-            },
-            //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
-            getHDeptList() {
-                uni.request({
-                    url: this.serverUrl + '/Gy_Department/list',
-                    data: {
-                        sWhere: "",
-                        user: uni.getStorageSync('HUserName'),
-                        Organization: uni.getStorageSync('Organization')
-                    },
-                    success: (res) => {
-                        if (res.data.count == 1) {
-                            this.HDeptNameList = res.data.data
-                            for (var i = 0; i < res.data.data.length; i++) {
-                                this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
-                            }
-                            this.$forceUpdate();
-                        } else {
-                            uni.showToast({
-                                title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            getHSupList() {
-                CommonUtils.doRequest(
-                    "/Gy_Supplier/list", {
-                        sWhere: "",
-                        user: uni.getStorageSync('HUserName'),
-                        Organization: uni.getStorageSync('Organization')
-                    },
-                    (res) => {
-                        let res1 = res.data
-                        let {
-                            data,
-                            count
-                        } = res1
-                        if (count == 1) {
-                            this.HSuplierList = data
-                            for (var i = 0; i < data.length; i++) {
-                                this.arrayHSupplierName[i] = data[i].渚涘簲鍟嗗悕绉�
-                            }
-                            this.$forceUpdate();
-                        } else {
-                            uni.showToast({
-                                title: data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    }
-                )
-            },
-            
-            //閫夋嫨浣跨敤閮ㄩ棬
-            HDeptNameChange(e) {
-                for (var i = 0; i < this.HDeptNameList.length; i++) {
-                    if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
-                        this.hform.HDeptID = this.HDeptNameList[i].HItemID
-                        this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
-                    }
-                }
-            },
-            //閫夋嫨瀹㈡埛
-            // HSupNameChange(e) {
-            //     for (var i = 0; i < this.HSupNameList.length; i++) {
-            //         if (this.HSupNameList[i].瀹㈡埛鍚嶇О == e) {
-            //             this.hform.HSupID = this.HSupNameList[i].HItemID
-            //             this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
-            //         }
-            //     }
-            // },
-            HDateChange(e) {
-                console.log(e.detail.value)
-                this.hform.HDate = e.detail.value
-            },
-            HSelectTypeChange(e) {
-                this.hform.TypeName=e;
-                this.hform.HSupName = ''; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
-                this.hform.HSupID = '';
-                uni.setStorageSync("typeName_3803",e);
-                if(e=='閮ㄩ棬')
-                {
-                    this.hform.HSupTypeID=3;
-                    uni.setStorageSync("typeID_3803",3);
-                    this.arrayHSelectType = this.arrayHDeptName;
-                    this.HSelectTypeList = this.HDeptNameList;
-                }
-                else if(e === '渚涘簲鍟�') {
-                    this.hform.HSupTypeID=1;
-                    uni.setStorageSync("typeID_3803",1);
-                    this.arrayHSelectType = this.arrayHSupplierName;
-                    this.HSelectTypeList = this.HSuplierList;
-                } else if(e === '瀹㈡埛') {
-                // 瀹㈡埛鏁版嵁 - 杩欓噷鐣欑┖锛屽悗缁坊鍔犺幏鍙栧鎴锋暟鎹殑閫昏緫
-                    this.hform.HSupTypeID=2;
-                    uni.setStorageSync("typeID_3803",2);
-                    this.arrayHSelectType =this.arrayHCusName;
-                    this.HSelectTypeList = this.HCusNameList;
-                } else {
-                    uni.setStorageSync("typeID_3803",0);
-                    this.arrayHSelectType = [];
-                    this.HSelectTypeList = [];
-                }    
-            },
-            //鍣ㄥ叿淇℃伅
-            DisBillEntryList() {
-                CommonUtils.doRequest(
-                    "/MouldController/GetMouldBillEntryTmpList_Json", {
-                        HInterID: this.hform.HInterID,
-                        HBillNo: this.hform.HBillNo,
-                        HBillType: this.hform.HBillType
-                    },
-                    (res) => {
-                        console.log('鍣ㄥ叿', res.data)
-                        var data = res.data.data
-                        this.HMouldList = data;
-                        if (res.data.count == 0) {
-                            this.HMouldList = [];
-                            this.hform.HMouldCount_B = ''
-                            this.hform.HMouldID_B = ''
-                            this.hform.HMouldName_B = ''
+					this.getCode(this.hform.HBarCode)
+				})
+			},
+			getNewData() {
+				CommonUtils.doRequest("/WEBSController/GetMaxBillNoAndID_Json", {
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						let res1 = res.data;
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.hform.HInterID = data[0].HInterID
+							this.hform.HBillNo = data[0].HBillNo
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					})
+			},
+			getCode(HBarCode) {
+				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				var sHWHID = this.hform.HWHID
+				var sHSPID = this.hform.HStockPlaceID
+				var sOldBarCode = HBarCode;
+				var HDeleteFlag = sOldBarCode.substring(0, 1); //鍙栨潯鐮佺涓�涓瓧绗�
+				var sBarCode = sOldBarCode.slice(1); //鑾峰彇绗竴涓瓧绗︿互澶栫殑鍏ㄩ儴瀛楃
+				var sSourceBillNo = ""
+				var sSourceBillType = "-1"
+				if (HDeleteFlag == '*') {
+					if (sBarCode == "") {
+						uni.showToast({
+							title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
+							icon: 'none'
+						});
+					} else {
+						uni.request({
+							url: this.serverUrl + '/MouldController/set_DelMouldStockBillMain_Temp_Json',
+							data: {
+								HInterID: this.hform.HInterID,
+								HBillType: this.hform.HBillType,
+								HBarCode: sBarCode
+							},
+							success: (res) => {
+								console.log('鍒犻櫎鏉$爜', res.data);
+								this.hform.HBarCode = '';
+								if (res.data.count == 1) {
+									this.hform.HQty = ''
+								} else {
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								}
+							},
+							fail: (res) => {
+								console.log(res);
+								uni.showToast({
+									title: '鎺ュ彛璇锋眰澶辫触',
+									icon: 'none'
+								})
+							},
+						});
+					}
+				} else {
+					var sBarCode = this.hform.HBarCode
+					uni.request({
+						url: this.serverUrl + '/MouldController/Get_CheckTypeByMouldBarCode_Json',
+						data: {
+							sBarCode: sBarCode,
+							HInterID: this.hform.HInterID,
+							HBillType: this.hform.HBillType,
+							HBillNo: this.hform.HBillNo,
+							HMaker: this.hform.HMaker,
+							HWhID: sHWHID,
+							HSPID: sHSPID,
+							HSCWhID: 0,
+							HSCSPID: 0,
+							HRedBlueFlag: this.hform.HRedBlueFlag,
+							HSourceBillNo: sSourceBillNo,
+							HSourceBillType: sSourceBillType,
+							HStockOrgID: this.hform.HStockOrgID,
+							HStockOutOrgID: this.hform.HStockOutOrgID,
+						},
+						success: (res) => {
+							console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
+							this.hform.HBarCode = ''
+							if (res.data.count == 1) {
+								this.tabs = 1
+								this.DisBillEntryList()
+							} else {
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					})
+				}
+			},
+			//浠撳簱鐩戝惉浜嬩欢
+			HWHNameChange(e) {
+				for (var i = 0; i < this.HWHNameList.length; i++) {
+					if (this.HWHNameList[i]["HName"] == e) {
+						this.hform.HWHName = this.HWHNameList[i]["HName"]
+						this.hform.HWHID = this.HWHNameList[i].HItemID
 
-                        } else {
-                            this.hform.HMouldCount_B = data[0].HQty
-                            this.hform.HMouldID_B = data[0].HMouldID
-                            this.hform.HMouldName_B = data[0].HMouldName
-                            this.hform.HBarCode_B = data[0].HBarCode
-                        }
-                    },
+						this.showHStockPlaceName = this.HWHNameList[i].HIsStockMgr
+					}
+				}
+			},
+			HStockPlaceNameChange(e) {
+				for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+					if (this.HStockPlaceNameList[i]["HWhName"] == e) {
+						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+						this.hform.HStockPlaceName = this.HStockPlaceNameList[i]["HWhName"]
+					}
+				}
+			},
+			HScatterUserChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+						this.hform.HKeeperName = this.HEmpNameList[i].HName
+					}
+				}
+			},
+			HCollectUserChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
+						this.hform.HSecManagerName = this.HEmpNameList[i].HName
+					}
+				}
+			},
+			/* #region 浠撳簱浠撲綅鑾峰彇涓嬫媺妗� */
+			getHBaseList() {
+				CommonUtils.doRequest(
+					"/Web/GetWarehouseList_Json_MJ", {
+						Warehouse: "",
+						HOrgID: uni.getStorageSync('OrganizationID')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HWHNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHWHName[i] = data[i]["HName"]
+							}
+							if (!this.hform.HWHName && this.arrayHWHName.length > 0) {
+								this.hform.HWHName = this.arrayHWHName[0];
+								// 鍚屾椂璁剧疆瀵瑰簲鐨勪粨搴揑D
+								for (var j = 0; j < this.HWHNameList.length; j++) {
+									if (this.HWHNameList[j]["HName"] == this.hform.HWHName) {
+										this.hform.HWHID = this.HWHNameList[j].HItemID;
+										this.showHStockPlaceName = this.HWHNameList[j].HIsStockMgr;
+										break;
+									}
+								}
+								// 瑙﹀彂浠撳簱鍙樻洿浜嬩欢锛屼互鏇存柊鐩稿叧渚濊禆锛堝浠撲綅锛�
+								this.HWHNameChange(this.hform.HWHName);
+							}
+						} else {
+							uni.showToast({
+								title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+				CommonUtils.doRequest(
+					"/WEBSController/GetStockPlaceList_Json", {
+						StockPlace: '',
+						HWhID: this.hform.HWHID,
+						HStockOrgID: uni.getStorageSync('OrganizationID')
+					},
+					(res) => {
+						let res1 = res.data
+						console.log(res1)
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HStockPlaceNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHStockPlaceName[i] = data[i]["HWhName"]
+							}
+						}
+					},
+				)
+			},
+			/* #endregion */
+			getHEmpList() {
+				CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
+						Employee: '',
+						HGroupID: 0
+					},
+					(res) => {
+						if (res.data.count == 1) {
+							this.HEmpNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHEmpName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '浜哄憳鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			getHDeptList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Department/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HDeptNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			getHSupList() {
+				CommonUtils.doRequest(
+					"/Gy_Supplier/list", {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HSuplierList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHSupplierName[i] = data[i].渚涘簲鍟嗗悕绉�
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					}
+				)
+			},
 
-                )
-            },
-            goBack() {
-                uni.showModal({
-                    title: '鎻愮ず',
-                    content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
-                    success: (res) => {
-                        if (res.confirm) {
-                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-                            uni.redirectTo({
-                                url: '/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList'
-                            })
-                        } else if (res.cancel) {
-                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                        }
-                    }
-                });
-            },
-            submit() {
-                //浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
-                if (!this.hform.HWHName) {
-                    this.hform.HWHID = 0
-                }
-                if (!this.hform.HStockPlaceName) {
-                    this.hform.HStockPlaceID = 0
-                }
-                
-                if (!this.hform.HDeptName) {
-                    this.hform.HDeptID = 0
-                }
-                if (!this.hform.HSupName) {
-                    this.hform.HSupID = 0
-                }
-                if (this.hform.HInterID == 0 || !this.hform.HInterID) {
-                    uni.showToast({
-                        title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
-                        icon: 'none'
-                    })
-                } else if (!this.hform.HBillNo) {
-                    uni.showToast({
-                        title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
-                        icon: 'none'
-                    })
-                } else {
-                    if (this.hform.HMouldID_B == 0 || this.hform.HMouldID_B == null) {
-                        uni.showToast({
-                            title: '娌℃湁鎵弿鍣ㄥ叿鏉$爜锛岃鍏堟壂鎻忓櫒鍏锋潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
-                            icon: 'none'
-                        })
-                    } else {
-                        uni.showLoading({
-                            title: '璇风◢鍊�'
-                        })
+			//閫夋嫨浣跨敤閮ㄩ棬
+			HDeptNameChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HDeptID = this.HDeptNameList[i].HItemID
+						this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
+					}
+				}
+			},
+			//閫夋嫨瀹㈡埛
+			// HSupNameChange(e) {
+			//     for (var i = 0; i < this.HSupNameList.length; i++) {
+			//         if (this.HSupNameList[i].瀹㈡埛鍚嶇О == e) {
+			//             this.hform.HSupID = this.HSupNameList[i].HItemID
+			//             this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
+			//         }
+			//     }
+			// },
+			HDateChange(e) {
+				console.log(e.detail.value)
+				this.hform.HDate = e.detail.value
+			},
+			HSelectTypeChange(e) {
+				this.hform.TypeName = e;
+				this.hform.HSupName = ''; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
+				this.hform.HSupID = '';
+				uni.setStorageSync("typeName_3803", e);
+				if (e == '閮ㄩ棬') {
+					this.hform.HSupTypeID = 3;
+					uni.setStorageSync("typeID_3803", 3);
+					this.arrayHSelectType = this.arrayHDeptName;
+					this.HSelectTypeList = this.HDeptNameList;
+				} else if (e === '渚涘簲鍟�') {
+					this.hform.HSupTypeID = 1;
+					uni.setStorageSync("typeID_3803", 1);
+					this.arrayHSelectType = this.arrayHSupplierName;
+					this.HSelectTypeList = this.HSuplierList;
+				} else if (e === '瀹㈡埛') {
+					// 瀹㈡埛鏁版嵁 - 杩欓噷鐣欑┖锛屽悗缁坊鍔犺幏鍙栧鎴锋暟鎹殑閫昏緫
+					this.hform.HSupTypeID = 2;
+					uni.setStorageSync("typeID_3803", 2);
+					this.arrayHSelectType = this.arrayHCusName;
+					this.HSelectTypeList = this.HCusNameList;
+				} else {
+					uni.setStorageSync("typeID_3803", 0);
+					this.arrayHSelectType = [];
+					this.HSelectTypeList = [];
+				}
+			},
+			//鍣ㄥ叿淇℃伅
+			DisBillEntryList() {
+				CommonUtils.doRequest(
+					"/MouldController/GetMouldBillEntryTmpList_Json", {
+						HInterID: this.hform.HInterID,
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						console.log('鍣ㄥ叿', res.data)
+						var data = res.data.data
+						this.HMouldList = data;
+						if (res.data.count == 0) {
+							this.HMouldList = [];
+							this.hform.HMouldCount_B = ''
+							this.hform.HMouldID_B = ''
+							this.hform.HMouldName_B = ''
+
+						} else {
+							this.hform.HMouldCount_B = data[0].HQty
+							this.hform.HMouldID_B = data[0].HMouldID
+							this.hform.HMouldName_B = data[0].HMouldName
+							this.hform.HBarCode_B = data[0].HBarCode
+						}
+					},
+
+				)
+			},
+			goBack() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.redirectTo({
+								url: '/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList'
+							})
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			},
+			submit() {
+				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+
+				if (!this.hform.HDeptName) {
+					this.hform.HDeptID = 0
+				}
+				if (!this.hform.HSupName) {
+					this.hform.HSupID = 0
+				}
+				if (this.hform.HInterID == 0 || !this.hform.HInterID) {
+					uni.showToast({
+						title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+						icon: 'none'
+					})
+				} else if (!this.hform.HBillNo) {
+					uni.showToast({
+						title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+						icon: 'none'
+					})
+				} else {
+					if (this.hform.HMouldID_B == 0 || this.hform.HMouldID_B == null) {
+						uni.showToast({
+							title: '娌℃湁鎵弿鍣ㄥ叿鏉$爜锛岃鍏堟壂鎻忓櫒鍏锋潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+							icon: 'none'
+						})
+					} else {
+						uni.showLoading({
+							title: '璇风◢鍊�'
+						})
 
 
-                        let sMainStr = JSON.stringify(this.hform);
-                        console.log("涓昏〃锛�" + sMainStr)
+						let sMainStr = JSON.stringify(this.hform);
+						console.log("涓昏〃锛�" + sMainStr)
 
-                        CommonUtils.doRequest(
-                            '/MouldController/set_SaveMouldProdBackBill_Json', {
-                                oMain: sMainStr
-                            },
-                            (res) => {
-                                console.log(1, res);
-                                uni.hideLoading()
-                                if (res.data.count == 1) {
-                                    uni.showModal({
-                                        title: '鎻愮ず',
-                                        content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
-                                        success: (res) => {
-                                            if (res.confirm) {
-                                                console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-                                                uni.redirectTo({
-                                                    url: '/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill'
-                                                })
-                                            } else if (res.cancel) {
-                                                console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                                                setTimeout(() => {
-                                                    uni.navigateBack();
-                                                }, 50)
-                                            }
-                                        }
-                                    });
-                                } else {
-                                    // uni.showToast({
-                                    // 	title: res.data.Message,
-                                    // 	icon: 'none'
-                                    // })
-                                    uni.showModal({
-                                        content: res.data.Message,
-                                        showCancel: false,
-                                        complete() {
-                                            uni.hideLoading()
-                                        }
-                                    })
-                                }
-                            },
-                            null,
-                            "POST"
-                        )
-                    }
-                }
-            },
-            getHCusList() {
-                CommonUtils.doRequest(
-                    "/Gy_Customer/list", {
-                        sWhere: "",
-                        user: uni.getStorageSync('HUserName'),
-                        Organization: uni.getStorageSync('Organization')
-                    },
-                    (res) => {
-                        let res1 = res.data
-                        let {
-                            data,
-                            count
-                        } = res1
-                        if (count == 1) {
-                            this.HCusNameList = data
-                            for (var i = 0; i < data.length; i++) {
-                                this.arrayHCusName[i] = data[i].瀹㈡埛鍚嶇О
-                            }
-                            this.$forceUpdate();
-                        } else {
-                            uni.showToast({
-                                title: data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    }
-                )
-            },
-        },
-        onLoad(e) {
-            console.log(e, this.userInfo)
+						CommonUtils.doRequest(
+							'/MouldController/set_SaveMouldProdBackBill_Json', {
+								oMain: sMainStr
+							},
+							(res) => {
+								console.log(1, res);
+								uni.hideLoading()
+								if (res.data.count == 1) {
+									uni.showModal({
+										title: '鎻愮ず',
+										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+										success: (res) => {
+											if (res.confirm) {
+												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+												uni.redirectTo({
+													url: '/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 50)
+											}
+										}
+									});
+								} else {
+									// uni.showToast({
+									// 	title: res.data.Message,
+									// 	icon: 'none'
+									// })
+									uni.showModal({
+										content: res.data.Message,
+										showCancel: false,
+										complete() {
+											uni.hideLoading()
+										}
+									})
+								}
+							},
+							null,
+							"POST"
+						)
+					}
+				}
+			},
+			getHCusList() {
+				CommonUtils.doRequest(
+					"/Gy_Customer/list", {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HCusNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHCusName[i] = data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					}
+				)
+			},
+		},
+		onLoad(e) {
+			console.log(e, this.userInfo)
 
-            if (e.HInterID) {
-                // this.HInterID_Temp = e.HInterID
-                // this.btnType = 1
-                this.RoadBillMain(e.HInterID)
-            } else {
-                this.getNewData()
-            }
-            this.getHBaseList()
-            this.getHCusList()
-            this.getHEmpList()
-            this.getHDeptList()
-            this.getHSupList()
+			if (e.HInterID) {
+				// this.HInterID_Temp = e.HInterID
+				// this.btnType = 1
+				this.RoadBillMain(e.HInterID)
+			} else {
+				this.getNewData()
+			}
+			this.getHBaseList()
+			this.getHCusList()
+			this.getHEmpList()
+			this.getHDeptList()
+			this.getHSupList()
 
-            setTimeout(() => {
-                this.HSelectTypeChange(this.hform.TypeName)
-                //鍒濆鍖栧線鏉ュ崟浣�
-                if (this.hform.TypeName == '閮ㄩ棬') {
-                    this.hform.HSupName = getUserInfo().HDept; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
-                    this.hform.HSupID = getUserInfo().HDeptID;
-                } else if (this.hform.TypeName === '渚涘簲鍟�') {
-                    this.hform.HSupName = getUserInfo().HSupName; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
-                    this.hform.HSupID = getUserInfo().HSupID;
-                } else if (this.hform.TypeName === '瀹㈡埛') {
+			setTimeout(() => {
+				this.HSelectTypeChange(this.hform.TypeName)
+				//鍒濆鍖栧線鏉ュ崟浣�
+				if (this.hform.TypeName == '閮ㄩ棬') {
+					this.hform.HSupName = getUserInfo().HDept; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
+					this.hform.HSupID = getUserInfo().HDeptID;
+				} else if (this.hform.TypeName === '渚涘簲鍟�') {
+					this.hform.HSupName = getUserInfo().HSupName; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
+					this.hform.HSupID = getUserInfo().HSupID;
+				} else if (this.hform.TypeName === '瀹㈡埛') {
 
-                }
-                this.$nextTick(() => {
-                    this.loadCache()
-                })
+				}
+				this.$nextTick(() => {
+					this.loadCache()
+				})
 
-            }, 300);
-            uni.$on('BillSelectComplete', (e) => {
-                console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
-                this.getHBarCodeData(e.HBillNo)
-                this.$refs.billList.exit()
-            })
+			}, 300);
+			uni.$on('BillSelectComplete', (e) => {
+				console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
+				this.getHBarCodeData(e.HBillNo)
+				this.$refs.billList.exit()
+			})
 
-            this.loadCache()
-            //this.getHEmpList()
-        },
-        //閲嶈閫夋嫨婧愬崟蹇呴』娣诲姞杩欎釜鍚﹀垯鍑虹幇涓ラ噸bug
-        onUnload() {
-            uni.$off('BillSelectComplete')
-        },
-    }
+			this.loadCache()
+			//this.getHEmpList()
+		},
+		//閲嶈閫夋嫨婧愬崟蹇呴』娣诲姞杩欎釜鍚﹀垯鍑虹幇涓ラ噸bug
+		onUnload() {
+			uni.$off('BillSelectComplete')
+		},
+	}
 </script>
 <style lang="scss" scoped>
-    .form {
-        width: 668rpx;
-        margin: 20rpx auto;
-        padding-bottom: 240rpx;
-    }
+	.form {
+		width: 668rpx;
+		margin: 20rpx auto;
+		padding-bottom: 240rpx;
+	}
 
-    .tab_area {
-        width: 100%;
-        height: 50rpx;
-    }
+	.tab_area {
+		width: 100%;
+		height: 50rpx;
+	}
 
-    .other {
-        margin-top: 8rpx;
-        text-align: center;
-        font-size: 28rpx;
-        padding: 4rpx 18rpx;
-        color: #1890FF;
-    }
+	.other {
+		margin-top: 8rpx;
+		text-align: center;
+		font-size: 28rpx;
+		padding: 4rpx 18rpx;
+		color: #1890FF;
+	}
 
-    .tabs {
-        width: 100%;
-        display: flex;
-        border-bottom: 1px solid #ddd;
-        margin: 20rpx 0;
+	.tabs {
+		width: 100%;
+		display: flex;
+		border-bottom: 1px solid #ddd;
+		margin: 20rpx 0;
 
-        view {
-            width: 25%;
-            font-size: 30rpx;
-            color: #555;
-            text-align: center;
-            padding: 16rpx 0;
-        }
+		view {
+			width: 25%;
+			font-size: 30rpx;
+			color: #555;
+			text-align: center;
+			padding: 16rpx 0;
+		}
 
-        .on {
-            color: #3a78ff;
-            font-weight: bold;
-            border-bottom: 3px solid #3a78ff;
-        }
-    }
+		.on {
+			color: #3a78ff;
+			font-weight: bold;
+			border-bottom: 3px solid #3a78ff;
+		}
+	}
 
-    .form-item {
-        display: flex;
-        align-items: center;
-        font-size: 30rpx;
-        padding: 6rpx 0;
-        gap: 12rpx;
+	.form-item {
+		display: flex;
+		align-items: center;
+		font-size: 30rpx;
+		padding: 6rpx 0;
+		gap: 12rpx;
 
-        .title {
-            width: 208rpx;
-            flex-shrink: 0;
+		.title {
+			width: 208rpx;
+			flex-shrink: 0;
 
-            text {
-                color: red;
-                font-weight: bold;
-            }
-        }
+			text {
+				color: red;
+				font-weight: bold;
+			}
+		}
 
-        .right {
-            // width: 450rpx;
-            flex: 1;
-            border-radius: 22rpx;
-            border: 1px solid #acacac;
-            position: relative;
-            display: flex;
+		.right {
+			// width: 450rpx;
+			flex: 1;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+			position: relative;
+			display: flex;
 
-            picker {
-                width: 100%;
-            }
+			picker {
+				width: 100%;
+			}
 
-            .uni-combox {
-                width: 100%;
-            }
-        }
+			.uni-combox {
+				width: 100%;
+			}
+		}
 
-        .righton {
-            border-radius: 22rpx;
-            border: 1px solid #e4e4e4;
-            background-color: #e4e4e4;
-            flex: 1;
-            position: relative;
-            display: flex;
+		.righton {
+			border-radius: 22rpx;
+			border: 1px solid #e4e4e4;
+			background-color: #e4e4e4;
+			flex: 1;
+			position: relative;
+			display: flex;
 
-        }
+		}
 
-        input {
-            width: 100%;
-            padding: 8rpx 20rpx;
-            font-size: 30rpx;
-        }
+		input {
+			width: 100%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
 
-        textarea {
-            width: 98%;
-            padding: 8rpx 20rpx;
-            font-size: 30rpx;
-        }
+		textarea {
+			width: 98%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
 
-        .icon-wrapper {
-            background-color: #3A78FF;
-            border-radius: 100%;
-            width: 52rpx;
-            height: 52rpx;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            flex-shrink: 0;
+		.icon-wrapper {
+			background-color: #3A78FF;
+			border-radius: 100%;
+			width: 52rpx;
+			height: 52rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			flex-shrink: 0;
 
-            .uni-icons {
-                color: #fff !important;
-            }
-        }
+			.uni-icons {
+				color: #fff !important;
+			}
+		}
 
-        .icon-wrapper[disabled] {
-            background-color: rgba(228, 228, 228, 1);
-            pointer-events: none;
-            touch-action: none;
-        }
-    }
+		.icon-wrapper[disabled] {
+			background-color: rgba(228, 228, 228, 1);
+			pointer-events: none;
+			touch-action: none;
+		}
+	}
 
-    .bottom-btn {
-        width: 100%;
-        box-sizing: border-box;
-        // height: 120rpx;
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        background-color: #fff;
-        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
-        padding: 30rpx 40rpx 40rpx 40rpx;
-        display: flex;
-        flex-direction: row;
-        gap: 10rpx;
+	.bottom-btn {
+		width: 100%;
+		box-sizing: border-box;
+		// height: 120rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background-color: #fff;
+		box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+		padding: 30rpx 40rpx 40rpx 40rpx;
+		display: flex;
+		flex-direction: row;
+		gap: 10rpx;
 
-        button {
-            border-radius: 50rpx;
-            width: 180rpx;
-            height: 66rpx;
-            line-height: 66rpx;
-            font-size: 28rpx;
-        }
+		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;
+		}
+	}
 
-    .list {
-        width: 100%;
+	.list {
+		width: 100%;
 
-        .card-detail {
-            width: 100%;
-            display: flex;
-            flex-wrap: wrap;
-            justify-content: space-between;
-            line-height: 120%;
+		.card-detail {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			line-height: 120%;
 
-            .detail {
-                // width: 50%;
-                font-size: 26rpx;
-                margin-bottom: 12rpx;
-                color: #555;
-                margin-right: 20rpx;
+			.detail {
+				// width: 50%;
+				font-size: 26rpx;
+				margin-bottom: 12rpx;
+				color: #555;
+				margin-right: 20rpx;
 
-                text {
-                    color: #999;
-                    font-size: 26rpx;
-                }
-            }
-        }
+				text {
+					color: #999;
+					font-size: 26rpx;
+				}
+			}
+		}
 
-        .more {
-            color: #888;
-            font-size: 24rpx;
-            display: flex;
-            border-top: 1px solid #eee;
-            padding-top: 20rpx;
+		.more {
+			color: #888;
+			font-size: 24rpx;
+			display: flex;
+			border-top: 1px solid #eee;
+			padding-top: 20rpx;
 
-            .part {
-                width: 50%;
-                text-align: center;
-            }
-        }
-    }
+			.part {
+				width: 50%;
+				text-align: center;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/MJGL/shangmudan/MouldUpperBill.vue b/pages/MJGL/shangmudan/MouldUpperBill.vue
index ee9a34a..514dd2e 100644
--- a/pages/MJGL/shangmudan/MouldUpperBill.vue
+++ b/pages/MJGL/shangmudan/MouldUpperBill.vue
@@ -14,6 +14,7 @@
 			<view class="tabs">
 				<view :class="tabs == 0 ? 'on':''" @tap="() => { tabs = 0; reFocusBarCode(); }">鍗曟嵁淇℃伅</view>
 				<view :class="tabs == 1 ? 'on':''" @tap="() => { tabs = 1; reFocusBarCode(); }">妯″叿淇℃伅</view>
+				<view :class="tabs == 2 ? 'on':''" @tap="() => { tabs = 2; reFocusBarCode(); }">鍒跺崟淇℃伅</view>
 			</view>
 
 			<!-- 鍗曟嵁淇℃伅 -->
@@ -89,15 +90,44 @@
 			</view>
 			<!-- 妯″叿淇℃伅 -->
 			<view v-if="tabs == 1">
-				<zb-table id="list-table" :checked-highlight="true" :fit="true"
-					:style="{height: `${listTableHeight}px`}" :columns="columns" :data="listData" :show-header="true"
-					:border="true" :row-key="row => row.index" @toggleRowSelection="handleSelect"
-					@toggleAllSelection="handleSelectAll" @rowClick="onTableRowClickHandler" />
+				<view class="card-list" :style="{height: `${listTableHeight}px`, overflow: 'auto'}">
+					<!-- 鍗$墖鍒楄〃 -->
+					<view v-for="(item, index) in listData" :key="index" class="card-item">
+						<uni-card style="margin: 10rpx 0;">
+							<view class="card-content">
+								<view class="card-row">
+									<text class="label">搴忓彿锛�</text>
+									<text class="value">{{ index + 1 }}</text>
+								</view>
+								<view class="card-row">
+									<text class="label">鍣ㄥ叿缂栫爜锛�</text>
+									<text class="value">{{ item.鍣ㄥ叿缂栫爜 }}</text>
+								</view>
+								<view class="card-row">
+									<text class="label">鍣ㄥ叿鍚嶇О锛�</text>
+									<text class="value">{{ item.鍣ㄥ叿鍚嶇О }}</text>
+								</view>
+								<view class="card-row">
+									<text class="label">鍣ㄥ叿鍨嬪彿锛�</text>
+									<text class="value">{{ item.鍣ㄥ叿鍨嬪彿 }}</text>
+								</view>
+								<view class="card-row">
+									<text class="label">鍣ㄥ叿鏉$爜锛�</text>
+									<text class="value">{{ item.鍣ㄥ叿鏉$爜 }}</text>
+								</view>
+								<view class="card-row">
+									<text class="label">鍣ㄥ叿鏁伴噺锛�</text>
+									<text class="value">{{ item.鍣ㄥ叿鏁伴噺 }}</text>
+								</view>
+							</view>
+						</uni-card>
+					</view>
+
+					<view class="over" v-if="listData.length == 0">鏆傛棤妯″叿鏁版嵁</view>
+				</view>
 			</view>
 
-			<view class="tab_area"></view>
-
-			<view v-if="showmore">
+			<view v-if="tabs == 2">
 				<view class="form-item">
 					<view class="title">鍒跺崟浜�:</view>
 					<view class="righton">
@@ -139,16 +169,6 @@
 				</view>
 
 			</view>
-			<view class="other">
-				<view v-if="!showmore" @tap="showmore = true">
-					灞曞紑鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
-				</view>
-				<view v-if="showmore" @tap="showmore = false">
-					鎶樺彔鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
-				</view>
-			</view>
-
-			<view class="tab_area"></view>
 
 			<view class="bottom-btn">
 				<button v-if="btnType == 1 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
@@ -193,51 +213,6 @@
 				listOption: [], // 鍒楄〃閫夐」
 				listData: [], // 琛ㄦ牸鏁版嵁
 				selectedRows: [], // 琛ㄦ牸閫変腑鐨勬暟鎹�
-				// 鍦╟olumns閰嶇疆涓坊鍔犳搷浣滃垪
-				columns: [ // 琛ㄦ牸鍒楅厤缃�
-					{
-						type: 'selection',
-						fixed: true,
-						width: 50
-					},
-					{
-						name: 'index',
-						label: '搴忓彿',
-						width: 60,
-						hidden: true
-					},
-					{
-						name: 'HMouldID',
-						label: 'HMouldID',
-						width: 100,
-						hidden: true
-					},
-					{
-						name: '鍣ㄥ叿鏁伴噺',
-						label: '鍣ㄥ叿鏁伴噺',
-						width: 120
-					},
-					{
-						name: '鍣ㄥ叿缂栫爜',
-						label: '鍣ㄥ叿缂栫爜',
-						width: 150
-					},
-					{
-						name: '鍣ㄥ叿鍚嶇О',
-						label: '鍣ㄥ叿鍚嶇О',
-						width: 120
-					},
-					{
-						name: '鍣ㄥ叿鍨嬪彿',
-						label: '鍣ㄥ叿鍨嬪彿',
-						width: 120
-					},
-					{
-						name: '鍣ㄥ叿鏉$爜',
-						label: '鍣ㄥ叿鏉$爜',
-						width: 120
-					}
-				],
 
 				hform: {
 					HInterID: '',
@@ -336,75 +311,16 @@
 					this.HBarCodeFocus = true;
 				});
 			},
-			// 琛ㄦ牸琛岀偣鍑诲鐞�
-			onTableRowClickHandler(row, index) {
-				if (!this.listData[index].checked) {
-					this.$set(this.listData[index], 'checked', true)
-				} else {
-					this.listData[index].checked = !this.listData[index].checked
-				}
-			},
-
-			// 琛ㄦ牸閫夋嫨澶勭悊
-			handleSelect(selected, array) {
-				this.selectedRows = array
-			},
-
-			// 琛ㄦ牸鍏ㄩ�夊鐞�
-			handleSelectAll(selected, array) {
-				this.selectedRows = array
-			},
-			// 琛ㄦ牸琛屽垹闄�
-			deleteSelected() {
-				if (this.selectedRows.length === 0) {
-					uni.showToast({
-						title: '璇峰厛閫夋嫨瑕佸垹闄ょ殑妯″叿',
-						icon: 'none'
-					})
-					return
-				}
-
-				// 鏄剧ず纭瀵硅瘽妗�
-				uni.showModal({
-					title: '纭鍒犻櫎',
-					content: `纭畾瑕佸垹闄ら�変腑鐨�${this.selectedRows.length}鏉℃暟鎹悧锛焋,
-					success: (res) => {
-						if (res.confirm) {
-							// 鑾峰彇閫変腑琛岀殑HMouldID闆嗗悎
-							const selectedIds = this.selectedRows.map(row => row.HMouldID)
-
-							// 杩囨护鎺夐�変腑鐨勬暟鎹�
-							this.listData = this.listData.filter(item =>
-								!selectedIds.includes(item.HMouldID)
-							)
-
-							// 閲嶆柊璁$畻搴忓彿
-							this.listData.forEach((item, index) => {
-								item.index = index + 1
-							})
-
-							// 娓呯┖閫変腑鐘舵��
-							this.selectedRows = []
-
-							uni.showToast({
-								title: '鍒犻櫎鎴愬姛',
-								icon: 'success'
-							})
-						}
-					}
-				})
-			},
-
 			//鏃ユ湡
 			HDateChange(e) {
 				console.log(e.detail.value)
 				this.hform.HDate = e.detail.value
 			},
 			getHBarCodeData(HBarCode) {
-				if (uni.getStorageSync('Organization') == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�") {
+				if (uni.getStorageSync('Organization') != "浜嬩笟涓�澶�") {
 					if (!this.hform.HSourceName) {
 						uni.showToast({
-							title: '璇峰厛閫夋嫨鐢熶骇璧勬簮',
+							title: '璇峰厛閫夋嫨鎴栨壂鎻忕敓浜ц祫婧�',
 							icon: 'none'
 						});
 						return;
@@ -954,25 +870,25 @@
 					})
 				}
 				// 濡傛灉鏄簨涓氫竴澶勭粍缁囷紝鏍¢獙鍣ㄥ叿鏁伴噺
-				// if (uni.getStorageSync('OrganizationID') === "100007" && uni.getStorageSync('Organization') === "浜嬩笟涓�澶�") {
-				// 	const zeroQtyItem = this.listData.find(item => {
-				// 		// 鑰冭檻0銆乶ull銆乽ndefined绛夊紓甯告儏鍐�
-				// 		const qty = Number(item.鍣ㄥ叿鏁伴噺) || 0;
-				// 		return qty <= 0;
-				// 	});
+				if (uni.getStorageSync('OrganizationID') === "100007" && uni.getStorageSync('Organization') === "浜嬩笟涓�澶�") {
+					const zeroQtyItem = this.listData.find(item => {
+						// 鑰冭檻0銆乶ull銆乽ndefined绛夊紓甯告儏鍐�
+						const qty = Number(item.鍣ㄥ叿鏁伴噺) || 0;
+						return qty <= 0;
+					});
 
-				// 	if (zeroQtyItem) {
-				// 		// 鎵惧埌绗竴涓暟閲忓紓甯搁」鐨勪綅缃紙绱㈠紩+1锛�
-				// 		const index = this.listData.indexOf(zeroQtyItem) + 1;
-				// 		const code = zeroQtyItem.鍣ㄥ叿缂栫爜 || '鏈煡缂栫爜';
-				// 		uni.showToast({
-				// 			title: `绗�${index}琛屻��${code}銆戝櫒鍏锋暟閲忎负0锛岃妫�鏌,
-				// 			icon: 'none',
-				// 			duration: 3000
-				// 		});
-				// 		return;
-				// 	}
-				// }
+					if (zeroQtyItem) {
+						// 鎵惧埌绗竴涓暟閲忓紓甯搁」鐨勪綅缃紙绱㈠紩+1锛�
+						const index = this.listData.indexOf(zeroQtyItem) + 1;
+						const code = zeroQtyItem.鍣ㄥ叿缂栫爜 || '鏈煡缂栫爜';
+						uni.showToast({
+							title: `绗�${index}琛屻��${code}銆戝櫒鍏锋暟閲忎负0锛岃妫�鏌,
+							icon: 'none',
+							duration: 3000
+						});
+						return;
+					}
+				}
 				if (!this.hform.HEmpName) {
 					uni.showToast({
 						title: '璇烽�夋嫨鎿嶄綔鍛�',
@@ -1202,7 +1118,7 @@
 		}
 
 		.btn-c {
-			background-color: #acacac;
+			background-color: #FFA500;
 			color: #fff;
 			position: absolute;
 			right: 120rpx;
@@ -1234,4 +1150,5 @@
 			border-bottom: 3px solid #3a78ff;
 		}
 	}
+
 </style>
\ No newline at end of file
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue
index cad1a85..3598e8f 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue
@@ -44,36 +44,36 @@
 				</view>
 				<view class="form-item">
 					<view class="title">涓婚:</view>
-					<view class="right">
-						<input name="HContext" v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
+					<view class="righton">
+						<input name="HContext" disabled  v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
 					</view>
 				</view>
 				<view class="form-item" style="align-items: flex-start;">
 					<view class="title"><text>*</text>璇︾粏鍐呭:</view>
-					<view class="right" style="min-height: 150rpx;">
+					<view class="righton" style="min-height: 150rpx;">
 						<textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1"
-							placeholder="璇疯緭鍏ヨ缁嗗唴瀹�"></textarea>
+							placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" disabled ></textarea>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">寮傚父绫诲瀷:</view>
-					<view class="right">
+					<view class="righton">
 						<uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="璇烽�夋嫨"
-							v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
+							v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange" disabled ></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">鍙戦�侀儴闂�:</view>
-					<view class="right">
+					<view class="righton">
 						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
-							@input="HDeptNameChange"></uni-combox>
+							@input="HDeptNameChange" disabled ></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">鍙戦�佷汉:</view>
-					<view class="right">
+					<view class="righton">
 						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鍙戦�佷汉" v-model="hform.HSendMan"
-							@input="HSendManChange"></uni-combox>
+							@input="HSendManChange" disabled ></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
@@ -92,28 +92,28 @@
 				</view>
 				<view class="form-item">
 					<view class="title">鐩稿叧璁惧:</view>
-					<view class="right">
+					<view class="righton">
 						<uni-combox :candidates="arrayHEquipName" placeholder="璇烽�夋嫨璁惧" v-model="hform.HEquipName"
-							@input="HEquipNameChange"></uni-combox>
+							@input="HEquipNameChange" disabled ></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">鐩稿叧妯″叿:</view>
-					<view class="right">
+					<view class="righton">
 						<uni-combox :candidates="arrayHMouldName" placeholder="璇烽�夋嫨妯″叿" v-model="hform.HMouldName"
-							@input="HMouldIDNameChange"></uni-combox>
+							@input="HMouldIDNameChange" disabled ></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">浜у搧鍚嶇О:</view>
-					<view class="right">
-						<input name="HMaterName" v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+					<view class="righton">
+						<input name="HMaterName" disabled  v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">瑙勬牸鍨嬪彿:</view>
-					<view class="right">
-						<input name="HMaterModel" v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+					<view class="righton">
+						<input name="HMaterModel" disabled  v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
 					</view>
 				</view>
 				<view class="form-item">
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue
index 1eb2a83..2593f59 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue
@@ -44,36 +44,36 @@
 				</view>
 				<view class="form-item">
 					<view class="title">涓婚:</view>
-					<view class="right">
-						<input name="HContext" v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
+					<view class="righton">
+						<input name="HContext" disabled  v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
 					</view>
 				</view>
 				<view class="form-item" style="align-items: flex-start;">
 					<view class="title"><text>*</text>璇︾粏鍐呭:</view>
-					<view class="right" style="min-height: 150rpx;">
+					<view class="righton" style="min-height: 150rpx;">
 						<textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1"
-							placeholder="璇疯緭鍏ヨ缁嗗唴瀹�"></textarea>
+							placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" disabled ></textarea>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">寮傚父绫诲瀷:</view>
-					<view class="right">
+					<view class="righton">
 						<uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="璇烽�夋嫨"
-							v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
+							v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange" disabled ></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">鍙戦�侀儴闂�:</view>
-					<view class="right">
+					<view class="righton">
 						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
-							@input="HDeptNameChange"></uni-combox>
+							@input="HDeptNameChange" disabled ></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">鍙戦�佷汉:</view>
-					<view class="right">
+					<view class="righton">
 						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鍙戦�佷汉" v-model="hform.HSendMan"
-							@input="HSendManChange"></uni-combox>
+							@input="HSendManChange" disabled ></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
@@ -99,28 +99,28 @@
 				</view>
 				<view class="form-item">
 					<view class="title">鐩稿叧璁惧:</view>
-					<view class="right">
+					<view class="righton">
 						<uni-combox :candidates="arrayHEquipName" placeholder="璇烽�夋嫨璁惧" v-model="hform.HEquipName"
-							@input="HEquipNameChange"></uni-combox>
+							@input="HEquipNameChange" disabled ></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">鐩稿叧妯″叿:</view>
-					<view class="right">
+					<view class="righton">
 						<uni-combox :candidates="arrayHMouldName" placeholder="璇烽�夋嫨妯″叿" v-model="hform.HMouldName"
-							@input="HMouldIDNameChange"></uni-combox>
+							@input="HMouldIDNameChange" disabled ></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">浜у搧鍚嶇О:</view>
-					<view class="right">
-						<input name="HMaterName" v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+					<view class="righton">
+						<input name="HMaterName" disabled  v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">瑙勬牸鍨嬪彿:</view>
-					<view class="right">
-						<input name="HMaterModel" v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+					<view class="righton">
+						<input name="HMaterModel" disabled  v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
 					</view>
 				</view>
 				<view class="form-item">
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue
index 1d9f27f..bebc62f 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue
@@ -43,36 +43,36 @@
 				</view>
 				<view class="form-item">
 					<view class="title">涓婚:</view>
-					<view class="right">
-						<input name="HContext" v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
+					<view class="righton">
+						<input name="HContext" disabled  v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
 					</view>
 				</view>
 				<view class="form-item" style="align-items: flex-start;">
 					<view class="title"><text>*</text>璇︾粏鍐呭:</view>
-					<view class="right" style="min-height: 150rpx;">
+					<view class="righton" style="min-height: 150rpx;">
 						<textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1"
-							placeholder="璇疯緭鍏ヨ缁嗗唴瀹�"></textarea>
+							placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" disabled ></textarea>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">寮傚父绫诲瀷:</view>
-					<view class="right">
+					<view class="righton">
 						<uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="璇烽�夋嫨"
-							v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
+							v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange" disabled ></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">鍙戦�侀儴闂�:</view>
-					<view class="right">
+					<view class="righton">
 						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
-							@input="HDeptNameChange"></uni-combox>
+							@input="HDeptNameChange" disabled ></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">鍙戦�佷汉:</view>
 					<view class="right">
 						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鍙戦�佷汉" v-model="hform.HSendMan"
-							@input="HSendManChange"></uni-combox>
+							@input="HSendManChange" disabled ></uni-combox>
 					</view>
 				</view>
 
@@ -99,28 +99,28 @@
 				</view>
 				<view class="form-item">
 					<view class="title">鐩稿叧璁惧:</view>
-					<view class="right">
+					<view class="righton">
 						<uni-combox :candidates="arrayHEquipName" placeholder="璇烽�夋嫨" v-model="hform.HEquipName"
-							@input="HEquipNameChange"></uni-combox>
+							@input="HEquipNameChange" disabled ></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">鐩稿叧妯″叿:</view>
-					<view class="right">
+					<view class="righton">
 						<uni-combox :candidates="arrayHMouldName" placeholder="璇烽�夋嫨" v-model="hform.HMouldName"
-							@input="HMouldIDNameChange"></uni-combox>
+							@input="HMouldIDNameChange" disabled ></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">浜у搧鍚嶇О:</view>
-					<view class="right">
-						<input name="HMaterName" v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+					<view class="righton">
+						<input name="HMaterName" disabled  v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">瑙勬牸鍨嬪彿:</view>
-					<view class="right">
-						<input name="HMaterModel" v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+					<view class="righton">
+						<input name="HMaterModel" disabled  v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
 					</view>
 				</view>
 				<view class="form-item">
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue
index 1025f80..647d145 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue
@@ -37,36 +37,36 @@
 				</view>
 				<view class="form-item">
 					<view class="title">涓婚:</view>
-					<view class="right">
-						<input name="HContext" v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
+					<view class="righton">
+						<input name="HContext" disabled v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
 					</view>
 				</view>
 				<view class="form-item" style="align-items: flex-start;">
 					<view class="title"><text>*</text>璇︾粏鍐呭:</view>
-					<view class="right" style="min-height: 150rpx;">
-						<textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1"
+					<view class="righton" style="min-height: 150rpx;">
+						<textarea name="HDescription" disabled v-model="hform.HDescription" auto-height maxlength="-1"
 							placeholder="璇疯緭鍏ヨ缁嗗唴瀹�"></textarea>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">寮傚父绫诲瀷:</view>
-					<view class="right">
+					<view class="righton">
 						<uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="璇烽�夋嫨"
-							v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
+							v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange" disabled></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">鍙戦�侀儴闂�:</view>
-					<view class="right">
+					<view class="righton">
 						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
-							@input="HDeptNameChange"></uni-combox>
+							@input="HDeptNameChange" disabled></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">鍙戦�佷汉:</view>
-					<view class="right">
+					<view class="righton">
 						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鍙戦�佷汉" v-model="hform.HSendMan"
-							@input="HSendManChange"></uni-combox>
+							@input="HSendManChange" disabled></uni-combox>
 					</view>
 				</view>
 
@@ -86,28 +86,28 @@
 				</view>
 				<view class="form-item">
 					<view class="title">鐩稿叧璁惧:</view>
-					<view class="right">
+					<view class="righton">
 						<uni-combox :candidates="arrayHEquipName" placeholder="璇烽�夋嫨" v-model="hform.HEquipName"
-							@input="HEquipNameChange"></uni-combox>
+							@input="HEquipNameChange" disabled></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">鐩稿叧妯″叿:</view>
-					<view class="right">
+					<view class="righton">
 						<uni-combox :candidates="arrayHMouldName" placeholder="璇烽�夋嫨" v-model="hform.HMouldName"
-							@input="HMouldIDNameChange"></uni-combox>
+							@input="HMouldIDNameChange" disabled></uni-combox>
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">浜у搧鍚嶇О:</view>
-					<view class="right">
-						<input name="HMaterName" v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+					<view class="righton">
+						<input name="HMaterName" v-model="hform.HMaterName" disabled placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">瑙勬牸鍨嬪彿:</view>
-					<view class="right">
-						<input name="HMaterModel" v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+					<view class="righton">
+						<input name="HMaterModel" v-model="hform.HMaterModel" disabled placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
 					</view>
 				</view>
 				<view class="form-item">
@@ -985,5 +985,5 @@
 </script>
 
 <style lang="scss">
-    @import "@/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss"
+    @import "@/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss";
 </style>
\ No newline at end of file
diff --git a/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss b/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss
index ecd24bd..ad8329d 100644
--- a/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss
+++ b/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss
@@ -27,7 +27,7 @@
         color: #fff;
     }
     .btn-c {
-        background-color: #acacac;
+        background-color: #FFA500;
         color: #fff;
         // position: absolute;
         // right: 120rpx;
@@ -268,4 +268,37 @@
         justify-content: flex-start;
         gap: 6rpx;
 
-    }
\ No newline at end of file
+    }
+	.uni-combox.disabled,
+	.uni-combox[disabled] {
+	    opacity: 0.6;
+	    pointer-events: none;
+	    
+	    .uni-combox__selector {
+	        background-color: #f5f5f5 !important;
+	        color: #999 !important;
+	    }
+	    
+	    .uni-combox__input {
+	        background-color: #f5f5f5 !important;
+	        color: #999 !important;
+	        -webkit-text-fill-color: #999 !important;
+	    }
+	}
+	
+	/* 閽堝 righton 绫讳腑鐨� uni-combox */
+	.righton {
+	    .uni-combox.disabled,
+	    .uni-combox[disabled] {
+	        .uni-combox__selector {
+	            background-color: #f5f5f5 !important;
+	            border-color: #e0e0e0 !important;
+	        }
+	        
+	        .uni-combox__input {
+	            background-color: #f5f5f5 !important;
+	            color: #999 !important;
+	            -webkit-text-fill-color: #999 !important;
+	        }
+	    }
+	}
\ No newline at end of file
diff --git a/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue b/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
index 5edebd6..25bedbd 100644
--- a/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
+++ b/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
@@ -60,7 +60,7 @@
 			<view class="form-item">
 				<view class="title">鐢熶骇鐝粍:</view>
 				<view class="right">
-					<uni-combox :candidates="HGroupNameArray" name="HShiftsName" id="HShiftsName" placeholder="璇烽�夋嫨鐢熶骇鐝粍"
+					<uni-combox :candidates="HGroupNameArray" name="HGroupName" id="HGroupName" placeholder="璇烽�夋嫨鐢熶骇鐝粍"
 						v-model="hform.HGroupName" @input="HGroupNameChangeHandler"></uni-combox>
 				</view>
 			</view>
@@ -368,7 +368,7 @@
 					url: '/Web/GetEmployeeList_Json',
 					data: {
 						Employee: '',
-						HGroupID:0
+						HGroupID: 0
 					},
 					resFunction: (res) => {
 						let {
@@ -495,9 +495,10 @@
 							Message,
 							count
 						} = res.data
-
-						this.hform.HShiftsID = data[0]['HInterID']
-						this.hform.HShiftsName = data[0]['鐝']
+						if (count && data && data.length > 0) {
+							this.hform.HShiftsID = data[0]['HInterID']
+							this.hform.HShiftsName = data[0]['鐝']
+						}
 					}
 				})
 			},
@@ -626,8 +627,22 @@
 								"HICMOBillNo": data1[0].浠诲姟鍗曞彿, //鐢熶骇璁㈠崟
 								"HDeptID": data1[0].HWorkShopID, //杞﹂棿ID
 								"HDeptName": data1[0].鐢熶骇杞﹂棿, //杞﹂棿
-								
+
 							})
+							if (data1 && data1.length === 1) {
+								// 鑾峰彇宸ュ簭ID
+								let procId = data1[0].HProcID
+								// 鍦ㄥ伐搴忔暟缁勪腑鏌ユ壘瀵瑰簲鐨勫伐搴忓悕绉�
+								let procIndex = this.HProcNameArraySource.findIndex(item => item.HItemID ==
+									procId)
+
+								if (procIndex !== -1) {
+									// 鑷姩璁剧疆宸ュ簭
+									this.hform.HProcName = this.HProcNameArraySource[procIndex].HName
+									this.hform.HProcID = procId
+									this.onHProcNameChangeHandler(this.hform.HProcName)
+								}
+							}
 
 							uni.showToast({
 								icon: 'none',
@@ -652,7 +667,13 @@
 				if (this.hform.HQty == '') {
 					return uni.showToast({
 						icon: 'none',
-						title: '鍙栨牱鏁伴噺涓虹┖'
+						title: '鍙栨牱鏁伴噺涓嶈兘涓虹┖'
+					})
+				}
+				if (this.hform.HSampleDamageQty == '') {
+					return uni.showToast({
+						icon: 'none',
+						title: '鐮村潖鎬у疄楠屾暟閲忎笉鑳戒负绌�'
 					})
 				}
 				if (this.hform.HProcID == 0) {
@@ -709,21 +730,21 @@
 						} = res.data
 						if (count == 1) {
 							uni.showModal({
-							    title: '鎻愮ず',
-							    content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵',
-							    success: (res) => {
-							        if (res.confirm) {
-							            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-							            uni.redirectTo({
-							                url: '/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=1'
-							            })
-							        } else if (res.cancel) {
-							            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-							            setTimeout(() => {
-							            	uni.navigateBack();
-							            }, 50)
-							        }
-							    }
+								title: '鎻愮ず',
+								content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵',
+								success: (res) => {
+									if (res.confirm) {
+										console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+										uni.redirectTo({
+											url: '/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=1'
+										})
+									} else if (res.cancel) {
+										console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+										setTimeout(() => {
+											uni.navigateBack();
+										}, 50)
+									}
+								}
 							});
 						} else {
 							return uni.showToast({
diff --git a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
index 62630ea..85e6af7 100644
--- a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -2002,9 +2002,9 @@
 									});
 								} else if (res.cancel) {
 									console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
-									// setTimeout(() => {
-									//     uni.navigateBack();
-									// }, 50)
+									setTimeout(() => {
+									    uni.navigateBack();
+									}, 50)
 								}
 							},
 						});
@@ -2340,7 +2340,7 @@
 		}
 
 		.btn-c {
-			background-color: #acacac;
+			background-color: #FFA500;
 			color: #fff;
 			// position: absolute;
 			// right: 120rpx;
diff --git a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
index c5f936a..3871e2d 100644
--- a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
+++ b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -2049,9 +2049,9 @@
 									});
 								} else if (res.cancel) {
 									console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
-									// setTimeout(() => {
-									//     uni.navigateBack();
-									// }, 50)
+									setTimeout(() => {
+									    uni.navigateBack();
+									}, 50)
 								}
 							},
 						});
@@ -2391,7 +2391,7 @@
 		}
 
 		.btn-c {
-			background-color: #acacac;
+			background-color: #FFA500;
 			color: #fff;
 			// position: absolute;
 			// right: 120rpx;
diff --git a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
index f6327d8..3d75603 100644
--- a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
+++ b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -1756,9 +1756,9 @@
 									});
 								} else if (res.cancel) {
 									console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
-									// setTimeout(() => {
-									//     uni.navigateBack();
-									// }, 50)
+									setTimeout(() => {
+									    uni.navigateBack();
+									}, 50)
 								}
 							},
 						});
@@ -2093,7 +2093,7 @@
 		}
 
 		.btn-c {
-			background-color: #acacac;
+			background-color: #FFA500;
 			color: #fff;
 			// position: absolute;
 			// right: 120rpx;

--
Gitblit v1.9.1