From 920675a9f1ccf311d32e6466ebde737dff765645 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 23 一月 2026 09:15:00 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue                           |  986 +
 pages/index/tab2.vue                                                             |   41 
 pages/MJGL/shangmudan/MouldUpperBill.vue                                         |  171 
 pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList.vue             |    2 
 pages/MJGL/Sb_EquipResumeCheckQuery/Sb_EquipResumeCheckQuery.vue                 |  213 
 pages/index/tab1.vue                                                             |    9 
 pages/ZLGL/mojianjianyan/ProcessCheckBill.vue                                    |  160 
 pages/MJGL/Sc_EquipmentProcessList/Sc_EquipmentProcess.vue                       |  221 
 pages/index/login.vue                                                            |  965 
 components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue                  |  389 
 pages/shebeiyunxingzhuangtai/detail.vue                                          | 1023 
 pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue                       | 1413 +-
 pages/ZLGL/shoujianjianyan/firstCheckBill.vue                                    | 4712 +++---
 components/BillListPopup/BillListPopupMouldConkBookBill.vue                      |    1 
 pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue                             |   59 
 utils/getuiUtils.js                                                              |   58 
 pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBillList.vue |   14 
 pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue                     | 4848 ++++---
 pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue                |   19 
 utils/WebSocketServices.js                                                       |   29 
 pages.json                                                                       | 3375 ++--
 pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList.vue                     |    6 
 pages/index/tab4.vue                                                             |    4 
 pages/MJGL/Sc_WorkDotCheck/Sc_WorkDotCheckBillList_Day.vue                       |  203 
 pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue                             | 2572 ++--
 pages/ZLGL/OA_WorkLink/OA_WorkLinkBill.vue                                       |  453 
 pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList.vue               |   91 
 pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue                                | 4213 +++---
 pages/index/tab3.vue                                                             |   78 
 pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue                 | 1740 +-
 pages/EmployeeRecords/EmployeeRecordsBillList.vue                                |   10 
 pages/MJGL/xiamodan/MouldLowerBill.vue                                           |   14 
 pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBillList.vue                         |   29 
 pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue                     |   26 
 pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue                          |   45 
 pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue     |   47 
 App.vue                                                                          |   54 
 pages/baogong/AddLineBind.vue                                                    |  849 
 pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue                         | 1553 +-
 pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBillList.vue                 |   14 
 pages/shebeilvli/EquipFileBillResume.vue                                         |  856 
 pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBillList.vue                       |  460 
 pages/index/mine.vue                                                             |    2 
 pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList.vue                   |  121 
 pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue                         |  197 
 pages/baogong/OA_ErrMsgBackBill.vue                                              |    9 
 pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai.vue                          |   87 
 pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue                         |   13 
 pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue                         |   68 
 pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList.vue                     |  111 
 pages/MJGL/Sb_EquipStop/Sb_EquipStopBill.vue                                     |  480 
 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue                 |    5 
 pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue                   | 1486 +-
 pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue                                  |  271 
 pages/MJGL/Sc_OEEStatusReport/Sc_OEEStatusReport.vue                             |  313 
 pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue                 |  366 
 manifest.json                                                                    |   40 
 pages/MJGL/Sb_EquipBegin/Sb_EquipBeginBill.vue                                   |  475 
 pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList.vue                     |  121 
 pages/EmployeeRecords/EmployeeRecordsBill.vue                                    |  186 
 components/BillListPopup/BillListPopupEquipConkBookBill.vue                      |  398 
 61 files changed, 20,926 insertions(+), 15,848 deletions(-)

diff --git a/App.vue b/App.vue
index 16c947d..540bc51 100644
--- a/App.vue
+++ b/App.vue
@@ -7,6 +7,7 @@
         getToken,
         getUserInfo
     } from "./utils/auth";
+    import getuiUtils from "./utils/getuiUtils";
     export default {
         onLaunch: function() {
             console.log('App Launch')
@@ -38,6 +39,36 @@
             //     });
             // }
             // #endif
+
+            // #ifdef APP-PLUS || APP
+            // 鐩戝惉 App 鍚姩鏃剁殑鎺ㄩ�佸弬鏁帮紙鍐峰惎鍔細App 鍏抽棴鍚庣偣鍑婚�氱煡鍚姩锛�
+            const launchOpts = plus.runtime.launchArguments;
+            if (launchOpts && launchOpts.payload) {
+                this.handlePushJump(launchOpts.payload); // 澶勭悊璺宠浆
+            }
+
+            // 鐩戝惉閫氱煡鐐瑰嚮浜嬩欢锛堢儹鍚姩锛欰pp 鍚庡彴杩愯鏃剁偣鍑婚�氱煡锛�
+            plus.push.addEventListener("click", (msg) => {
+                let payload = {};
+                console.log('msg: ', msg);
+                // 鍏煎涓嶅悓鏍煎紡鐨� payload锛堟湰鍦版帹閫� vs 杩滅▼鎺ㄩ�侊級
+                if (typeof msg.payload === "string") {
+                    payload = JSON.parse(msg.payload); // 杩滅▼鎺ㄩ�佸彲鑳芥槸瀛楃涓诧紝闇�瑙ｆ瀽
+                } else {
+                    payload = msg.payload; // 鏈湴鎺ㄩ�佹槸瀵硅薄
+                }
+                this.handlePushJump(payload); // 澶勭悊璺宠浆
+            });
+
+            // 涓帹v1鐗堟湰鍙兘閫氳繃閫忎紶浼犲弬
+            plus.push.addEventListener('receive', (msg) => {
+                console.log('鏀跺埌 V1 鐗堟湰閫忎紶娑堟伅锛�', msg);
+                // 浠呴�忎紶妯℃澘闇�瑕侊紙閫氱煡妯℃澘鏃犻渶澶勭悊锛�
+                if (msg.payload) {
+                    this.handlePushJump(msg.payload);
+                }
+            }, false);
+            // #endif
         },
         onShow: function() {
             console.log('App Show')
@@ -45,6 +76,29 @@
         },
         onHide: function() {
             console.log('App Hide')
+        },
+        methods: {
+            // 澶勭悊閫氱煡璺宠浆閫昏緫
+            handlePushJump(payload) {
+                console.log('payload-enter: ', payload);
+                if (!payload || !payload.pagePath) return;
+
+                // 纭繚 App 澶勪簬鍓嶅彴
+                // plus.runtime.foreground();
+
+                // 璺宠浆鍒版寚瀹氶〉闈�
+                setTimeout(() => {
+                    uni.navigateTo({
+                        url: `${payload.pagePath}?itemId=${payload.itemId}`, // 鎼哄甫鍙傛暟
+                        fail: (err) => {
+                            // 鑻ラ〉闈㈡爤婊★紙鏈�澶�10灞傦級锛屼娇鐢� redirectTo 鏇挎崲褰撳墠椤甸潰
+                            uni.redirectTo({
+                                url: `${payload.pagePath}?itemId=${payload.itemId}`,
+                            });
+                        }
+                    });
+                }, 300)
+            }
         }
     }
 </script>
diff --git a/components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue b/components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue
new file mode 100644
index 0000000..c03ebd4
--- /dev/null
+++ b/components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue
@@ -0,0 +1,389 @@
+<template>
+	<view>
+		<uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
+			<view class="content">
+				<view class="search-condition">
+					<view class="title"><text>鏃ユ湡: </text></view>
+					<view class="daterange" style="flex: 1;">
+						<view class="right general">
+							<uni-datetime-picker type="date" :clear-icon="false" v-model="HBeginDate">
+								<view>{{HBeginDate}}</view>
+							</uni-datetime-picker>
+						</view>
+						<view>鈥�</view>
+						<view class="right general">
+							<uni-datetime-picker type="date" :clear-icon="false" v-model="HEndDate">
+								<view>{{HEndDate}}</view>
+							</uni-datetime-picker>
+						</view>
+					</view>
+				</view>
+				<!-- 淇濇寔涓庢晠闅滅櫥璁板崟鐩稿悓鐨勬悳绱㈡潯浠� -->
+				<view class="search-condition">
+					<view class="title"><text>妯″叿缂栫爜: </text></view>
+					<view class="right"><input type="text" :focus="enablefocus" v-model="HNumber"
+							@confirm="getRepairRecordList" /></view>
+				</view>
+				<view class="search-condition">
+					<view class="title"><text>妯″叿鍚嶇О: </text></view>
+					<view class="right"><input type="text" v-model="HName" @confirm="getRepairRecordList" /></view>
+				</view>
+				<view class="search-condition">
+					<view class="title"><text>鍗曟嵁鍙�: </text></view>
+					<view class="right"><input type="text" v-model="HBillNo" @confirm="getRepairRecordList" /></view>
+				</view>
+				<view class="buttons">
+					<view style="flex: 1;"></view>
+					<button size="mini" type="primary" @click="search">鎼滅储</button>
+					<button size="mini" type="primary" @click="exit">閫�鍑�</button>
+				</view>
+				<scroll-view id="#BillListPanel" scroll-y="true" style="height: 50vh;">
+					<view class="options-wrapper" v-show="HRepairRecordList.length != 0">
+						<uni-card :is-active="record.isActive" :class="record.isActive?'uni-card--is-active':''"
+							v-for="(record, index) in HRepairRecordList[curPage-1]" :key="index"
+							:title="record['鍗曟嵁鍙�'] || record['HBillNo'] || record['缁翠慨鍗曞彿']"
+							@tap="clickCard(record, index)">
+							<view class="item">
+								<view class="left">鏃ユ湡: </view>
+								<view class="right">
+									{{dayjs(record['鏃ユ湡'] || record['缁翠慨鏃ユ湡'] || record['HDate']).format('YYYY-MM-DD')}}
+								</view>
+							</view>
+							<view class="item" v-if="record['妯″叿缂栫爜'] || record['HMouldCode']">
+								<view class="left">妯″叿缂栫爜: </view>
+								<view class="right">{{record['浜у搧妯″叿浠ｇ爜'] || record['HMouldCode']}}</view>
+							</view>
+							<view class="item" v-if="record['妯″叿鍚嶇О'] || record['HMouldName']">
+								<view class="left">妯″叿鍚嶇О: </view>
+								<view class="right">{{record['浜у搧妯″叿'] || record['HMouldName']}}</view>
+							</view>
+							<view class="item" v-if="record['妯″叿瑙勬牸'] || record['HMouldSpec']">
+								<view class="left">妯″叿瑙勬牸: </view>
+								<view class="right">{{record['妯″叿瑙勬牸'] || record['HMouldSpec']}}</view>
+							</view>
+							<view class="item" v-if="record['妯″叿鍨嬪彿'] || record['HMouldModel']">
+								<view class="left">妯″叿鍨嬪彿: </view>
+								<view class="right">{{record['妯″叿鍨嬪彿'] || record['HMouldModel']}}</view>
+							</view>
+							<view class="item" v-if="record['缁翠慨鍗曞彿'] || record['HRepairNo']">
+								<view class="left">缁翠慨鍗曞彿: </view>
+								<view class="right">{{record['缁翠慨鍗曞彿'] || record['HRepairNo']}}</view>
+							</view>
+							<view class="item" v-if="record['缁翠慨鍐呭'] || record['HRepairContent']">
+								<view class="left">缁翠慨鍐呭: </view>
+								<view class="right">{{record['缁翠慨鍐呭'] || record['HRepairContent']}}</view>
+							</view>
+							<view class="item" v-if="record['缁翠慨浜�'] || record['HEmpName']">
+								<view class="left">缁翠慨浜�: </view>
+								<view class="right">{{record['缁翠慨浜�'] || record['HEmpName']}}</view>
+							</view>
+							<view class="item" v-if="record['缁翠慨浜�'] || record['HStatus']">
+								<view class="left">缁翠慨浜�: </view>
+								<view class="right">{{record['缁翠慨浜�'] || record['HStatus']}}</view>
+							</view>
+						</uni-card>
+					</view>
+					<view class="over" v-show="HRepairRecordList.length == 0">鏆傛棤鏁版嵁</view>
+				</scroll-view>
+				<uni-pagination id="#pagination" title="鏍囬鏂囧瓧" v-model="curPage" :pageSize="size"
+					:total="length"></uni-pagination>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import dayjs from 'dayjs';
+	import {
+		CommonUtils
+	} from '../../utils/common';
+	import {
+		getUserInfo
+	} from '../../utils/auth';
+	export default {
+		name: "RepairRecordPopup",
+		data() {
+			return {
+				dayjs: dayjs,
+				enablefocus: false,
+				size: 20,
+				curPage: 1,
+				length: 0,
+				page: 0,
+				HMouldID: 0, // 褰撳墠閫夋嫨鐨勬ā鍏稩D
+				HRepairRecordList: [],
+
+				// 鎼滅储鏉′欢 - 涓庢晠闅滅櫥璁板崟淇濇寔涓�鑷�
+				HBeginDate: dayjs(new Date()).subtract(30, 'd').format("YYYY-MM-DD"),
+				HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+				HNumber: '',
+				HName: '',
+				HBillNo: '',
+
+			};
+		},
+		props: {
+			HBillType: {
+				type: [String, Number],
+				required: true
+			},
+			HStockOrgID: {
+				type: [String, Number],
+				required: true
+			},
+			// 鏂板涓�涓槸鍚︽樉绀烘ā鍏蜂俊鎭殑鍙傛暟
+			showMouldInfo: {
+				type: Boolean,
+				default: true
+			}
+		},
+		methods: {
+			popupChangeHandler(e) {
+				if (e.show === true) {
+					this.getRepairRecordList()
+				}
+			},
+			async exit() {
+				this.resetSearchConditions();
+				await this.$nextTick();
+				this.$refs.popup.close();
+			},
+
+			resetSearchConditions() {
+				this.size = 20;
+				this.curPage = 1;
+				this.length = 0;
+				this.page = 0;
+				this.HRepairRecordList = [];
+				this.enablefocus = false;
+
+				// 閲嶇疆鎼滅储鏉′欢
+				this.HBeginDate = dayjs(new Date()).subtract(30, 'd').format("YYYY-MM-DD");
+				this.HEndDate = dayjs(new Date()).format("YYYY-MM-DD");
+				this.HNumber = '';
+				this.HName = '';
+				this.HBillNo = '';
+				this.HRepairNo = '';
+				this.HRepairContent = '';
+				this.HRepairStatus = '';
+			},
+
+			showPopup(HMouldID) {
+				this.HMouldID = HMouldID || 0;
+				this.resetSearchConditions();
+				this.$refs.popup.open();
+			},
+
+			search() {
+				this.getRepairRecordList();
+			},
+
+			repairStatusChange(e) {
+				const index = e.detail.value;
+				if (index == 0) {
+					this.HRepairStatus = ''; // 鍏ㄩ儴
+				} else {
+					this.HRepairStatus = this.repairStatusOptions[index];
+				}
+			},
+
+			clickCard(record, index) {
+				// 鍙戦�侀�夋嫨瀹屾垚浜嬩欢
+				uni.$emit('RepairRecordSelectComplete', {
+					HInterID: record["hmainid"],
+					HEntryID: record["hsubid"] || record["HEntryID"] || 0,
+					HBillNo: record["鍗曟嵁鍙�"] || record["HBillNo"] || "",
+					HMouldID: record['HMouldID'] || this.HMouldID || 0,
+					HMouldName: record['浜у搧妯″叿'],
+					HMouldCode: record['浜у搧妯″叿浠ｇ爜'],
+					HMouldSpec: record['妯″叿瑙勬牸'],
+					HMouldModel: record['妯″叿鍨嬪彿']
+				});
+			},
+
+			getsWhere() {
+				let sWhere = '';
+
+				// 鏃ユ湡鑼冨洿鏉′欢 - 涓庢晠闅滅櫥璁板崟淇濇寔涓�鑷�
+				if (this.HBeginDate && this.HEndDate) {
+					sWhere += ` and (CONVERT(varchar(100),鏃ユ湡, 23) between '${this.HBeginDate}' and '${this.HEndDate}') `;
+				}
+				// 妯″叿ID鏉′欢 - 濡傛灉浼犲叆浜嗘ā鍏稩D
+				if (this.HMouldID) {
+					sWhere += ` and HMouldID = ${this.HMouldID} `;
+				}
+				// 妯″叿缂栫爜鏉′欢 
+				if (this.HNumber) {
+					sWhere += ` and (浜у搧妯″叿浠ｇ爜 like '%${this.HNumber}%'  `;
+				}
+				// 妯″叿鍚嶇О鏉′欢 
+				if (this.HName) {
+					sWhere += ` and (浜у搧妯″叿 like '%${this.HName}%' `;
+				}
+				// 鍗曟嵁鍙锋潯浠� 
+				if (this.HBillNo) {
+					sWhere += ` and (鍗曟嵁鍙� like '%${this.HBillNo}%'  `;
+				}
+				sWhere += ` and isnull(缁翠慨浜�,'')!='${uni.getStorageSync('HUserName')}$'  `
+				sWhere += ` and isnull(鍏抽棴浜�,'')!=''  `
+				return sWhere;
+			},
+
+			getRepairRecordList() {
+				this.HRepairRecordList = [];
+				this.length = 0;
+				this.page = 0;
+				this.curPage = 1;
+
+				// 璋冪敤缁翠慨璁板綍鍒楄〃鎺ュ彛
+				CommonUtils.doRequest(
+					"/Sb_MouldRepairWorkBill/GetMouldRepairWorkBill_PDA", { // 璇锋牴鎹疄闄呮儏鍐佃皟鏁存帴鍙ｈ矾寰�
+						sWhere: this.getsWhere(),
+						user: getUserInfo()["Czymc"]
+					},
+					(res) => {
+						let {
+							data,
+							count,
+							Message
+						} = res.data;
+						if (count == 1) {
+							this.length = Array.from(data).length;
+							const result = [];
+							for (let i = 0; i < data.length; i += this.size) {
+								result.push(data.slice(i, i + this.size));
+							}
+							this.HRepairRecordList = result;
+							this.page = result.length;
+							setTimeout(() => {
+								this.enablefocus = true;
+							}, 500);
+						} else {
+							setTimeout(() => {
+								this.enablefocus = true;
+							}, 500);
+							uni.showToast({
+								icon: 'none',
+								title: Message || '鏆傛棤缁翠慨璁板綍鏁版嵁'
+							});
+						}
+					},
+					(err) => {
+						setTimeout(() => {
+							this.enablefocus = true;
+						}, 500);
+						uni.showToast({
+							icon: 'none',
+							title: '鍔犺浇澶辫触: ' + (err.message || '鏈煡閿欒')
+						});
+					}
+				);
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		box-sizing: border-box;
+		border-radius: 15rpx 15rpx 0 0;
+		padding: 20rpx 20rpx 40rpx 20rpx;
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+		gap: 10rpx;
+
+		.search-condition {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			gap: 20rpx;
+			font-size: 30rpx;
+
+			.title {
+				width: 5rem;
+				text-align: right;
+			}
+
+			.right {
+				flex: 1;
+				border-radius: 22rpx;
+				border: 1px solid #acacac;
+				height: auto;
+				padding: 8rpx 16rpx;
+
+				input {
+					width: 100%;
+					font-size: 30rpx;
+				}
+
+				picker {
+					width: 100%;
+					font-size: 30rpx;
+					line-height: 1.5;
+				}
+			}
+		}
+
+		.buttons {
+			display: flex;
+			flex-direction: row;
+			gap: 20rpx;
+			justify-content: flex-end;
+
+			>button {
+				display: inline-flex;
+				width: 4rem;
+			}
+		}
+
+		.options-wrapper {
+			padding: 20rpx;
+			display: grid;
+			grid-template-columns: repeat(1, 1fr);
+			gap: 20rpx;
+
+			>view {
+				margin: 0 !important;
+				box-sizing: border-box;
+
+			}
+
+			.item {
+				.left {
+					display: inline-block;
+					width: 6rem;
+					font-size: 26rpx;
+					color: #666;
+				}
+
+				.right {
+					display: inline-block;
+					font-size: 28rpx;
+					color: #333;
+					word-break: break-all;
+				}
+			}
+		}
+
+		.uni-card--is-active {
+			background-color: rgba(0, 122, 255, 0.2);
+		}
+
+		.daterange {
+			display: flex;
+			flex-direction: row;
+			gap: 10rpx;
+			justify-content: center;
+			align-items: center;
+
+		}
+
+		.over {
+			text-align: center;
+			padding: 100rpx 0;
+			color: #999;
+			font-size: 28rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/BillListPopup/BillListPopupEquipConkBookBill.vue b/components/BillListPopup/BillListPopupEquipConkBookBill.vue
new file mode 100644
index 0000000..2d28518
--- /dev/null
+++ b/components/BillListPopup/BillListPopupEquipConkBookBill.vue
@@ -0,0 +1,398 @@
+<template>
+	<view>
+		<uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
+			<view class="content">
+				<view class="search-condition">
+					<view class="title"><text>鏃ユ湡: </text></view>
+					<view class="daterange" style="flex: 1;">
+						<view class="right general">
+							<uni-datetime-picker type="date" :clear-icon="false" v-model="HBeginDate">
+								<view>{{HBeginDate}}</view>
+							</uni-datetime-picker>
+						</view>
+						<view>鈥�</view>
+						<view class="right general">
+							<uni-datetime-picker type="date" :clear-icon="false" v-model="HEndDate">
+								<view>{{HEndDate}}</view>
+							</uni-datetime-picker>
+						</view>
+					</view>
+				</view>
+				<view class="search-condition">
+					<view class="title"><text>璁惧浠ｇ爜: </text></view>
+					<view class="right"><input type="text" :focus="enablefocus" v-model="HNumber"
+							@confirm="getBillList" /></view>
+				</view>
+				<view class="search-condition">
+					<view class="title"><text>璁惧鍚嶇О: </text></view>
+					<view class="right"><input type="text" v-model="HName" @confirm="getBillList" /></view>
+				</view>
+				<view class="search-condition">
+					<view class="title"><text>鍗曟嵁鍙�: </text></view>
+					<view class="right"><input type="text" v-model="HBillNo" @confirm="getBillList" /></view>
+				</view>
+				<view class="buttons">
+					<view style="flex: 1;"></view>
+					<button size="mini" type="primary" @click="search">鎼滅储</button>
+					<button v-if="MultiSourceBill" size="mini" type="primary" @click="ret">杩斿洖</button>
+					<button size="mini" type="primary" @click="exit">閫�鍑�</button>
+				</view>
+				<scroll-view id="#BillListPanel" scroll-y="true" style="height: 55vh;">
+					<view class="options-wrapper" v-show="HBillList.length != 0">
+						<uni-card :is-active="bill.isActive" :class="bill.isActive?'uni-card--is-active':''"
+							v-for="(bill, index) in HBillList[curPage-1]" :key="index" :title="bill['鍗曟嵁鍙�']"
+							@tap="clickCard(bill, index)">
+							<view class="item">
+								<view class="left">鏃ユ湡: </view>
+								<view class="right">{{dayjs(bill['鏃ユ湡']).format('YYYY-MM-DD')}}</view>
+							</view>
+							<view class="item" v-if="bill['璁惧浠ｇ爜']">
+								<view class="left">璁惧浠ｇ爜: </view>
+								<view class="right">{{bill['璁惧浠ｇ爜']}}</view>
+							</view>
+							<view class="item" v-if="bill['璁惧鍚嶇О']">
+								<view class="left">璁惧鍚嶇О: </view>
+								<view class="right">{{bill['璁惧鍚嶇О']}}</view>
+							</view>
+							<view class="item" v-if="bill['鍙戠幇浜�']">
+								<view class="left">鍙戠幇浜�: </view>
+								<view class="right">{{bill['鍙戠幇浜�']}}</view>
+							</view>
+							<view class="item" v-if="bill['缁翠慨浜�']">
+								<view class="left">缁翠慨浜�: </view>
+								<view class="right">{{bill['缁翠慨浜�']}}</view>
+							</view>
+							<view class="item" v-if="bill['璐熻矗浜�']">
+								<view class="left">璐熻矗浜�: </view>
+								<view class="right">{{bill['璐熻矗浜�']}}</view>
+							</view>
+							<view class="item" v-if="bill['鏁呴殰绫诲埆']">
+								<view class="left">鏁呴殰绫诲埆: </view>
+								<view class="right">{{bill['鏁呴殰绫诲埆']}}</view>
+							</view>
+							<view class="item" v-if="bill['缁翠慨椤圭洰']">
+								<view class="left">缁翠慨椤圭洰: </view>
+								<view class="right">{{bill['缁翠慨椤圭洰']}}</view>
+							</view>
+							<view class="item" v-if="bill['鏁呴殰鍙戠敓鏃ユ湡']">
+								<view class="left">鏁呴殰鍙戠敓鏃ユ湡: </view>
+								<view class="right">{{dayjs(bill['鍙戠敓鏃ユ湡']).format('YYYY-MM-DD')}}</view>
+							</view>
+						</uni-card>
+					</view>
+					<view class="over" v-show="HBillList.length == 0">鏆傛棤鏁版嵁</view>
+				</scroll-view>
+				<uni-pagination id="#pagination" title="鏍囬鏂囧瓧" v-model="curPage" :pageSize="size"
+					:total="length"></uni-pagination>
+			</view>
+
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import dayjs from 'dayjs';
+	import {
+		CommonUtils
+	} from '../../utils/common';
+	import {
+		getUserInfo
+	} from '../../utils/auth';
+	export default {
+		name: "BillListPopup",
+		data() {
+			return {
+				dayjs: dayjs,
+				enablefocus: false,
+				size: 20,
+				curPage: 1,
+				length: 0,
+				page: 0,
+				HSourceBillNo: '',
+				HMater: '',
+				HCustom: '',
+				HBillList: [],
+				panelHeight: 0,
+				HBeginDate: dayjs(new Date()).subtract(30, 'd').format("YYYY-MM-DD"),
+				HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+				HNumber: '',
+				HName: '',
+				HBillNo: '',
+
+				multiSouceBillList: []
+			};
+		},
+		props: {
+			HBillType: {
+				type: [String, Number],
+				required: true
+			},
+			HSourceBillType: {
+				type: [String, Number],
+				required: true
+			},
+			HStockOrgID: {
+				type: [String, Number],
+				required: true
+			},
+			MultiSourceBill: {
+				type: Boolean,
+				default: false,
+				required: false
+			}
+		},
+		model: {
+			prop: "HSourceBill",
+			event: 'change'
+		},
+		methods: {
+			popupChangeHandler(e) {
+				if (e.show === true) {
+					this.getBillList()
+				}
+			},
+			async exit() {
+				this.size = 20
+				this.curPage = 1
+				this.length = 0
+				this.page = 0
+				this.HSourceBillNo = ''
+				this.HMater = ''
+				this.HCustom = ''
+				this.HBillList = []
+				this.enablefocus = false
+				this.multiSouceBillList = []
+				// 闇�瑕佺瓑寰呴〉闈㈠唴鐨勬暟鎹祴鍊煎畬姣�
+				await this.$nextTick()
+				this.$refs.popup.close();
+			},
+			search() {
+				this.getBillList()
+			},
+			ret() {
+				console.log('this.MultiSourceBill: ', this.MultiSourceBill);
+				uni.$emit('BillSelectComplete', {
+					HInterID: 0,
+					HBillNo: 0,
+					enableMultiSourceBill: this.MultiSourceBill,
+					MultiSourceBillList: this.multiSouceBillList
+				})
+			},
+			showPopup() {
+				this.$refs.popup.open();
+			},
+			clickCard(bill, index) {
+				if (this.MultiSourceBill == false) { // 闈炲婧愬崟妯″紡
+					uni.$emit('BillSelectComplete', {
+						HInterID: bill["hmainid"],
+						HEntryID: bill["hsubid"],
+						HBillNo: bill["鍗曟嵁鍙�"],
+						HEquipID: bill["HEquipID"],
+						HEquipNumber: bill['璁惧浠ｇ爜'],
+						HEquipName: bill['璁惧鍚嶇О'],
+						HEquipSpec: bill['妯″叿瑙勬牸'],
+						HEquipModel: bill['妯″叿鍨嬪彿'],
+						enableMultiSourceBill: this.MultiSourceBill
+					})
+				} else {
+					this.$set(this.HBillList[this.curPage - 1][index], 'isActive', !this.HBillList[this.curPage - 1][
+						index
+					]['isActive'])
+					console.log(this.HBillList[this.curPage - 1][index])
+					// 璁剧疆浜嗗婧愬崟妯″紡
+					this.setMultiSourceBillList({
+						HInterID: interid,
+						HBillNo: billno,
+						HIsActive: this.HBillList[this.curPage - 1][index]['isActive']
+					})
+				}
+
+				// this.exit()
+			},
+			setMultiSourceBillList(billInfo) {
+				let index = this.multiSouceBillList.findIndex(item => item.HInterID == billInfo.HInterID)
+				if (index == -1) {
+					billInfo['count'] = 1
+					this.multiSouceBillList.push(billInfo)
+				} else {
+					if (billInfo.HIsActive) {
+						// 濡傛灉瀵瑰簲鍗曟嵁浼犲叆鐨勬槸鍚︽縺娲绘暟鏄痶rue锛屽垯璁℃暟鍣�+1
+						this.multiSouceBillList[index]['count']++;
+					} else {
+						// 濡傛灉瀵瑰簲鍗曟嵁浼犲叆鐨勬槸鍚︽縺娲绘暟鏄痜alse锛屽垯璁℃暟鍣�-1
+						this.multiSouceBillList[index]['count']--;
+					}
+					if (this.multiSouceBillList[index]['count'] == 0) {
+						// 娌℃湁閫変腑鐨勫崟鎹紝鍒欑Щ闄ょ紦瀛樹腑鐨勬暟鎹�
+						this.multiSouceBillList.splice(index, 1)
+					}
+				}
+				console.log('this.multiSouceBillList: ', this.multiSouceBillList);
+			},
+			getsWhere() {
+				let sWhere = ''
+				if (this.HBeginDate && this.HEndDate) {
+					sWhere += ` and  CONVERT(varchar(100),鏃ユ湡, 23) between '${this.HBeginDate}' and '${this.HEndDate}'`
+				}
+
+
+				if (this.HNumber) {
+					sWhere += ` and 璁惧浠ｇ爜 like '%${this.HNumber}%'`
+				}
+
+				if (this.HName) {
+					sWhere += ` and 璁惧鍚嶇О like '%${this.HName}%'`
+				}
+
+				if (this.HBillNo) {
+					sWhere += ` and 鍗曟嵁鍙� like '%${this.HBillNo}%'`
+				}
+				if (this.HSourceBillType === '璁惧缁翠慨璁板綍鍗�') {
+					sWhere += ` and isnull(缁翠慨浜�,'')!='${uni.getStorageSync('HUserName')}$'  `
+				}
+				sWhere += ` and isnull(鍏抽棴浜�,'')!=''  `
+				
+				
+				return sWhere
+			},
+			getBillList() {
+				this.HBillList = []
+				this.length = 0
+				this.page = 0
+				this.curPage = 1
+
+				let type = "GZ"; // 榛樿鏄晠闅滃崟
+
+				if (this.HSourceBillType === '璁惧缁翠慨鐧昏鍗�') {
+					type = "GZ";
+				} else if (this.HSourceBillType === '璁惧缁翠慨娲惧伐鍗�') {
+					type = "PG";
+				} else if (this.HSourceBillType === '璁惧缁翠慨璁板綍鍗�') {
+					type = "WX";
+				}
+
+				CommonUtils.doRequest(
+					"/Web/GetEquipmentBillsList", {
+						sWhere: this.getsWhere(),
+						Type: type,
+						user: getUserInfo()["Czymc"]
+					},
+					(res) => {
+						let {
+							data,
+							count,
+							Message
+						} = res.data
+						if (count == 1) {
+							this.length = Array.from(data).length
+							const result = [];
+							for (let i = 0; i < data.length; i += this.size) {
+								result.push(data.slice(i, i + this.size));
+							}
+							this.HBillList = result
+							this.page = result.length
+							setTimeout(() => {
+								this.enablefocus = true
+							}, 500)
+						} else {
+							setTimeout(() => {
+								this.enablefocus = true
+							}, 500)
+							uni.showToast({
+								icon: 'none',
+								title: Message
+							})
+						}
+					}
+				)
+			},
+		},
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		box-sizing: border-box;
+		border-radius: 15rpx 15rpx 0 0;
+		padding: 20rpx 20rpx 40rpx 20rpx;
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+		gap: 10rpx;
+
+		.search-condition {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			gap: 20rpx;
+			font-size: 30rpx;
+
+			.title {
+				width: 5rem;
+				text-align: right;
+			}
+
+			.right {
+				flex: 1;
+				border-radius: 22rpx;
+				border: 1px solid #acacac;
+				height: auto;
+				padding: 8rpx 16rpx;
+
+				input {
+					width: 100%;
+					font-size: 30rpx;
+				}
+			}
+		}
+
+		.buttons {
+			display: flex;
+			flex-direction: row;
+			gap: 20rpx;
+			justify-content: flex-end;
+
+			>button {
+				display: inline-flex;
+				width: 4rem;
+			}
+		}
+
+		.options-wrapper {
+			padding: 20rpx;
+			display: grid;
+			grid-template-columns: repeat(1, 1fr);
+			gap: 20rpx;
+
+			>view {
+				margin: 0 !important;
+				box-sizing: border-box;
+
+			}
+
+			.item {
+				.left {
+					display: inline-block;
+					width: 6rem;
+				}
+
+				.right {
+					display: inline-block;
+				}
+			}
+		}
+
+		.uni-card--is-active {
+			background-color: rgba(0, 122, 255, 0.2);
+		}
+
+		.daterange {
+			display: flex;
+			flex-direction: row;
+			gap: 10rpx;
+			justify-content: center;
+			align-items: center;
+
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/BillListPopup/BillListPopupMouldConkBookBill.vue b/components/BillListPopup/BillListPopupMouldConkBookBill.vue
index a7237af..d2ea0f6 100644
--- a/components/BillListPopup/BillListPopupMouldConkBookBill.vue
+++ b/components/BillListPopup/BillListPopupMouldConkBookBill.vue
@@ -246,6 +246,7 @@
                 if (this.HBillNo) {
                     sWhere += ` and 鍗曟嵁鍙� like '%${this.HBillNo}%'`
                 }
+				sWhere += ` and isnull(鍏抽棴浜�,'')!=''  `
                 return sWhere
             },
             getBillList() {
diff --git a/manifest.json b/manifest.json
index f78ad7d..8a9e5a3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "鏅轰簯LMES",
     "appid" : "__UNI__B002F49",
     "description" : "",
-    "versionName" : "2.0.58",
-    "versionCode" : 258,
+    "versionName" : "2.0.60",
+    "versionCode" : 260,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
@@ -52,10 +52,24 @@
                     "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>"
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.BROADCAST_PACKAGE_ADDED\"/>",
+                    "<uses-permission android:name=\"android.permission.BROADCAST_PACKAGE_CHANGED\"/>",
+                    "<uses-permission android:name=\"android.permission.BROADCAST_PACKAGE_INSTALL\"/>",
+                    "<uses-permission android:name=\"android.permission.BROADCAST_PACKAGE_REPLACED\"/>",
+                    "<uses-permission android:name=\"android.permission.RESTART_PACKAGES\"/>",
+                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
-                "minSdkVersion" : 23
+                "minSdkVersion" : 23,
+                "excludePermissions" : []
             },
             /* ios鎵撳寘閰嶇疆 */
             "ios" : {
@@ -63,7 +77,20 @@
             },
             /* SDK閰嶇疆 */
             "sdkConfigs" : {
-                "ad" : {}
+                "ad" : {},
+                "push" : {
+                    "unipush" : {
+                        "icons" : {
+                            "small" : {
+                                "ldpi" : "static/logo_icon.png",
+                                "mdpi" : "static/logo_icon.png",
+                                "hdpi" : "static/logo_icon.png",
+                                "xhdpi" : "static/logo_icon.png",
+                                "xxhdpi" : "static/logo_icon.png"
+                            }
+                        }
+                    }
+                }
             },
             "icons" : {
                 "android" : {
@@ -174,3 +201,6 @@
     "locale" : "zh-Hans",
     "fallbackLocale" : "zh-Hans"
 }
+//docs.getui.com/getui/question/sdk/ -->
+/* ios鎵撳寘閰嶇疆 *//* SDK閰嶇疆 */
+
diff --git a/pages.json b/pages.json
index 0424b2f..64a4f5c 100644
--- a/pages.json
+++ b/pages.json
@@ -1,1675 +1,1742 @@
 {
-	"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/index/login",
-			"style": {
-				"navigationBarTitleText": "鐧诲綍",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "棣栭〉",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/index/tab1",
-			"style": {
-				"navigationBarTitleText": "杞﹂棿宸ュ簭"
-			}
-		},
-		{
-			"path": "pages/index/tab2",
-			"style": {
-				"navigationBarTitleText": "鍗曟嵁鍒楄〃"
-			}
-		},
-		{
-			"path": "pages/index/tab3",
-			"style": {
-				"navigationBarTitleText": "鍣ㄥ叿绠＄悊"
-			}
-		},
-		{
-			"path": "pages/index/tab4",
-			"style": {
-				"navigationBarTitleText": "璐ㄩ噺绠＄悊"
-			}
-		},
-		{
-			"path": "pages/index/mine",
-			"style": {
-				"navigationBarTitleText": "涓汉涓績",
-				// "navigationStyle": "custom"
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#65a2fb"
-			}
-		},
-		{
-			"path": "pages/shebeilvli/deviceStatueAnalysis",
-			"style": {
-				"navigationBarTitleText": "璁惧鐘舵�佸垎鏋�"
-			}
-		},
-		{
-			"path": "pages/shebeilvli/EquipFileBillResume",
-			"style": {
-				"navigationBarTitleText": "璁惧灞ュ巻",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeilvli/EquipFileBillResume_son",
-			"style": {
-				"navigationBarTitleText": "璁惧灞ュ巻瀛愯〃"
-			}
-		},
-		{
-			"path": "pages/baoyangjihua/Sb_EquipMaintainPlanEdit",
-			"style": {
-				"navigationBarTitleText": "璁惧淇濆吇璁″垝鍗�"
-			}
-		},
-		{
-			"path": "pages/baoyangjihua/Sb_EquipMaintainPlanList",
-			"style": {
-				"navigationBarTitleText": "璁惧淇濆吇璁″垝鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/baoyangjihua/Sb_EquipMaintainPlanList_son",
-			"style": {
-				"navigationBarTitleText": "淇濆吇璁″垝瀛愯〃"
-			}
-		},
-		{
-			"path": "pages/baoyangjilu/Sb_EquipMaintainRuleEdit",
-			"style": {
-				"navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�"
-			}
-		},
-		{
-			"path": "pages/baoyangjilu/Sb_EquipMaintainRuleList",
-			"style": {
-				"navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/baoyangjilu/Sb_EquipMaintainRuleList_son",
-			"style": {
-				"navigationBarTitleText": "淇濆吇璁板綍瀛愯〃"
-			}
-		},
-		{
-			"path": "pages/guzhangdengji/EqpConkBookBill",
-			"style": {
-				"navigationBarTitleText": "璁惧鏁呴殰鐧昏琛�"
-			}
-		},
-		{
-			"path": "pages/guzhangdengji/EqpConkBookBillList",
-			"style": {
-				"navigationBarTitleText": "璁惧鏁呴殰鐧昏琛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeidangan/Gy_EquipFileMainBill",
-			"style": {
-				"navigationBarTitleText": "璁惧妗ｆ"
-			}
-		},
-		{
-			"path": "pages/shebeidangan/Gy_EquipFileMainBillList",
-			"style": {
-				"navigationBarTitleText": "璁惧妗ｆ",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeiweixiu/Sb_Add_EqpMaintenanceBillList",
-			"style": {
-				"navigationBarTitleText": "璁惧缁翠慨璁板綍鍗�"
-			}
-		},
-		{
-			"path": "pages/shebeiweixiu/SbEqpMaintenanceBillList",
-			"style": {
-				"navigationBarTitleText": "璁惧缁翠慨璁板綍鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwaigxOut/firstCheck",
-			"style": {
-				"navigationBarTitleText": "棣栦欢妫�楠屽崟",
-				"enablePullDownRefresh": true
-			}
-		}, {
-			"path": "pages/gongxuIn/Cj_StationInBill",
-			"style": {
-				"navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�"
-			}
-		},
-		{
-			"path": "pages/gongxuIn/Cj_StationInBillList",
-			"style": {
-				"navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�",
-				"enablePullDownRefresh": true
-			}
-		}, {
-			"path": "pages/gongxuOut/Cj_StationOutBill",
-			"style": {
-				"navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�"
-			}
-		},
-		{
-			"path": "pages/gongxuOut/Cj_StationOutBillList",
-			"style": {
-				"navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/gongxuOutSendWork/gongxuOutSendWorkBill",
-			"style": {
-				"navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�(娲惧伐)",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/gongxuOut/moneystatistics",
-			"style": {
-				"navigationBarTitleText": "鎴戠殑宸ヨ祫(姹囨姤棰勪及)",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeiguanli/deviceManage",
-			"style": {
-				"navigationBarTitleText": "璁惧绠＄悊",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeiguanli/deviceManageList",
-			"style": {
-				"navigationBarTitleText": "璁惧绠＄悊",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeiguanli/ticketList",
-			"style": {
-				"navigationBarTitleText": "宸ュ崟鍒楄〃",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/baogong/ProductReportStepBillList",
-			"style": {
-				"navigationBarTitleText": "浜ч噺姹囨姤鍗�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/baogong/IpadIndex",
-			"style": {
-				"navigationBarTitleText": "鎶ュ伐骞冲彴",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/baogong/DayPlanBillList",
-			"style": {
-				"navigationBarTitleText": "宸ュ崟鍒楄〃",
-				"enablePullDownRefresh": true
-			}
-		},
-		// {
-		// 	"path": "pages/baogong/OA_ErrMsgBackBill",
-		// 	"style": {
-		// 		"navigationBarTitleText": "寮傚父鍙嶉鍗�",
-		// 		"enablePullDownRefresh": false
-		// 	}
-		// },
-		{
-			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBillList",
-			"style": {
-				"navigationBarTitleText": "寮傚父鍙嶉鍗曞垪琛�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill",
-			"style": {
-				"navigationBarTitleText": "寮傚父鍙嶉鍗�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBillList",
-			"style": {
-				"navigationBarTitleText": "寮傚父鍙嶉鎺ユ敹鍗曞垪琛�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill",
-			"style": {
-				"navigationBarTitleText": "寮傚父鍙嶉鎺ユ敹鍗�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBillList",
-			"style": {
-				"navigationBarTitleText": "寮傚父鍙嶉绛惧埌鍗曞垪琛�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill",
-			"style": {
-				"navigationBarTitleText": "寮傚父鍙嶉绛惧埌鍗�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBillList",
-			"style": {
-				"navigationBarTitleText": "寮傚父鍙嶉澶勭悊鍗曞垪琛�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill",
-			"style": {
-				"navigationBarTitleText": "寮傚父鍙嶉澶勭悊鍗�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBillList",
-			"style": {
-				"navigationBarTitleText": "寮傚父鍙嶉楠屾敹鍗曞垪琛�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill",
-			"style": {
-				"navigationBarTitleText": "寮傚父鍙嶉楠屾敹鍗�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList",
-			"style": {
-				"navigationBarTitleText": "寮傚父鍙嶉寰呭鐞嗗垪琛�",
-				"enablePullDownRefresh": false
-			}
-		},
+    "pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
+        {
+            "path": "pages/index/login",
+            "style": {
+                "navigationBarTitleText": "鐧诲綍",
+                "navigationStyle": "custom"
+            }
+        },
+        {
+            "path": "pages/index/index",
+            "style": {
+                "navigationBarTitleText": "棣栭〉",
+                "navigationStyle": "custom"
+            }
+        },
+        {
+            "path": "pages/index/tab1",
+            "style": {
+                "navigationBarTitleText": "杞﹂棿宸ュ簭"
+            }
+        },
+        {
+            "path": "pages/index/tab2",
+            "style": {
+                "navigationBarTitleText": "鍗曟嵁鍒楄〃"
+            }
+        },
+        {
+            "path": "pages/index/tab3",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿绠＄悊"
+            }
+        },
+        {
+            "path": "pages/index/tab4",
+            "style": {
+                "navigationBarTitleText": "璐ㄩ噺绠＄悊"
+            }
+        },
+        {
+            "path": "pages/index/mine",
+            "style": {
+                "navigationBarTitleText": "涓汉涓績",
+                // "navigationStyle": "custom"
+                "navigationBarTextStyle": "white",
+                "navigationBarBackgroundColor": "#65a2fb"
+            }
+        },
+        {
+            "path": "pages/shebeilvli/deviceStatueAnalysis",
+            "style": {
+                "navigationBarTitleText": "璁惧鐘舵�佸垎鏋�"
+            }
+        },
+        {
+            "path": "pages/shebeilvli/EquipFileBillResume",
+            "style": {
+                "navigationBarTitleText": "璁惧灞ュ巻",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeilvli/EquipFileBillResume_son",
+            "style": {
+                "navigationBarTitleText": "璁惧灞ュ巻瀛愯〃"
+            }
+        },
+        {
+            "path": "pages/baoyangjihua/Sb_EquipMaintainPlanEdit",
+            "style": {
+                "navigationBarTitleText": "璁惧淇濆吇璁″垝鍗�"
+            }
+        },
+        {
+            "path": "pages/baoyangjihua/Sb_EquipMaintainPlanList",
+            "style": {
+                "navigationBarTitleText": "璁惧淇濆吇璁″垝鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/baoyangjihua/Sb_EquipMaintainPlanList_son",
+            "style": {
+                "navigationBarTitleText": "淇濆吇璁″垝瀛愯〃"
+            }
+        },
+        {
+            "path": "pages/baoyangjilu/Sb_EquipMaintainRuleEdit",
+            "style": {
+                "navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�"
+            }
+        },
+        {
+            "path": "pages/baoyangjilu/Sb_EquipMaintainRuleList",
+            "style": {
+                "navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/baoyangjilu/Sb_EquipMaintainRuleList_son",
+            "style": {
+                "navigationBarTitleText": "淇濆吇璁板綍瀛愯〃"
+            }
+        },
+        {
+            "path": "pages/guzhangdengji/EqpConkBookBill",
+            "style": {
+                "navigationBarTitleText": "璁惧鏁呴殰鐧昏琛�"
+            }
+        },
+        {
+            "path": "pages/guzhangdengji/EqpConkBookBillList",
+            "style": {
+                "navigationBarTitleText": "璁惧鏁呴殰鐧昏琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeidangan/Gy_EquipFileMainBill",
+            "style": {
+                "navigationBarTitleText": "璁惧妗ｆ"
+            }
+        },
+        {
+            "path": "pages/shebeidangan/Gy_EquipFileMainBillList",
+            "style": {
+                "navigationBarTitleText": "璁惧妗ｆ",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeiweixiu/Sb_Add_EqpMaintenanceBillList",
+            "style": {
+                "navigationBarTitleText": "璁惧缁翠慨璁板綍鍗�"
+            }
+        },
+        {
+            "path": "pages/shebeiweixiu/SbEqpMaintenanceBillList",
+            "style": {
+                "navigationBarTitleText": "璁惧缁翠慨璁板綍鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwaigxOut/firstCheck",
+            "style": {
+                "navigationBarTitleText": "棣栦欢妫�楠屽崟",
+                "enablePullDownRefresh": true
+            }
+        }, {
+            "path": "pages/gongxuIn/Cj_StationInBill",
+            "style": {
+                "navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�"
+            }
+        },
+        {
+            "path": "pages/gongxuIn/Cj_StationInBillList",
+            "style": {
+                "navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�",
+                "enablePullDownRefresh": true
+            }
+        }, {
+            "path": "pages/gongxuOut/Cj_StationOutBill",
+            "style": {
+                "navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�"
+            }
+        },
+        {
+            "path": "pages/gongxuOut/Cj_StationOutBillList",
+            "style": {
+                "navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/gongxuOutSendWork/gongxuOutSendWorkBill",
+            "style": {
+                "navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�(娲惧伐)",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/gongxuOut/moneystatistics",
+            "style": {
+                "navigationBarTitleText": "鎴戠殑宸ヨ祫(姹囨姤棰勪及)",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeiguanli/deviceManage",
+            "style": {
+                "navigationBarTitleText": "璁惧绠＄悊",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeiguanli/deviceManageList",
+            "style": {
+                "navigationBarTitleText": "璁惧绠＄悊",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeiguanli/ticketList",
+            "style": {
+                "navigationBarTitleText": "宸ュ崟鍒楄〃",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/baogong/ProductReportStepBillList",
+            "style": {
+                "navigationBarTitleText": "浜ч噺姹囨姤鍗�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/baogong/IpadIndex",
+            "style": {
+                "navigationBarTitleText": "鎶ュ伐骞冲彴",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/baogong/DayPlanBillList",
+            "style": {
+                "navigationBarTitleText": "宸ュ崟鍒楄〃",
+                "enablePullDownRefresh": true
+            }
+        },
+        // {
+        // 	"path": "pages/baogong/OA_ErrMsgBackBill",
+        // 	"style": {
+        // 		"navigationBarTitleText": "寮傚父鍙嶉鍗�",
+        // 		"enablePullDownRefresh": false
+        // 	}
+        // },
+        {
+            "path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBillList",
+            "style": {
+                "navigationBarTitleText": "寮傚父鍙嶉鍗曞垪琛�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill",
+            "style": {
+                "navigationBarTitleText": "寮傚父鍙嶉鍗�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBillList",
+            "style": {
+                "navigationBarTitleText": "寮傚父鍙嶉鎺ユ敹鍗曞垪琛�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill",
+            "style": {
+                "navigationBarTitleText": "寮傚父鍙嶉鎺ユ敹鍗�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBillList",
+            "style": {
+                "navigationBarTitleText": "寮傚父鍙嶉绛惧埌鍗曞垪琛�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill",
+            "style": {
+                "navigationBarTitleText": "寮傚父鍙嶉绛惧埌鍗�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBillList",
+            "style": {
+                "navigationBarTitleText": "寮傚父鍙嶉澶勭悊鍗曞垪琛�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill",
+            "style": {
+                "navigationBarTitleText": "寮傚父鍙嶉澶勭悊鍗�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBillList",
+            "style": {
+                "navigationBarTitleText": "寮傚父鍙嶉楠屾敹鍗曞垪琛�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill",
+            "style": {
+                "navigationBarTitleText": "寮傚父鍙嶉楠屾敹鍗�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList",
+            "style": {
+                "navigationBarTitleText": "寮傚父鍙嶉寰呭鐞嗗垪琛�",
+                "enablePullDownRefresh": false
+            }
+        },
 
-		{
-			"path": "pages/caigouruku/POStockInBillList",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鍒楄〃",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/caigouruku/POStockInBill",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/caigoutuiliao/POStockInBackBillList",
-			"style": {
-				"navigationBarTitleText": "閲囪喘閫�鏂欏垪琛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/caigoutuiliao/POStockInBackBill",
-			"style": {
-				"navigationBarTitleText": "閲囪喘閫�鏂欏崟",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/xiaoshouchuku/SellOutBillList",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴撳垪琛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/xiaoshouchuku/SellOutBill",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴撳崟",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/xiaoshoutuihuo/ICStockBillMainList",
-			"style": {
-				"navigationBarTitleText": "閿�鍞��璐у垪琛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/xiaoshoutuihuo/ICStockBillMain",
-			"style": {
-				"navigationBarTitleText": "閿�鍞��璐у崟",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/shouliaotongzhi/table",
-			"style": {
-				"navigationBarTitleText": "鏀舵枡閫氱煡鍗�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/shouliaotongzhi/table_son",
-			"style": {
-				"navigationBarTitleText": "鏉＄爜鐢熸垚",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/shengchanlingliao/PPickingCheckBillList",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇棰嗘枡鏍￠獙鍒楄〃",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanlingliao/PPickingCheckBill",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇棰嗘枡鍗曟牎楠�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/shengchanruku/ProductInCheckBillList",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇鍏ュ簱鏍￠獙鍒楄〃",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanruku/ProductInCheckBill",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇鍏ュ簱鍗曟牎楠�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/shengchandiaobo/MoveStockBillList",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇璋冩嫧鏍￠獙鍒楄〃",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchandiaobo/MoveStockBill",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇璋冩嫧鍗曟牎楠�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/labelPrinter/index",
-			"style": {
-				"navigationBarTitleText": "鏍囩鎵撳嵃"
-			}
-		},
-		{
-			"path": "pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai",
-			"style": {
-				"navigationBarTitleText": "璁惧杩愯鐘舵��",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeiyunxingzhuangtai/detail",
-			"style": {
-				"navigationBarTitleText": "璁惧杩愯鐘舵�佽鎯�"
-			}
-		},
-		{
-			"path": "pages/mujvzhuangtai/mujvzhuangtai",
-			"style": {
-				"navigationBarTitleText": "妯″叿鐘舵�佸垎甯�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/mujvzhuangtai/detail",
-			"style": {
-				"navigationBarTitleText": "妯″叿鐘舵�佽鎯�"
-			}
-		},
-		{
-			"path": "pages/tiaomachaima/tiaomachaima",
-			"style": {
-				"navigationBarTitleText": "鏉＄爜鎷嗙爜"
-			}
-		},
-		{
-			"path": "pages/tiaomachaima/tiaomachaima2",
-			"style": {
-				"navigationBarTitleText": "鏉＄爜鎷嗙爜2"
-			}
-		},
-		{
-			"path": "pages/wuliaosaoma/wuliaosaoma",
-			"style": {
-				"navigationBarTitleText": "鐗╂枡娓呭崟"
-			}
-		},
-		{
-			"path": "pages/wuliaosaoma/detail",
-			"style": {
-				"navigationBarTitleText": "鏉＄爜妗ｆ"
-			}
-		},
-		{
-			"path": "pages/caigouruku/POStockInBillList",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/caigouruku/POStockInBill",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗�"
-			}
-		},
-		{
-			"path": "pages/caigoutuiliao/POStockInBackBillList",
-			"style": {
-				"navigationBarTitleText": "閲囪喘閫�鏂�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/caigoutuiliao/POStockInBackBill",
-			"style": {
-				"navigationBarTitleText": "閲囪喘閫�鏂欏崟"
-			}
-		},
-		{
-			"path": "pages/xiaoshouchuku/SellOutBillList",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/xiaoshouchuku/SellOutBill",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴撳崟"
-			}
-		},
-		{
-			"path": "pages/xiaoshoutuihuo/ICStockBillMainList",
-			"style": {
-				"navigationBarTitleText": "閿�鍞��璐�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/xiaoshoutuihuo/ICStockBillMain",
-			"style": {
-				"navigationBarTitleText": "閿�鍞��璐у崟"
-			}
-		},
-		{
-			"path": "pages/qitachuku/qitachuku",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitachuku/qitachukudan",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
-			}
-		},
-		{
-			"path": "pages/qitaruku/qitaruku",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitaruku/qitarukudan",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
-			}
-		},
-		{
-			"path": "pages/tiaomadaying/tiaomadaying",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鏉＄爜鎵撳嵃"
-			}
-		},
-		{
-			"path": "pages/caigoudingdan/generate",
-			"style": {
-				"navigationBarTitleText": "鏉＄爜鐢熸垚"
-			}
-		},
-		{
-			"path": "pages/caigoudingdan/caigoudingdan",
-			"style": {
-				"navigationBarTitleText": "閲囪喘璁㈠崟"
-			}
-		},
-		{
-			"path": "pages/MJGL/shangmudan/MouldUpperBillList",
-			"style": {
-				"navigationBarTitleText": "涓婃ā鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/shangmudan/MouldUpperBill",
-			"style": {
-				"navigationBarTitleText": "涓婃ā鍗�"
-			}
-		},
-		{
-			"path": "pages/MJGL/xiamodan/MouldLowerBillList",
-			"style": {
-				"navigationBarTitleText": "涓嬫ā鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/xiamodan/MouldLowerBill",
-			"style": {
-				"navigationBarTitleText": "涓嬫ā鍗�"
-			}
-		},
-		{
-			"path": "pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBillList",
-			"style": {
-				"navigationBarTitleText": "妯″叿鐐规璁板綍鍗曞垪琛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill",
-			"style": {
-				"navigationBarTitleText": "妯″叿鐐规璁板綍鍗�"
-			}
-		},
-		{
-			"path": "pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckRuleBillList",
-			"style": {
-				"navigationBarTitleText": "妯″叿鐐规瑙勭▼"
-			}
-		},
-		{
-			"path": "pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBillList",
-			"style": {
-				"navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗曞垪琛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill",
-			"style": {
-				"navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗�"
-			}
-		},
-		{
-			"path": "pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList",
-			"style": {
-				"navigationBarTitleText": "妯″叿淇濆吇瑙勭▼"
-			}
-		},
-		{
-			"path": "pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇琛ユ枡鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/qitachukujiaoyan/qitachukujiaoyan",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱鏍￠獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitachukujiaoyan/qitachukujiaoyan",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱鏍￠獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitachukujiaoyan/qitachukudanjiaoyan",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBillList",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇琛ユ枡鏍￠獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇琛ユ枡鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/xiaoshouchukujiaoyan/SellOutCheckBillList",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴撴牎楠�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/xiaoshouchukujiaoyan/SellOutCheckBill",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴撳崟鏍￠獙"
-			}
-		},
-		{
-			"path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBillList",
-			"style": {
-				"navigationBarTitleText": "濮斿棰嗘枡鏍￠獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBill",
-			"style": {
-				"navigationBarTitleText": "濮斿棰嗘枡鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/caigourukujiaoyan/POStockInCheckBillList",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鏍￠獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/caigourukujiaoyan/POStockInCheckBill",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗曟牎楠�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/qitarukujiaoyan/Kf_OtherInBillCheckList",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱鏍￠獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitarukujiaoyan/Kf_OtherInBillCheck",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/weiwaibuliaojiaoyan/Kf_EntrustReplenishOutBill_CheckList",
-			"style": {
-				"navigationBarTitleText": "濮斿琛ユ枡鏍￠獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwaibuliaojiaoyan/Kf_EntrustReplenishOutBill_Check",
-			"style": {
-				"navigationBarTitleText": "濮斿琛ユ枡鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/shengchanlingliaoshengdan/Kf_MateOutBillList",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇棰嗘枡",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanlingliaoshengdan/Kf_MateOutBill",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇棰嗘枡鍗�"
-			}
-		},
-		{
-			"path": "pages/weiwailingliao/Kf_EntrustOutBillList",
-			"style": {
-				"navigationBarTitleText": "濮斿棰嗘枡",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwailingliao/Kf_EntrustOutBill",
-			"style": {
-				"navigationBarTitleText": "濮斿棰嗘枡鍗�"
-			}
-		},
-		{
-			"path": "pages/shengchanrukushengdan/Kf_ProductInBillList",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanrukushengdan/Kf_ProductInBill",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇鍏ュ簱鍗�"
-			}
-		},
-		{
-			"path": "pages/xiaoshouchukujiaoyan/SellOutCheckBill",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴撳崟鏍￠獙"
-			}
-		},
-		{
-			"path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBillList",
-			"style": {
-				"navigationBarTitleText": "濮斿棰嗘枡鏍￠獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBill",
-			"style": {
-				"navigationBarTitleText": "濮斿棰嗘枡鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/caigourukujiaoyan/POStockInCheckBillList",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鏍￠獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/caigourukujiaoyan/POStockInCheckBill",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗曟牎楠�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/qitarukujiaoyan/Kf_OtherInBillCheckList",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱鏍￠獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitarukujiaoyan/Kf_OtherInBillCheck",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/weiwaibuliaojiaoyan/Kf_EntrustReplenishOutBill_CheckList",
-			"style": {
-				"navigationBarTitleText": "濮斿琛ユ枡鏍￠獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwaibuliaojiaoyan/Kf_EntrustReplenishOutBill_Check",
-			"style": {
-				"navigationBarTitleText": "濮斿琛ユ枡鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/shengchanlingliaoshengdan/Kf_MateOutBillList",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇棰嗘枡",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanlingliaoshengdan/Kf_MateOutBill",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇棰嗘枡鍗�"
-			}
-		},
-		{
-			"path": "pages/weiwailingliao/Kf_EntrustOutBillList",
-			"style": {
-				"navigationBarTitleText": "濮斿棰嗘枡",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwailingliao/Kf_EntrustOutBill",
-			"style": {
-				"navigationBarTitleText": "濮斿棰嗘枡鍗�"
-			}
-		},
-		{
-			"path": "pages/shengchanrukushengdan/Kf_ProductInBillList",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanrukushengdan/Kf_ProductInBill",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇鍏ュ簱鍗�"
-			}
-		},
-		{
-			"path": "pages/shengchanbuliao/MateReplenishOutBillList",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇琛ユ枡",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanbuliao/MateReplenishOutBill",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇琛ユ枡鍗�"
-			}
-		},
-		{
-			"path": "pages/qitaruku_v2/OtherInBillList",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		}, {
-			"path": "pages/qitaruku_v2/OtherInBill",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
-			}
-		},
-		{
-			"path": "pages/qitachuku_v2/OtherOutBillList",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitachuku_v2/OtherOutBill",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
-			}
-		},
-		{
-			"path": "pages/shengchanbuliao/MateReplenishOutBill",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇琛ユ枡",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanbuliao/MateReplenishOutBill",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇琛ユ枡鍗�"
-			}
-		},
-		{
-			"path": "pages/qitaruku_v2/OtherInBillList",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitaruku_v2/OtherInBill",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
-			}
-		},
-		{
-			"path": "pages/tiaomaguanli/table_son",
-			"style": {
-				"navigationBarTitleText": "鏉＄爜鐢熸垚"
-			}
-		},
-		{
-			"path": "pages/tiaomaguanli/table",
-			"style": {
-				"navigationBarTitleText": "鏉＄爜绠＄悊"
-			}
-		}, {
-			"path": "pages/weiwairuku/EntrustInBillList",
-			"style": {
-				"navigationBarTitleText": "濮斿鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwairuku/EntrustInBill",
-			"style": {
-				"navigationBarTitleText": "濮斿鍏ュ簱鍗�"
-			}
-		},
-		{
-			"path": "pages/zhijiediaobo/MoveStockBillList",
-			"style": {
-				"navigationBarTitleText": "鐩存帴璋冩嫧",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/zhijiediaobo/MoveStockBill",
-			"style": {
-				"navigationBarTitleText": "鐩存帴璋冩嫧鍗�"
-			}
-		},
-		{
-			"path": "pages/xiugaimima/index",
-			"style": {
-				"navigationBarTitleText": "淇敼瀵嗙爜"
-			}
-		},
-		{
-			"path": "pages/tiaomaguanli/table",
-			"style": {
-				"navigationBarTitleText": "鏉＄爜绠＄悊"
-			}
-		}, {
-			"path": "pages/weiwairuku/EntrustInBillList",
-			"style": {
-				"navigationBarTitleText": "濮斿鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBillList",
-			"style": {
-				"navigationBarTitleText": "鍙栨牱鍗�"
-			}
-		},
-		{
-			"path": "pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill",
-			"style": {
-				"navigationBarTitleText": "鍙栨牱鍗�"
-			}
-		},
-		{
-			"path": "pages/ZLGL/QuYangHuangYang/QC_BackSampleCheckBill/QC_BackSampleCheckBillList",
-			"style": {
-				"navigationBarTitleText": "杩樻牱鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/ZLGL/QuYangHuangYang/QC_BackSampleCheckBill/QC_BackSampleCheckBill",
-			"style": {
-				"navigationBarTitleText": "杩樻牱鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/InnerHtmlPage/index",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/white/white",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/zutuosaoma/PackUnionBill",
-			"style": {
-				"navigationBarTitleText": "缁勬墭鎵爜"
-			}
-		},
-		{
-			"path": "pages/zutuosaoma/PackUnionBillList",
-			"style": {
-				"navigationBarTitleText": "缁勬墭鎵爜缂撳瓨"
-			}
-		},
-		{
-			"path": "pages/chaituosaoma/UnPackUnionBill",
-			"style": {
-				"navigationBarTitleText": "鎷嗘墭鎵爜"
-			}
-		},
-		{
-			"path": "pages/shengchantuiliao/MateOutBackBillList",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇閫�鏂�"
-			}
-		},
-		{
-			"path": "pages/shengchantuiliao/MateOutBackBill",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇閫�鏂欏崟"
-			}
-		},
-		{
-			"path": "pages/ZLGL/shoujianjianyan/firstCheckBillList",
-			"style": {
-				"navigationBarTitleText": "棣栦欢妫�楠屽崟缁存姢"
-			}
-		},
-		{
-			"path": "pages/ZLGL/shoujianjianyan/firstCheckBill",
-			"style": {
-				"navigationBarTitleText": "棣栦欢妫�楠屽崟"
-			}
-		},
-		{
-			"path": "pages/shoujishouming/table",
-			"style": {
-				"navigationBarTitleText": "鎵嬫満瀵垮懡鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shoujishouming/form",
-			"style": {
-				"navigationBarTitleText": "鎵嬫満瀵垮懡鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
-			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
-			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
-			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
-			"style": {
-				"navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBill",
-			"style": {
-				"navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/fenbushidiaorudan/form_test",
-			"style": {
-				"navigationBarTitleText": "鍒嗘璋冨叆鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/fenbushidiaorudan/table",
-			"style": {
-				"navigationBarTitleText": "鍒嗘璋冨叆鍗曠紦瀛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/fenbushidiaochudan/form_out",
-			"style": {
-				"navigationBarTitleText": "鍒嗘璋冨嚭鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/ZLGL/shoujianjianyan/firstCheckBillList",
-			"style": {
-				"navigationBarTitleText": "棣栦欢妫�楠屽崟缁存姢"
-			}
-		},
-		{
-			"path": "pages/ZLGL/shoujianjianyan/firstCheckBill",
-			"style": {
-				"navigationBarTitleText": "棣栦欢妫�楠屽崟"
-			}
-		},
-		{
-			"path": "pages/shoujishouming/table",
-			"style": {
-				"navigationBarTitleText": "妯″叿瀵垮懡璋冩暣鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shoujishouming/form",
-			"style": {
-				"navigationBarTitleText": "妯″叿瀵垮懡璋冩暣鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
-			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�"
-			}
-		},
-		{
-			"path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
-			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
-			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill",
-			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟"
-			}
-		},
-		{
-			"path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
-			"style": {
-				"navigationBarTitleText": "妯″叿璋冩嫧鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBill",
-			"style": {
-				"navigationBarTitleText": "妯″叿璋冩嫧鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/fenbushidiaorudan/form_test",
-			"style": {
-				"navigationBarTitleText": "鍒嗘璋冨叆鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/fenbushidiaorudan/table",
-			"style": {
-				"navigationBarTitleText": "鍒嗘璋冨叆鍗曠紦瀛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/fenbushidiaochudan/form_out",
-			"style": {
-				"navigationBarTitleText": "鍒嗘璋冨嚭鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weixiujilu/mouldRepairRecordBillList",
-			"style": {
-				"navigationBarTitleText": "妯″叿缁翠慨璁板綍",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weixiujilu/mouldRepairRecordBill",
-			"style": {
-				"navigationBarTitleText": "妯″叿缁翠慨璁板綍鍗�"
-			}
-		},
-		{
-			"path": "pages/qijvguzhangdengji/mouldMistake",
-			"style": {
-				"navigationBarTitleText": "妯″叿鏁呴殰鐧昏"
+        {
+            "path": "pages/caigouruku/POStockInBillList",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱鍒楄〃",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/caigouruku/POStockInBill",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱鍗�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/caigoutuiliao/POStockInBackBillList",
+            "style": {
+                "navigationBarTitleText": "閲囪喘閫�鏂欏垪琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/caigoutuiliao/POStockInBackBill",
+            "style": {
+                "navigationBarTitleText": "閲囪喘閫�鏂欏崟",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/xiaoshouchuku/SellOutBillList",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴撳垪琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/xiaoshouchuku/SellOutBill",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴撳崟",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/xiaoshoutuihuo/ICStockBillMainList",
+            "style": {
+                "navigationBarTitleText": "閿�鍞��璐у垪琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/xiaoshoutuihuo/ICStockBillMain",
+            "style": {
+                "navigationBarTitleText": "閿�鍞��璐у崟",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/shouliaotongzhi/table",
+            "style": {
+                "navigationBarTitleText": "鏀舵枡閫氱煡鍗�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/shouliaotongzhi/table_son",
+            "style": {
+                "navigationBarTitleText": "鏉＄爜鐢熸垚",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/shengchanlingliao/PPickingCheckBillList",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇棰嗘枡鏍￠獙鍒楄〃",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanlingliao/PPickingCheckBill",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇棰嗘枡鍗曟牎楠�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/shengchanruku/ProductInCheckBillList",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇鍏ュ簱鏍￠獙鍒楄〃",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanruku/ProductInCheckBill",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇鍏ュ簱鍗曟牎楠�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/shengchandiaobo/MoveStockBillList",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇璋冩嫧鏍￠獙鍒楄〃",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchandiaobo/MoveStockBill",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇璋冩嫧鍗曟牎楠�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/labelPrinter/index",
+            "style": {
+                "navigationBarTitleText": "鏍囩鎵撳嵃"
+            }
+        },
+        {
+            "path": "pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai",
+            "style": {
+                "navigationBarTitleText": "璁惧杩愯鐘舵��",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeiyunxingzhuangtai/detail",
+            "style": {
+                "navigationBarTitleText": "璁惧杩愯鐘舵�佽鎯�"
+            }
+        },
+        {
+            "path": "pages/mujvzhuangtai/mujvzhuangtai",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿鐘舵�佸垎甯�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/mujvzhuangtai/detail",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿鐘舵�佽鎯�"
+            }
+        },
+        {
+            "path": "pages/tiaomachaima/tiaomachaima",
+            "style": {
+                "navigationBarTitleText": "鏉＄爜鎷嗙爜"
+            }
+        },
+        {
+            "path": "pages/tiaomachaima/tiaomachaima2",
+            "style": {
+                "navigationBarTitleText": "鏉＄爜鎷嗙爜2"
+            }
+        },
+        {
+            "path": "pages/wuliaosaoma/wuliaosaoma",
+            "style": {
+                "navigationBarTitleText": "鐗╂枡娓呭崟"
+            }
+        },
+        {
+            "path": "pages/wuliaosaoma/detail",
+            "style": {
+                "navigationBarTitleText": "鏉＄爜妗ｆ"
+            }
+        },
+        {
+            "path": "pages/caigouruku/POStockInBillList",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/caigouruku/POStockInBill",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱鍗�"
+            }
+        },
+        {
+            "path": "pages/caigoutuiliao/POStockInBackBillList",
+            "style": {
+                "navigationBarTitleText": "閲囪喘閫�鏂�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/caigoutuiliao/POStockInBackBill",
+            "style": {
+                "navigationBarTitleText": "閲囪喘閫�鏂欏崟"
+            }
+        },
+        {
+            "path": "pages/xiaoshouchuku/SellOutBillList",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/xiaoshouchuku/SellOutBill",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴撳崟"
+            }
+        },
+        {
+            "path": "pages/xiaoshoutuihuo/ICStockBillMainList",
+            "style": {
+                "navigationBarTitleText": "閿�鍞��璐�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/xiaoshoutuihuo/ICStockBillMain",
+            "style": {
+                "navigationBarTitleText": "閿�鍞��璐у崟"
+            }
+        },
+        {
+            "path": "pages/qitachuku/qitachuku",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitachuku/qitachukudan",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
+            }
+        },
+        {
+            "path": "pages/qitaruku/qitaruku",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitaruku/qitarukudan",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
+            }
+        },
+        {
+            "path": "pages/tiaomadaying/tiaomadaying",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鏉＄爜鎵撳嵃"
+            }
+        },
+        {
+            "path": "pages/caigoudingdan/generate",
+            "style": {
+                "navigationBarTitleText": "鏉＄爜鐢熸垚"
+            }
+        },
+        {
+            "path": "pages/caigoudingdan/caigoudingdan",
+            "style": {
+                "navigationBarTitleText": "閲囪喘璁㈠崟"
+            }
+        },
+        {
+            "path": "pages/MJGL/shangmudan/MouldUpperBillList",
+            "style": {
+                "navigationBarTitleText": "涓婃ā鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/shangmudan/MouldUpperBill",
+            "style": {
+                "navigationBarTitleText": "涓婃ā鍗�"
+            }
+        },
+        {
+            "path": "pages/MJGL/xiamodan/MouldLowerBillList",
+            "style": {
+                "navigationBarTitleText": "涓嬫ā鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/xiamodan/MouldLowerBill",
+            "style": {
+                "navigationBarTitleText": "涓嬫ā鍗�"
+            }
+        },
+        {
+            "path": "pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBillList",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿鐐规璁板綍鍗曞垪琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿鐐规璁板綍鍗�"
+            }
+        },
+        {
+            "path": "pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckRuleBillList",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿鐐规瑙勭▼"
+            }
+        },
+        {
+            "path": "pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBillList",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿淇濆吇璁板綍鍗曞垪琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿淇濆吇璁板綍鍗�"
+            }
+        },
+        {
+            "path": "pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿淇濆吇浠诲姟"
+            }
+        },
+        {
+            "path": "pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport",
+            "style": {
+                "navigationBarTitleText": "璁惧淇濆吇浠诲姟"
+            }
+        },
+        {
+            "path": "pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿淇濆吇瑙勭▼"
+            }
+        },
+        {
+            "path": "pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇琛ユ枡鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/qitachukujiaoyan/qitachukujiaoyan",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱鏍￠獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitachukujiaoyan/qitachukujiaoyan",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱鏍￠獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitachukujiaoyan/qitachukudanjiaoyan",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBillList",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇琛ユ枡鏍￠獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇琛ユ枡鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/xiaoshouchukujiaoyan/SellOutCheckBillList",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴撴牎楠�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/xiaoshouchukujiaoyan/SellOutCheckBill",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴撳崟鏍￠獙"
+            }
+        },
+        {
+            "path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBillList",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡鏍￠獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBill",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/caigourukujiaoyan/POStockInCheckBillList",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱鏍￠獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/caigourukujiaoyan/POStockInCheckBill",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱鍗曟牎楠�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/qitarukujiaoyan/Kf_OtherInBillCheckList",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱鏍￠獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitarukujiaoyan/Kf_OtherInBillCheck",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/weiwaibuliaojiaoyan/Kf_EntrustReplenishOutBill_CheckList",
+            "style": {
+                "navigationBarTitleText": "濮斿琛ユ枡鏍￠獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwaibuliaojiaoyan/Kf_EntrustReplenishOutBill_Check",
+            "style": {
+                "navigationBarTitleText": "濮斿琛ユ枡鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/shengchanlingliaoshengdan/Kf_MateOutBillList",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇棰嗘枡",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanlingliaoshengdan/Kf_MateOutBill",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇棰嗘枡鍗�"
+            }
+        },
+        {
+            "path": "pages/weiwailingliao/Kf_EntrustOutBillList",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwailingliao/Kf_EntrustOutBill",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡鍗�"
+            }
+        },
+        {
+            "path": "pages/shengchanrukushengdan/Kf_ProductInBillList",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanrukushengdan/Kf_ProductInBill",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇鍏ュ簱鍗�"
+            }
+        },
+        {
+            "path": "pages/xiaoshouchukujiaoyan/SellOutCheckBill",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴撳崟鏍￠獙"
+            }
+        },
+        {
+            "path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBillList",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡鏍￠獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBill",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/caigourukujiaoyan/POStockInCheckBillList",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱鏍￠獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/caigourukujiaoyan/POStockInCheckBill",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱鍗曟牎楠�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/qitarukujiaoyan/Kf_OtherInBillCheckList",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱鏍￠獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitarukujiaoyan/Kf_OtherInBillCheck",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/weiwaibuliaojiaoyan/Kf_EntrustReplenishOutBill_CheckList",
+            "style": {
+                "navigationBarTitleText": "濮斿琛ユ枡鏍￠獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwaibuliaojiaoyan/Kf_EntrustReplenishOutBill_Check",
+            "style": {
+                "navigationBarTitleText": "濮斿琛ユ枡鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/shengchanlingliaoshengdan/Kf_MateOutBillList",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇棰嗘枡",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanlingliaoshengdan/Kf_MateOutBill",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇棰嗘枡鍗�"
+            }
+        },
+        {
+            "path": "pages/weiwailingliao/Kf_EntrustOutBillList",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwailingliao/Kf_EntrustOutBill",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡鍗�"
+            }
+        },
+        {
+            "path": "pages/shengchanrukushengdan/Kf_ProductInBillList",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanrukushengdan/Kf_ProductInBill",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇鍏ュ簱鍗�"
+            }
+        },
+        {
+            "path": "pages/shengchanbuliao/MateReplenishOutBillList",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇琛ユ枡",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanbuliao/MateReplenishOutBill",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇琛ユ枡鍗�"
+            }
+        },
+        {
+            "path": "pages/qitaruku_v2/OtherInBillList",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        }, {
+            "path": "pages/qitaruku_v2/OtherInBill",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
+            }
+        },
+        {
+            "path": "pages/qitachuku_v2/OtherOutBillList",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitachuku_v2/OtherOutBill",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
+            }
+        },
+        {
+            "path": "pages/shengchanbuliao/MateReplenishOutBill",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇琛ユ枡",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanbuliao/MateReplenishOutBill",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇琛ユ枡鍗�"
+            }
+        },
+        {
+            "path": "pages/qitaruku_v2/OtherInBillList",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitaruku_v2/OtherInBill",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
+            }
+        },
+        {
+            "path": "pages/tiaomaguanli/table_son",
+            "style": {
+                "navigationBarTitleText": "鏉＄爜鐢熸垚"
+            }
+        },
+        {
+            "path": "pages/tiaomaguanli/table",
+            "style": {
+                "navigationBarTitleText": "鏉＄爜绠＄悊"
+            }
+        }, {
+            "path": "pages/weiwairuku/EntrustInBillList",
+            "style": {
+                "navigationBarTitleText": "濮斿鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwairuku/EntrustInBill",
+            "style": {
+                "navigationBarTitleText": "濮斿鍏ュ簱鍗�"
+            }
+        },
+        {
+            "path": "pages/zhijiediaobo/MoveStockBillList",
+            "style": {
+                "navigationBarTitleText": "鐩存帴璋冩嫧",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/zhijiediaobo/MoveStockBill",
+            "style": {
+                "navigationBarTitleText": "鐩存帴璋冩嫧鍗�"
+            }
+        },
+        {
+            "path": "pages/xiugaimima/index",
+            "style": {
+                "navigationBarTitleText": "淇敼瀵嗙爜"
+            }
+        },
+        {
+            "path": "pages/tiaomaguanli/table",
+            "style": {
+                "navigationBarTitleText": "鏉＄爜绠＄悊"
+            }
+        }, {
+            "path": "pages/weiwairuku/EntrustInBillList",
+            "style": {
+                "navigationBarTitleText": "濮斿鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBillList",
+            "style": {
+                "navigationBarTitleText": "鍙栨牱鍗�"
+            }
+        },
+        {
+            "path": "pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill",
+            "style": {
+                "navigationBarTitleText": "鍙栨牱鍗�"
+            }
+        },
+        {
+            "path": "pages/ZLGL/QuYangHuangYang/QC_BackSampleCheckBill/QC_BackSampleCheckBillList",
+            "style": {
+                "navigationBarTitleText": "杩樻牱鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/ZLGL/QuYangHuangYang/QC_BackSampleCheckBill/QC_BackSampleCheckBill",
+            "style": {
+                "navigationBarTitleText": "杩樻牱鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/InnerHtmlPage/index",
+            "style": {
+                "navigationBarTitleText": ""
+            }
+        },
+        {
+            "path": "pages/white/white",
+            "style": {
+                "navigationBarTitleText": ""
+            }
+        },
+        {
+            "path": "pages/baogong/AddLineBind",
+            "style": {
+                "navigationBarTitleText": "娣诲姞鐢熶骇璧勬簮"
+            }
+        },
+        {
+            "path": "pages/zutuosaoma/PackUnionBill",
+            "style": {
+                "navigationBarTitleText": "缁勬墭鎵爜"
+            }
+        },
+        {
+            "path": "pages/zutuosaoma/PackUnionBillList",
+            "style": {
+                "navigationBarTitleText": "缁勬墭鎵爜缂撳瓨"
+            }
+        },
+        {
+            "path": "pages/chaituosaoma/UnPackUnionBill",
+            "style": {
+                "navigationBarTitleText": "鎷嗘墭鎵爜"
+            }
+        },
+        {
+            "path": "pages/shengchantuiliao/MateOutBackBillList",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇閫�鏂�"
+            }
+        },
+        {
+            "path": "pages/shengchantuiliao/MateOutBackBill",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇閫�鏂欏崟"
+            }
+        },
+        {
+            "path": "pages/ZLGL/shoujianjianyan/firstCheckBillList",
+            "style": {
+                "navigationBarTitleText": "棣栦欢妫�楠屽崟缁存姢"
+            }
+        },
+        {
+            "path": "pages/ZLGL/shoujianjianyan/firstCheckBill",
+            "style": {
+                "navigationBarTitleText": "棣栦欢妫�楠屽崟"
+            }
+        },
+        {
+            "path": "pages/shoujishouming/table",
+            "style": {
+                "navigationBarTitleText": "鎵嬫満瀵垮懡鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shoujishouming/form",
+            "style": {
+                "navigationBarTitleText": "鎵嬫満瀵垮懡鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿棰嗙敤鍑哄簱鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿棰嗙敤鍑哄簱鍗曞垪琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿棰嗙敤閫�搴撳崟",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBill",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/fenbushidiaorudan/form_test",
+            "style": {
+                "navigationBarTitleText": "鍒嗘璋冨叆鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/fenbushidiaorudan/table",
+            "style": {
+                "navigationBarTitleText": "鍒嗘璋冨叆鍗曠紦瀛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/fenbushidiaochudan/form_out",
+            "style": {
+                "navigationBarTitleText": "鍒嗘璋冨嚭鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/ZLGL/shoujianjianyan/firstCheckBillList",
+            "style": {
+                "navigationBarTitleText": "棣栦欢妫�楠屽崟缁存姢"
+            }
+        },
+        {
+            "path": "pages/ZLGL/shoujianjianyan/firstCheckBill",
+            "style": {
+                "navigationBarTitleText": "棣栦欢妫�楠屽崟"
+            }
+        },
+        {
+            "path": "pages/shoujishouming/table",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿瀵垮懡璋冩暣鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shoujishouming/form",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿瀵垮懡璋冩暣鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿棰嗙敤鍑哄簱鍗�"
+            }
+        },
+        {
+            "path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿棰嗙敤鍑哄簱鍗曞垪琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿棰嗙敤閫�搴撳崟鍒楄〃",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿棰嗙敤閫�搴撳崟"
+            }
+        },
+        {
+            "path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBill",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/fenbushidiaorudan/form_test",
+            "style": {
+                "navigationBarTitleText": "鍒嗘璋冨叆鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/fenbushidiaorudan/table",
+            "style": {
+                "navigationBarTitleText": "鍒嗘璋冨叆鍗曠紦瀛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/fenbushidiaochudan/form_out",
+            "style": {
+                "navigationBarTitleText": "鍒嗘璋冨嚭鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBillList",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿缁翠慨璁板綍鍗曞垪琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿缁翠慨璁板綍鍗�"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿鏁呴殰鐧昏鍗�"
 
-			}
-		},
-		{
-			"path": "pages/qijvguzhangdengji/mouldMistakeBill",
-			"style": {
-				"navigationBarTitleText": "妯″叿鏁呴殰鐧昏鍗�"
-			}
-		},
-		{
-			"path": "pages/chaixiang/form",
-			"style": {
-				"navigationBarTitleText": "鎷嗙"
-			}
-		},
-		{
-			"path": "pages/zhuangxiang/form_mix",
-			"style": {
-				"navigationBarTitleText": "瑁呯"
-			}
-		},
-		{
-			"path": "pages/zutuo_xiaowei/form_xiaowei",
-			"style": {
-				"navigationBarTitleText": "缁勬墭-灏忓崼"
-			}
-		},
-		{
-			"path": "pages/zhuangxiangdan/table",
-			"style": {
-				"navigationBarTitleText": "瑁呯鍗曠紦瀛�"
-			}
-		},
-		{
-			"path": "pages/zhuangxiangdan/form",
-			"style": {
-				"navigationBarTitleText": "瑁呯鍗�"
-			}
-		},
-		{
-			"path": "pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
-			"style": {
-				"navigationBarTitleText": "宸℃鍗曠紦瀛�"
-			}
-		},
-		{
-			"path": "pages/ZLGL/xunjianjianyan/PatrolProcCheckBill",
-			"style": {
-				"navigationBarTitleText": "宸℃鍗�"
-			}
-		},
-		{
-			"path": "pages/ZLGL/mojianjianyan/ProcessCheckBillList",
-			"style": {
-				"navigationBarTitleText": "鏈欢妫�楠屽崟缁存姢"
-			}
-		},
-		{
-			"path": "pages/ZLGL/lailiaojianyan/POStockInCheckBill",
-			"style": {
-				"navigationBarTitleText": "鏉ユ枡妫�楠屽崟"
-			}
-		},
-		{
-			"path": "pages/ZLGL/lailiaojianyan/POStockInCheckBillList",
-			"style": {
-				"navigationBarTitleText": "鏉ユ枡妫�楠屽崟缁存姢"
-			}
-		},
-		{
-			"path": "pages/ZLGL/mojianjianyan/ProcessCheckBill",
-			"style": {
-				"navigationBarTitleText": "鏈欢妫�楠屽崟"
-			}
-		},
-		{
-			"path": "pages/chaituosaoma-xiaowei/UnpackPallet",
-			"style": {
-				"navigationBarTitleText": "鎷嗘墭鎵爜锛堝皬鍗級"
-			}
-		},
-		{
-			"path": "pages/sanmaheyi/BarCodeCheck",
-			"style": {
-				"navigationBarTitleText": "涓夌爜鍚堜竴"
-			}
-		},
-		{
-			"path": "pages/simaheyi/BarCodeCheck_SN",
-			"style": {
-				"navigationBarTitleText": "鍥涚爜鍚堜竴"
-			}
-		},
-		{
-			"path": "pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇鍏ュ簱鏍￠獙"
-			}
-		},
-		{
-			"path": "pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill",
-			"style": {
-				"navigationBarTitleText": "鍑哄巶鏍￠獙"
-			}
-		},
-		{
-			"path": "pages/weiwaigxIn/Cj_StationEntrustInBill",
-			"style": {
-				"navigationBarTitleText": "宸ュ簭濮斿鍙戝嚭鍗�"
-			}
-		},
-		{
-			"path": "pages/weiwaigxIn/Cj_StationEntrustInBillList",
-			"style": {
-				"navigationBarTitleText": "宸ュ簭濮斿鍙戝嚭鍗曠紦瀛�"
-			}
-		},
-		{
-			"path": "pages/weiwaigxOut/Cj_StationEntrustOutBill",
-			"style": {
-				"navigationBarTitleText": "宸ュ簭濮斿鎺ユ敹鍗�"
-			}
-		},
-		{
-			"path": "pages/weiwaigxOut/Cj_StationEntrustOutBillList",
-			"style": {
-				"navigationBarTitleText": "宸ュ簭濮斿鎺ユ敹鍗曠紦瀛�"
-			}
-		},
-		{
-			"path": "pages/jishikucunchaxun/table",
-			"style": {
-				"navigationBarTitleText": "鍗虫椂搴撳瓨鏌ヨ"
-			}
-		},
-		{
-			"path": "pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast",
-			"style": {
-				"navigationBarTitleText": "鏉ユ枡妫�楠屽崟"
-			}
-		},
-		{
-			"path": "pages/ZLGL/checkFlowList/QC_CheckBillflowList",
-			"style": {
-				"navigationBarTitleText": "寰呮垜瀹℃牳",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/ZLGL/checkFlowList/QC_CheckedBillflowList",
-			"style": {
-				"navigationBarTitleText": "宸插鏍�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/Gy_MouldFile/Gy_MouldFileList",
-			"style": {
-				"navigationBarTitleText": "妯″叿妗ｆ鏌ヨ",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/ZLGL/QualityReportStep/QualityReportStepBill",
-			"style": {
-				"navigationBarTitleText": "鍏ㄦ妫�楠屽崟(涓嶈壇姹囨姤)",
-				"pageOrientation": "auto" // 鏀寔妯睆
-			}
-		},
-		{
-			"path": "pages/ZLGL/QualityReportStep/QualityReportStepBillList",
-			"style": {
-				"navigationBarTitleText": "鍏ㄦ妫�楠屽崟(涓嶈壇姹囨姤)鏌ヨ"
-			}
-		},
-		{
-			"path": "pages/MJGL/MouldScrapOutBill/MouldScrapOutBillList",
-			"style": {
-				"navigationBarTitleText": "妯″叿鎶ュ簾鍑哄簱鍗曞垪琛�"
-			}
-		},
-		{
-			"path": "pages/MJGL/MouldScrapOutBill/MouldScrapOutBill",
-			"style": {
-				"navigationBarTitleText": "妯″叿鎶ュ簾鍑哄簱鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBill",
-			"style": {
-				"navigationBarTitleText": "杞﹂棿鑷鍗�"
-			}
-		},
-		{
-			"path": "pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBillList",
-			"style": {
-				"navigationBarTitleText": "杞﹂棿鑷鍗曞垪琛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/ZLGL/zaikujianyandan/InStockCheckBill",
-			"style": {
-				"navigationBarTitleText": "鍦ㄥ簱妫�楠屽崟"
-			}
-		},
-		{
-			"path": "pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill",
-			"style": {
-				"navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�"
-			}
-		},
-		{
-			"path": "pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill",
-			"style": {
-				"navigationBarTitleText": "璁惧鐐规璁板綍鍗�"
-			}
-		},
-		{
-			"path": "pages/ZLGL/zaikujianyandan/InStockCheckBillList",
-			"style": {
-				"navigationBarTitleText": "鍦ㄥ簱妫�楠屽崟鍒楄〃"
-			}
-		},
-		{
-			"path": "pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList",
-			"style": {
-				"navigationBarTitleText": "璁惧鐐规璁板綍鍗曠紦瀛�"
-			}
-		},
-		{
-			"path": "pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList",
-			"style": {
-				"navigationBarTitleText": "璁惧淇濆吇璁板綍鍗曠紦瀛�"
-			}
-		},
-		{
-			"path": "pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill",
-			"style": {
-				"navigationBarTitleText": "璁惧缁翠慨楠屾敹鍗�"
-			}
-		},
-		{
-			"path": "pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList",
-			"style": {
-				"navigationBarTitleText": "璁惧缁翠慨楠屾敹鍗曠紦瀛�"
-			}
-        },
-        {
-            "path" : "pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill",
-            "style" : 
-            {
-                "navigationBarTitleText" : "璁惧缁翠慨娲惧伐鍗�"
             }
         },
         {
-            "path" : "pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList",
-            "style" : 
-            {
-                "navigationBarTitleText" : "璁惧缁翠慨娲惧伐鍗曠紦瀛�"
+            "path": "pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿鏁呴殰鐧昏鍗曞垪琛�"
             }
         },
         {
-            "path" : "pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill",
-            "style" : 
-            {
-                "navigationBarTitleText" : "鍣ㄥ叿缁翠慨娲惧伐鍗�"
+            "path": "pages/chaixiang/form",
+            "style": {
+                "navigationBarTitleText": "鎷嗙"
             }
         },
         {
-            "path" : "pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBillList",
-            "style" : 
-            {
-                "navigationBarTitleText" : "鍣ㄥ叿缁翠慨娲惧伐鍗曠紦瀛�"
+            "path": "pages/zhuangxiang/form_mix",
+            "style": {
+                "navigationBarTitleText": "瑁呯"
             }
         },
         {
-            "path" : "pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill",
-            "style" : 
-            {
-                "navigationBarTitleText" : "鍣ㄥ叿缁翠慨楠屾敹鍗�"
+            "path": "pages/zutuo_xiaowei/form_xiaowei",
+            "style": {
+                "navigationBarTitleText": "缁勬墭-灏忓崼"
             }
         },
         {
-            "path" : "pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList",
-            "style" : 
-            {
-                "navigationBarTitleText" : "鍣ㄥ叿缁翠慨楠屾敹鍗曠紦瀛�"
+            "path": "pages/zhuangxiangdan/table",
+            "style": {
+                "navigationBarTitleText": "瑁呯鍗曠紦瀛�"
             }
-		},
-		{
-		    "path" : "pages/ZLGL/OA_WorkLink/OA_WorkLinkBill",
-		    "style" : 
-		    {
-		        "navigationBarTitleText" : "宸ヤ綔鑱旂郴鍗�"
-		    }
-		},
-		{
-		    "path" : "pages/ZLGL/OA_WorkLink/OA_WorkLinkBillList",
-		    "style" : 
-		    {
-		        "navigationBarTitleText" : "宸ヤ綔鑱旂郴鍗曞垪琛�"
-		    }
-		},
-		{
-		    "path" : "pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport",
-		    "style" : 
-		    {
-		        "navigationBarTitleText" : "璁惧缁翠慨浠诲姟"
-		    }
-		},
-		{
-		    "path" : "pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport",
-		    "style" : 
-		    {
-		        "navigationBarTitleText" : "鍣ㄥ叿缁翠慨浠诲姟"
-		    }
-		},
-		{
-		    "path" : "pages/EmployeeRecords/EmployeeRecordsBill",
-		    "style" : 
-		    {
-		        "navigationBarTitleText" : "鍛樺伐绛惧埌璁板綍琛�"
-		    }
-		},
-		{
-		    "path" : "pages/EmployeeRecords/EmployeeRecordsBillList",
-		    "style" : 
-		    {
-		        "navigationBarTitleText" : "鍛樺伐绛惧埌璁板綍琛ㄥ垪琛�"
-		    }
-		},
-		{
-		    "path" : "pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill",
-		    "style" : 
-		    {
-		        "navigationBarTitleText" : "璁惧鏁呴殰鐧昏鍗�"
-		    }
-		},{
-		    "path" : "pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBillList",
-		    "style" : 
-		    {
-		        "navigationBarTitleText" : "璁惧鏁呴殰鐧昏鍗曞垪琛�"
-		    }
-		},
-		{
-			"path": "pages/tiaomachaima/tiaomachaimaCopy",
-			"style": {
-				"navigationBarTitleText": "鏉＄爜鎷嗙爜3"
-			}
-		}
-		
+        },
+        {
+            "path": "pages/zhuangxiangdan/form",
+            "style": {
+                "navigationBarTitleText": "瑁呯鍗�"
+            }
+        },
+        {
+            "path": "pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
+            "style": {
+                "navigationBarTitleText": "宸℃鍗曠紦瀛�"
+            }
+        },
+        {
+            "path": "pages/ZLGL/xunjianjianyan/PatrolProcCheckBill",
+            "style": {
+                "navigationBarTitleText": "宸℃鍗�"
+            }
+        },
+        {
+            "path": "pages/ZLGL/mojianjianyan/ProcessCheckBillList",
+            "style": {
+                "navigationBarTitleText": "鏈欢妫�楠屽崟缁存姢"
+            }
+        },
+        {
+            "path": "pages/ZLGL/lailiaojianyan/POStockInCheckBill",
+            "style": {
+                "navigationBarTitleText": "鏉ユ枡妫�楠屽崟"
+            }
+        },
+        {
+            "path": "pages/ZLGL/lailiaojianyan/POStockInCheckBillList",
+            "style": {
+                "navigationBarTitleText": "鏉ユ枡妫�楠屽崟缁存姢"
+            }
+        },
+        {
+            "path": "pages/ZLGL/mojianjianyan/ProcessCheckBill",
+            "style": {
+                "navigationBarTitleText": "鏈欢妫�楠屽崟"
+            }
+        },
+        {
+            "path": "pages/chaituosaoma-xiaowei/UnpackPallet",
+            "style": {
+                "navigationBarTitleText": "鎷嗘墭鎵爜锛堝皬鍗級"
+            }
+        },
+        {
+            "path": "pages/sanmaheyi/BarCodeCheck",
+            "style": {
+                "navigationBarTitleText": "涓夌爜鍚堜竴"
+            }
+        },
+        {
+            "path": "pages/simaheyi/BarCodeCheck_SN",
+            "style": {
+                "navigationBarTitleText": "鍥涚爜鍚堜竴"
+            }
+        },
+        {
+            "path": "pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇鍏ュ簱鏍￠獙"
+            }
+        },
+        {
+            "path": "pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill",
+            "style": {
+                "navigationBarTitleText": "鍑哄巶鏍￠獙"
+            }
+        },
+        {
+            "path": "pages/weiwaigxIn/Cj_StationEntrustInBill",
+            "style": {
+                "navigationBarTitleText": "宸ュ簭濮斿鍙戝嚭鍗�"
+            }
+        },
+        {
+            "path": "pages/weiwaigxIn/Cj_StationEntrustInBillList",
+            "style": {
+                "navigationBarTitleText": "宸ュ簭濮斿鍙戝嚭鍗曠紦瀛�"
+            }
+        },
+        {
+            "path": "pages/weiwaigxOut/Cj_StationEntrustOutBill",
+            "style": {
+                "navigationBarTitleText": "宸ュ簭濮斿鎺ユ敹鍗�"
+            }
+        },
+        {
+            "path": "pages/weiwaigxOut/Cj_StationEntrustOutBillList",
+            "style": {
+                "navigationBarTitleText": "宸ュ簭濮斿鎺ユ敹鍗曠紦瀛�"
+            }
+        },
+        {
+            "path": "pages/jishikucunchaxun/table",
+            "style": {
+                "navigationBarTitleText": "鍗虫椂搴撳瓨鏌ヨ"
+            }
+        },
+        {
+            "path": "pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast",
+            "style": {
+                "navigationBarTitleText": "鏉ユ枡妫�楠屽崟"
+            }
+        },
+        {
+            "path": "pages/ZLGL/checkFlowList/QC_CheckBillflowList",
+            "style": {
+                "navigationBarTitleText": "寰呮垜瀹℃牳",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/ZLGL/checkFlowList/QC_CheckedBillflowList",
+            "style": {
+                "navigationBarTitleText": "宸插鏍�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/Gy_MouldFile/Gy_MouldFileList",
+            "style": {
 
-	],
-	"tabBar": {
-		"color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-		"selectedColor": "#2d7dee", //tab 涓婄殑鏂囧瓧閫変腑鏃剁殑棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-		"borderStyle": "black", //tabbar涓婅竟妗嗙殑棰滆壊锛� 浠呮敮鎸� black / white
-		"backgroundColor": "#ffffff", //tab 鐨勮儗鏅壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-		"list": [{
-				"pagePath": "pages/index/index",
-				"iconPath": "static/tabBar/home.png",
-				"selectedIconPath": "static/tabBar/home-default.png",
-				"text": "浠撳偍绠＄悊"
-			},
-			{
-				"pagePath": "pages/index/tab1",
-				"iconPath": "static/tabBar/icon1.png",
-				"selectedIconPath": "static/tabBar/icon1-default.png",
-				"text": "杞﹂棿绠＄悊"
-			},
-			{
-				"pagePath": "pages/index/tab3",
-				"iconPath": "static/tabBar/icon4.png",
-				"selectedIconPath": "static/tabBar/icon4-default.png",
-				"text": "璁惧绠＄悊"
-			},
-			{
-				"pagePath": "pages/index/tab4",
-				"iconPath": "static/tabBar/icon3.png",
-				"selectedIconPath": "static/tabBar/icon3-default.png",
-				"text": "璐ㄩ噺绠＄悊"
-			},
-			{
-				"pagePath": "pages/index/tab2",
-				"iconPath": "static/tabBar/icon2.png",
-				"selectedIconPath": "static/tabBar/icon2-default.png",
-				"text": "鍗曟嵁鍒楄〃"
-			},
-			{
-				"pagePath": "pages/index/mine",
-				"iconPath": "static/tabBar/user.png",
-				"selectedIconPath": "static/tabBar/user-default.png",
-				"text": "鎴戠殑"
-			}
-		]
-	},
-	"globalStyle": {
-		"navigationBarTextStyle": "white",
-		"navigationBarTitleText": "璁惧绠＄悊",
-		"navigationBarBackgroundColor": "#3A78FF",
-		"backgroundColor": "#F8F8F8",
-		"pageOrientation": "default"
-	},
-	"uniIdRouter": {},
-	"condition": { //妯″紡閰嶇疆锛屼粎寮�鍙戞湡闂寸敓鏁�
-		"current": 0, //褰撳墠婵�娲荤殑妯″紡(list 鐨勭储寮曢」)
-		"list": [{
-			"name": "", //妯″紡鍚嶇О
-			"path": "", //鍚姩椤甸潰锛屽繀閫�
-			"query": "" //鍚姩鍙傛暟锛屽湪椤甸潰鐨刼nLoad鍑芥暟閲岄潰寰楀埌
-		}]
-	}
+                "navigationBarTitleText": "鍣ㄥ叿妗ｆ鏌ヨ",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/ZLGL/QualityReportStep/QualityReportStepBill",
+            "style": {
+                "navigationBarTitleText": "鍏ㄦ妫�楠屽崟(涓嶈壇姹囨姤)",
+                "pageOrientation": "auto" // 鏀寔妯睆
+            }
+        },
+        {
+            "path": "pages/ZLGL/QualityReportStep/QualityReportStepBillList",
+            "style": {
+                "navigationBarTitleText": "鍏ㄦ妫�楠屽崟(涓嶈壇姹囨姤)鏌ヨ"
+            }
+        },
+        {
+            "path": "pages/MJGL/MouldScrapOutBill/MouldScrapOutBillList",
+            "style": {
+
+                "navigationBarTitleText": "鍣ㄥ叿鎶ュ簾鍑哄簱鍗曞垪琛�"
+            }
+        },
+        {
+            "path": "pages/MJGL/MouldScrapOutBill/MouldScrapOutBill",
+            "style": {
+
+                "navigationBarTitleText": "鍣ㄥ叿鎶ュ簾鍑哄簱鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBill",
+            "style": {
+                "navigationBarTitleText": "杞﹂棿鑷鍗�"
+            }
+        },
+        {
+            "path": "pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBillList",
+            "style": {
+                "navigationBarTitleText": "杞﹂棿鑷鍗曞垪琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/ZLGL/zaikujianyandan/InStockCheckBill",
+            "style": {
+                "navigationBarTitleText": "鍦ㄥ簱妫�楠屽崟"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill",
+            "style": {
+                "navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill",
+            "style": {
+                "navigationBarTitleText": "璁惧鐐规璁板綍鍗�"
+            }
+        },
+        {
+            "path": "pages/ZLGL/zaikujianyandan/InStockCheckBillList",
+            "style": {
+                "navigationBarTitleText": "鍦ㄥ簱妫�楠屽崟鍒楄〃"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList",
+            "style": {
+                "navigationBarTitleText": "璁惧鐐规璁板綍鍗曠紦瀛�"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList",
+            "style": {
+                "navigationBarTitleText": "璁惧淇濆吇璁板綍鍗曠紦瀛�"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill",
+            "style": {
+                "navigationBarTitleText": "璁惧缁翠慨楠屾敹鍗�"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList",
+            "style": {
+                "navigationBarTitleText": "璁惧缁翠慨楠屾敹鍗曠紦瀛�"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill",
+            "style": {
+                "navigationBarTitleText": "璁惧缁翠慨娲惧伐鍗�"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList",
+
+            "style": {
+                "navigationBarTitleText": "璁惧缁翠慨娲惧伐鍗曠紦瀛�"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill",
+
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿缁翠慨娲惧伐鍗�"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBillList",
+
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿缁翠慨娲惧伐鍗曠紦瀛�"
+            }
+        },
+        {
+            "path": "pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill",
+
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿缁翠慨楠屾敹鍗�"
+            }
+        },
+        {
+            "path": "pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList",
+
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿缁翠慨楠屾敹鍗曠紦瀛�"
+            }
+        },
+        {
+            "path": "pages/ZLGL/OA_WorkLink/OA_WorkLinkBill",
+            "style": {
+                "navigationBarTitleText": "宸ヤ綔鑱旂郴鍗�"
+            }
+        },
+        {
+            "path": "pages/ZLGL/OA_WorkLink/OA_WorkLinkBillList",
+            "style": {
+                "navigationBarTitleText": "宸ヤ綔鑱旂郴鍗曞垪琛�"
+            }
+        },
+        {
+            "path": "pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery",
+            "style": {
+                "navigationBarTitleText": "宸ヤ綔鑱旂郴鍗曟煡璇�"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport",
+
+            "style": {
+                "navigationBarTitleText": "璁惧缁翠慨浠诲姟"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport",
+
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿缁翠慨浠诲姟"
+            }
+        },
+        {
+            "path": "pages/EmployeeRecords/EmployeeRecordsBill",
+
+            "style": {
+                "navigationBarTitleText": "鍛樺伐绛惧埌璁板綍琛�"
+            }
+        },
+        {
+            "path": "pages/EmployeeRecords/EmployeeRecordsBillList",
+
+            "style": {
+                "navigationBarTitleText": "鍛樺伐绛惧埌璁板綍琛ㄥ垪琛�"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill",
+
+            "style": {
+                "navigationBarTitleText": "璁惧鏁呴殰鐧昏鍗�"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBillList",
+
+            "style": {
+                "navigationBarTitleText": "璁惧鏁呴殰鐧昏鍗曞垪琛�"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sb_EquipBegin/Sb_EquipBeginBill",
+            "style": {
+                "navigationBarTitleText": "璁惧寮�鏈哄崟"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sb_EquipStop/Sb_EquipStopBill",
+            "style": {
+                "navigationBarTitleText": "璁惧鍋滄満鍗�"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sc_WorkDotCheck/Sc_WorkDotCheckBillList_Day",
+            "style": {
+                "navigationBarTitleText": "鐐规娓呭崟"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sb_EquipResumeCheckQuery/Sb_EquipResumeCheckQuery",
+            "style": {
+                "navigationBarTitleText": "璁惧灞ュ巻"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sc_EquipmentProcessList/Sc_EquipmentProcess",
+            "style": {
+                "navigationBarTitleText": "璁惧宸ヨ壓璺嚎"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill",
+            "style": {
+                "navigationBarTitleText": "璁惧缁翠慨璁板綍鍗�"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sc_OEEStatusReport/Sc_OEEStatusReport",
+            "style": {
+                "navigationBarTitleText": "璁惧鐘舵��"
+            }
+        },
+        {
+            "path": "pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBillList",
+            "style": {
+                "navigationBarTitleText": "璁惧缁翠慨璁板綍鍗曞垪琛�"
+            }
+        }
+
+
+    ],
+    "tabBar": {
+        "color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+        "selectedColor": "#2d7dee", //tab 涓婄殑鏂囧瓧閫変腑鏃剁殑棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+        "borderStyle": "black", //tabbar涓婅竟妗嗙殑棰滆壊锛� 浠呮敮鎸� black / white
+        "backgroundColor": "#ffffff", //tab 鐨勮儗鏅壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+        "list": [{
+                "pagePath": "pages/index/index",
+                "iconPath": "static/tabBar/home.png",
+                "selectedIconPath": "static/tabBar/home-default.png",
+                "text": "浠撳偍绠＄悊"
+            },
+            {
+                "pagePath": "pages/index/tab1",
+                "iconPath": "static/tabBar/icon1.png",
+                "selectedIconPath": "static/tabBar/icon1-default.png",
+                "text": "杞﹂棿绠＄悊"
+            },
+            {
+                "pagePath": "pages/index/tab3",
+                "iconPath": "static/tabBar/icon4.png",
+                "selectedIconPath": "static/tabBar/icon4-default.png",
+                "text": "璁惧绠＄悊"
+            },
+            {
+                "pagePath": "pages/index/tab4",
+                "iconPath": "static/tabBar/icon3.png",
+                "selectedIconPath": "static/tabBar/icon3-default.png",
+                "text": "璐ㄩ噺绠＄悊"
+            },
+            {
+                "pagePath": "pages/index/tab2",
+                "iconPath": "static/tabBar/icon2.png",
+                "selectedIconPath": "static/tabBar/icon2-default.png",
+                "text": "鍗曟嵁鍒楄〃"
+            },
+            {
+                "pagePath": "pages/index/mine",
+                "iconPath": "static/tabBar/user.png",
+                "selectedIconPath": "static/tabBar/user-default.png",
+                "text": "鎴戠殑"
+            }
+        ]
+    },
+    "globalStyle": {
+        "navigationBarTextStyle": "white",
+        "navigationBarTitleText": "璁惧绠＄悊",
+        "navigationBarBackgroundColor": "#3A78FF",
+        "backgroundColor": "#F8F8F8",
+        "pageOrientation": "default"
+    },
+    "uniIdRouter": {},
+    "condition": { //妯″紡閰嶇疆锛屼粎寮�鍙戞湡闂寸敓鏁�
+        "current": 0, //褰撳墠婵�娲荤殑妯″紡(list 鐨勭储寮曢」)
+        "list": [{
+            "name": "", //妯″紡鍚嶇О
+            "path": "", //鍚姩椤甸潰锛屽繀閫�
+            "query": "" //鍚姩鍙傛暟锛屽湪椤甸潰鐨刼nLoad鍑芥暟閲岄潰寰楀埌
+        }]
+    }
 }
\ No newline at end of file
diff --git a/pages/EmployeeRecords/EmployeeRecordsBill.vue b/pages/EmployeeRecords/EmployeeRecordsBill.vue
index e6f179a..cd8a79f 100644
--- a/pages/EmployeeRecords/EmployeeRecordsBill.vue
+++ b/pages/EmployeeRecords/EmployeeRecordsBill.vue
@@ -40,28 +40,28 @@
 			<view class="form-item">
 				<view class="title">鐝粍:</view>
 				<view class="right">
-					<uni-combox :candidates="arrayHGroupName" placeholder="璇烽�夋嫨杞﹂棿" v-model="hform.HGroupName"
+					<uni-combox :candidates="arrayHGroupName" placeholder="璇烽�夋嫨鐝粍" v-model="hform.HGroupName"
 						@input="HGroupNameChange"></uni-combox>
 				</view>
 			</view>
 			<view class="form-item">
 				<view class="title">鐝:</view>
 				<view class="right">
-					<uni-combox :candidates="arrayHShiftsName" placeholder="璇烽�夋嫨杞﹂棿" v-model="hform.HShiftsName"
+					<uni-combox :candidates="arrayHShiftsName" placeholder="璇烽�夋嫨鐝" v-model="hform.HShiftsName"
 						@input="HShiftsNameChange"></uni-combox>
 				</view>
 			</view>	
 			<view class="form-item">
 				<view class="title">鐢熶骇璧勬簮:</view>
 				<view class="right">
-					<uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨杞﹂棿" v-model="hform.HSourceName"
+					<uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
 						@input="HSourceNameChange"></uni-combox>
 				</view>
 			</view>	
 			<view class="form-item">
 				<view class="title">宸ュ簭:</view>
 				<view class="right">
-					<uni-combox :candidates="arrayHProcName" placeholder="璇烽�夋嫨杞﹂棿" v-model="hform.HProcName"
+					<uni-combox :candidates="arrayHProcName" placeholder="璇烽�夋嫨宸ュ簭" v-model="hform.HProcName"
 						@input="HProcNameChange"></uni-combox>
 				</view>
 			</view>	
@@ -344,14 +344,8 @@
 					}
 				],
 				selectedRows: [], // 瀛樺偍閫変腑鐨勬暟鎹�
-				HModName: "Sc_PackUnionBill_Packing_PDA",
-				ModRightName: "CE_PackUnionBill_Packing", //妯″潡鏉冮檺鍙傛暟
 				titleData: [], //涓嶉渶瑕佹樉绀虹殑瀛楁
-				OperationType: 1, //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
-				//钃濈墮鐩稿叧淇℃伅
-				printInfo: "", //鎵撳嵃鍐呭
-				maskShow: false, //钃濈墮鎵撳嵃鏈烘樉绀虹粦瀹�
-				printListData: [], //
+				OperationType: 1, //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩�
 				//灞曠ず琛ㄥ崟
 				showResultTable: false, // 鎺у埗缁撴灉琛ㄦ牸鏄剧ず
 				resultTableData: [], // 缁撴灉琛ㄦ牸鏁版嵁
@@ -432,24 +426,7 @@
 					HMaterModel: '',
 					HRoles: [],
 				},
-				roleOptions: [],
-				// [{
-				// 		value: '鐝粍闀�',
-				// 		text: '鐝粍闀�'
-				// 	},
-				// 	{
-				// 		value: '鐝憳',
-				// 		text: '鐝憳'
-				// 	},
-				// 	{
-				// 		value: '鏈轰慨宸�',
-				// 		text: '鏈轰慨宸�'
-				// 	},
-				// 	{
-				// 		value: '鎿嶄綔宸�',
-				// 		text: '鎿嶄綔宸�'
-				// 	}
-				// ],
+				roleOptions: [],				
 				// 鍒嗛〉妯″潡鍏冩暟鎹�
 				paginationMeta: {
 
@@ -784,106 +761,60 @@
 			},
 			GetMeesageByBarCode(HBarCode) {
 
-				// 鑾峰彇寰呯粍鎵樻潯鐮佸搴旂殑鏁版嵁 
-				let sOldBarCode = this.HBarCode
-				let HDeleteFlag = sOldBarCode.substring(0, 1)
-				let sBarCode = sOldBarCode.slice(1)
-				if (HDeleteFlag == '*') {
-					if (!sBarCode) {
-						return uni.showToast({
-							icon: 'none',
-							title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
-						})
-					} else {
-						this.HBarCodeFocusRefresh()
-					}
-					CommonUtils.doRequest2({
-						url: '/WEBSController/set_DelPackUnionBill_Temp_Pack_Json',
-						data: {
-							"HInterID": this.hform.HInterID,
-							"HBarCode": sBarCode,
-							"HBillType": this.HBillType
-						},
-						resFunction: (res) => {
-							let {
-								data,
-								count,
-								Message
-							} = res.data
-							if (count == 1) {
-								CommonUtils.playSound(1)
-								//this.DisBillEntryList()
-							} else {
-								CommonUtils.playSound(0)
-								uni.showToast({
-									icon: 'none',
-									title: Message
-								})
-							}
-						}
-					})
-				} else {
-					let sBarCode = this.HBarCode
-					if (!sBarCode) {
-						return uni.showToast({
-							icon: 'none',
-							title: '鏉＄爜涓嶈兘涓虹┖锛岃鎵弿鏉＄爜锛�',
-						})
-					}
-					CommonUtils.doRequest2({
-						url: '/Sc_EmployeeSignInNoteBillController/APP_Edit_json',
-						data: {
-							"HInterID": this.hform.HInterID,
-							"HBarCode": sBarCode,
-						},
-
-						resFunction: (res) => {
-							let {
-								data,
-								count,
-								Message
-							} = res.data
-							if (count == 1) {
-								CommonUtils.playSound(1)
-								//let data=res.data
-								console.log(sBarCode)
-								console.log(res.data.data[0])
-								console.log(res.data[1])
-								debugger
-								this.hform.HMouldID = data[0][0].妯″叿id
-								console.log("idwei", data[0][0].妯″叿id)
-								this.hform.HMouldNo = data[0][0].妯″叿缂栫爜
-								this.hform.HMouldName = data[0][0].妯″叿鍚嶇О
-								this.hform.HMouldState = data[0][0].妯″叿鐘舵��
-								this.listData = []
-								let tabledata = data[1][0]
-								if (data[1].length > 0) {
-									this.hform.HEquipID = tabledata.璁惧鍐呯爜
-									this.hform.HEquipName = tabledata.璁惧鍚嶇О
-									//
-									//this.hform.HSourceID = tabledata.HSourceID
-									this.hform.HMaterID = tabledata.HMaterID
-									//this.hform.HProcID = tabledata.HSourceInterID
-									for (let i = 0; i < data[1].length; i++) {
-										this.listData.push(Object.assign(data[1][i], {
-											index: i
-										}))
-									}
-								}
-
-
-							} else {
-								CommonUtils.playSound(0)
-								this.listData = []
-								this.HBarCodeFocusRefresh()
-								uni.showToast({
-									icon: 'none',
-									title: Message
-								})
-							}
-						}
+				let sBarCode = this.HBarCode
+				if (!sBarCode) {
+					return uni.showToast({
+						icon: 'none',
+						title: '鏉＄爜涓嶈兘涓虹┖锛岃鎵弿鏉＄爜锛�',
 					})
 				}
+				CommonUtils.doRequest2({
+					url: '/Sc_EmployeeSignInNoteBillController/APP_Edit_json',
+					data: {
+						"HInterID": this.hform.HInterID,
+						"HBarCode": sBarCode,
+					},
+				
+					resFunction: (res) => {
+						let {
+							data,
+							count,
+							Message
+						} = res.data
+						if (count == 1) {
+							//let data=res.data
+							console.log(sBarCode)
+							console.log(res.data.data[0])
+							console.log(res.data[1])
+							this.hform.HMouldID = data[0][0].妯″叿id
+							this.hform.HMouldNo = data[0][0].妯″叿缂栫爜
+							this.hform.HMouldName = data[0][0].妯″叿鍚嶇О
+							this.hform.HMouldState = data[0][0].妯″叿鐘舵��
+							this.listData = []
+							let tabledata = data[1][0]
+							if (data[1].length > 0) {
+								this.hform.HEquipID = tabledata.璁惧鍐呯爜
+								this.hform.HEquipName = tabledata.璁惧鍚嶇О
+								this.hform.HMaterID = tabledata.HMaterID
+								for (let i = 0; i < data[1].length; i++) {
+									this.listData.push(Object.assign(data[1][i], {
+										index: i
+									}))
+								}
+							}
+				
+				
+						} else {
+							CommonUtils.playSound(0)
+							this.listData = []
+							this.HBarCodeFocusRefresh()
+							uni.showToast({
+								icon: 'none',
+								title: Message
+							})
+						}
+					}
+				})
 			},
 			onRoleChange(e) {
 				console.log('閫変腑鐨勮鑹�:', this.hform.HRoles);
@@ -903,7 +834,6 @@
 						"HBillType": this.HBillType
 					},
 					resFunction: (d) => {
-						console.log('d: ', d);
 						let {
 							count,
 							data,
diff --git a/pages/EmployeeRecords/EmployeeRecordsBillList.vue b/pages/EmployeeRecords/EmployeeRecordsBillList.vue
index 7924e7f..1c74151 100644
--- a/pages/EmployeeRecords/EmployeeRecordsBillList.vue
+++ b/pages/EmployeeRecords/EmployeeRecordsBillList.vue
@@ -327,15 +327,9 @@
 					url: "/pages/EmployeeRecords/EmployeeRecordsBill?operationType=1"
 				})
 			},
-			//缂栬緫鐐规璁板綍鍗�
-			edit(item) {
-				console.log(item)
-				uni.navigateTo({
-					url: '/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill?operationType=3&hmainid=' + item.hmainid
-				})
-			},
 			//鍒犻櫎鐐规璁板綍鍗�
 			del(item) {
+				console.log(item);
 				uni.showModal({
 					title: '鍒犻櫎纭',
 					content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
@@ -345,7 +339,7 @@
 							CommonUtils.doRequest2({
 								url: '/Sc_EmployeeSignInNoteBillController/deleteBill',
 								data: {
-									HItemID: item['InterID'],
+									HItemID: item['HInterID'],
 									user: getUserInfo()['Czymc']
 								},
 								resFunction: (res) => {
diff --git a/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
index b41f1a2..4d08dea 100644
--- a/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
+++ b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
@@ -1,777 +1,718 @@
 <template>
-    <view>
-        <view class="tabs" id="tabs">
-            <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
-            <!-- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鏄庣粏淇℃伅</view> -->
-            <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
-            <!-- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view> -->
-        </view>
-        <!-- 鍩烘湰淇℃伅 -->
-        <template v-if="tabs == 0">
-            <view class="form" :style="{
+	<view>
+		<view class="tabs" id="tabs">
+			<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+			<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
+		</view>
+		<!-- 鍩烘湰淇℃伅 -->
+		<template v-if="tabs == 0">
+			<view class="form" :style="{
                 height: containerHeight + 'px',
                 overflow: 'auto'
             }">
-                <view class="form-item">
-                    <view class="title">妯″叿鏉＄爜:</view>
-                    <view :class="enableEdit?'right':'righton'">
-                        <input v-model="hform.HBarCode" :disabled="!enableEdit"
-                            @confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)妯″叿鏉＄爜" />
-                    </view>
-                    <view class="icon-wrapper">
-                        <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鏈�缁堢粨璁�:</view>
-                    <view class="right none-border">
-                        <radio-group @change="radioChange" class="radio_Container">
-                            <label>
-                                <view>
-                                    <radio value="OK" :checked="hform.HCheckResult == 'OK'" />
-                                    <text>OK</text>
-                                </view>
-                            </label>
-                            </label>
-                            <view>
-                                <radio value="NG" :checked="hform.HCheckResult == 'NG'" />
-                                <text>NG</text>
-                            </view>
-                            </label>
-                        </radio-group>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">楠屾敹鍐呭:</view>
-                    <view class="right">
-                        <textarea v-model="hform.HRepairCheckMainContent" placeholder="璇疯緭鍏ラ獙鏀跺唴瀹�" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">婧愬崟绫诲瀷:</view>
-                    <zxz-uni-data-select class="right" :localdata="[
-                        {key: '鎵嬪伐褰曞叆', value: '-1'},
-                        {key: '妯″叿鏁呴殰鐧昏鍗�', value: '3815'}
-                        ]" dataKey="key" dataValue="value" v-model="hform.HMainSourceBillType">
+				<view class="form-item">
+					<view class="title">妯″叿鏉＄爜:</view>
+					<view :class="enableEdit?'right':'righton'">
+						<input v-model="hform.HBarCode" :disabled="!enableEdit"
+							@confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)妯″叿鏉＄爜" />
+					</view>
+					<view class="icon-wrapper">
+						<uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏈�缁堢粨璁�:</view>
+					<view class="right none-border">
+						<radio-group @change="radioChange" class="radio_Container">
+							<label>
+								<view>
+									<radio value="OK" :checked="hform.HCheckResult == 'OK'" />
+									<text>OK</text>
+								</view>
+							</label>
+							</label>
+							<view>
+								<radio value="NG" :checked="hform.HCheckResult == 'NG'" />
+								<text>NG</text>
+							</view>
+							</label>
+						</radio-group>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">楠屾敹鍐呭:</view>
+					<view class="right">
+						<textarea v-model="hform.HRepairCheckMainContent" placeholder="璇疯緭鍏ラ獙鏀跺唴瀹�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">婧愬崟绫诲瀷</view>
+					<view class="right" v-show="showHMainSourceBillType">
+						<picker :range="arrayHMainSourceBillType" @change="HMainSourceBillTypeChange">
 
-                    </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
-                </view>
-                <view class="form-item">
-                    <view class="title">婧愬崟鍙�:</view>
-                    <view class="right">
-                        <input v-model="hform.HMainSourceBillNo" />
-                    </view>
-                    <view class="icon-wrapper">
-                        <uni-icons type="search" size="20" @click="toCheckFile"></uni-icons>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍗曟嵁鍙�:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HBillNo" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍗曟嵁鏃ユ湡:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title required">閮ㄩ棬:</view>
-                    <zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
-                        dataValue="HItemID" v-model="hform.HDeptID">
+							<input disabled name="HMainSourceBillType" v-model="HMainSourceBillType"
+								placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+							<view class="picker-overlay"></view>
+						</picker>
+					</view>
+					<view class="righton" v-show="!showHMainSourceBillType">
+						<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+							placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title required">鏁呴殰鐧昏鍗�</view>
+					<view class="right" v-show="hform.HMainSourceBillType != 1">
+						<input type="text" name="HBarCode" v-model="hform.HMainSourceBillNo" />
+					</view>
+					<view class="icon-wrapper" v-show="hform.HMainSourceBillType != 1"
+						:disabled="hform.HMainSourceBillType == -1">
+						<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+					</view>
+					<view class="righton" v-show="hform.HMainSourceBillType == 1">
+						<input type="text" disabled name="HBarCode" v-model="hform.HMainSourceBillNo" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HBillNo" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鏃ユ湡:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title required">閮ㄩ棬:</view>
+					<zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
+						dataValue="HItemID" v-model="hform.HDeptID">
 
-                    </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
-                </view>
-                <view class="form-item">
-                    <view class="title required">楠屾敹浜�:</view>
-                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
-                        dataValue="HItemID" v-model="hform.HEmpID">
-
-                    </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
-                </view>
-                <view class="form-item">
-                    <view class="title required">楠屾敹椤圭洰:</view>
-                    <zxz-uni-data-select required class="right" :localdata="HRepairCheckList" dataKey="缁翠慨楠屾敹椤圭洰"
-                        dataValue="hitemid" v-model="hform.HRepairCheckMainID">
-
-                    </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
-                </view>
-                <view class="form-item">
-                    <view class="title required">璐熻矗浜�:</view>
-                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
-                        dataValue="HItemID" v-model="hform.HManagerID">
-
-                    </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
-                </view>
-                <!-- 鎵爜甯﹀嚭缁翠慨璁板綍 -->
-                <view class="form-item">
-                    <view class="title required">缁翠慨璁板綍:</view>
-                    <view class="right">
-                        <input type="text" value="" />
-                    </view>
-                    <view class="icon-wrapper">
-                        <uni-icons type="search" size="20" @click="toCheckFile"></uni-icons>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">妯″叿鍚嶇О:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMouldName" disabled />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">妯″叿瑙勬牸:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMouldSpec" disabled />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">妯″叿鍨嬪彿:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMouldModel" disabled />
-                    </view>
-                </view>
-            </view>
-        </template>
-        <!-- 鍏朵粬淇℃伅 -->
-        <template v-if="tabs == 2">
-            <view class="form" :style="{
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title required">楠屾敹浜�:</view>
+					<zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+						dataValue="HItemID" v-model="hform.HEmpID">
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title required">楠屾敹椤圭洰:</view>
+					<zxz-uni-data-select required class="right" :localdata="HRepairCheckList" dataKey="缁翠慨楠屾敹椤圭洰"
+						dataValue="hitemid" v-model="hform.HRepairCheckMainID">
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title required">璐熻矗浜�:</view>
+					<zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+						dataValue="HItemID" v-model="hform.HManagerID">
+					</zxz-uni-data-select>
+				</view>
+				<!-- 鎵爜甯﹀嚭缁翠慨璁板綍 -->
+				<view class="form-item">
+					<view class="title required">缁翠慨璁板綍:</view>
+					<view class="right" v-show="hform.HMainSourceBillType != 1">
+						<input type="text" v-model="hform.HMouldRepairWorkName"
+							:disabled="hform.HMainSourceBillType == -1" placeholder="璇烽�夋嫨缁翠慨璁板綍" />
+					</view>
+					<view class="icon-wrapper" v-show="hform.HMainSourceBillType != 1"
+						:disabled="hform.HMainSourceBillType == -1">
+						<uni-icons type="search" size="20" @click="showRepairRecordList"></uni-icons>
+					</view>
+					<view class="righton" v-show="hform.HMainSourceBillType == 1">
+						<input type="text" disabled v-model="hform.HMouldRepairWorkName" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">妯″叿鍚嶇О:</view>
+					<view class="righton">
+						<input v-model="hform.HMouldName" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">妯″叿瑙勬牸:</view>
+					<view class="righton">
+						<input v-model="hform.HMouldSpec" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">妯″叿鍨嬪彿:</view>
+					<view class="righton">
+						<input v-model="hform.HMouldModel" disabled />
+					</view>
+				</view>
+			</view>
+		</template>
+		<!-- 鍏朵粬淇℃伅 -->
+		<template v-if="tabs == 2">
+			<view class="form" :style="{
                 height: containerHeight + 'px',
                 overflow: 'auto'
             }">
-                <view class="form-item">
-                    <view class="title">鍒涘缓浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMaker" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍒涘缓鏃ユ湡:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMakeDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">淇敼浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HUpDater" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">淇敼鏃ユ湡:</view>
-                    <view class="righton">
-                        <input v-model="hform.HUpDateDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">瀹℃牳浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HChecker" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">瀹℃牳鏃堕棿:</view>
-                    <view class="righton">
-                        <input v-model="hform.HCheckDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">浣滃簾浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HDeleteMan" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">浣滃簾鏃ユ湡:</view>
-                    <view class="righton">
-                        <input v-model="hform.HDeleteDate" />
-                    </view>
-                </view>
-            </view>
+				<view class="form-item">
+					<view class="title">鍒涘缓浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HMaker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒涘缓鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HMakeDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDater" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDateDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HChecker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳鏃堕棿:</view>
+					<view class="righton">
+						<input v-model="hform.HCheckDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteMan" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteDate" />
+					</view>
+				</view>
+			</view>
 
-        </template>
-        <!-- 鎿嶄綔鎸夐挳 -->
-        <view class="buttons" id="buttons">
-            <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-            <view style="flex: 1;"></view>
-            <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
-            <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
-        </view>
-        <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
-    </view>
+		</template>
+		<!-- 鎿嶄綔鎸夐挳 -->
+		<view class="buttons" id="buttons">
+			<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			<view style="flex: 1;"></view>
+			<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+			<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+		</view>
+		<!-- 寮瑰嚭妯″叿鏁呴殰鐧昏鍗曠殑閫夋嫨鍒楄〃 -->
+		<BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType"
+			:HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
+		</BillListPopupMouldConkBookBillVue>
+		<!-- 寮瑰嚭妯″叿缁翠慨璁板綍鍗曠殑閫夋嫨鍒楄〃 -->
+		<RepairRecordPopup ref="repairRecordList" :HBillType="hform.HBillType" :HStockOrgID="hform.HStockOrgID">
+		</RepairRecordPopup>
+	</view>
 </template>
 
 <script>
-    import dayjs from "dayjs";
-    import {
-        CommonUtils
-    } from "@/utils/common";
-    import {
-        MpaasScan
-    } from "@/utils/mpaasScan.js"
-    import {
-        getUserInfo
-    } from "../../../utils/auth";
-    export default {
-        name: 'Sc_MouldRepairCheckBill',
-        data() {
-            return {
-                tabs: 0,
-                HMainSourceBillType: "",
-                btnTop: 0,
-                tabsBottom: 0,
-                HModName: "Sc_MouldRepairCheckBill",
-                HBillType: '3817',
-                operationType: 1,
-                uploadOptions: {},
-                enableEdit: true,
+	import dayjs from "dayjs";
+	import {
+		CommonUtils
+	} from "@/utils/common";
+	import {
+		MpaasScan
+	} from "@/utils/mpaasScan.js"
+	import {
+		getUserInfo
+	} from "../../../utils/auth";
+	import BillListPopupMouldConkBookBillVue from '../../../components/BillListPopup/BillListPopupMouldConkBookBill.vue';
+	import RepairRecordPopup from '../../../components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue';
 
-                HDeptList: [],
-                HRepairCheckList: [],
-                HEmpList: [],
+	export default {
+		components: {
+			BillListPopupMouldConkBookBillVue,
+			RepairRecordPopup
+		},
+		name: 'Sc_MouldRepairCheckBill',
+		data() {
+			return {
+				tabs: 0,
+				btnTop: 0,
+				tabsBottom: 0,
+				HModName: "Sc_MouldRepairCheckBill",
+				HBillType: '3817',
+				operationType: 1,
+				enableEdit: true,
 
-                hform: {
-                    "HBarCode": "",
-                    "HBillNo": "",
-                    "HInterID": 0,
-                    "HDate": dayjs(new Date()).format("YYYY-MM-DD"),
-                    "HInnerBillNo": "",
-                    "HMouldName": "",
-                    "HMouldSpec": "",
-                    "HMouldModel": "",
-                    "HMouldID": 0,
-                    "HMainSourceBillType": "-1",
-                    "HMainSourceInterID": 0,
-                    "HMainSourceEntryID": 0,
-                    "HCheckResult": "OK",
-                    "HEmpName": "",
-                    "HEmpID": 0,
-                    "HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD"),
-                    "HDeptName": "",
-                    "HDeptID": 0,
-                    "HMainSourceBillNo": "",
-                    "HManagerName": "",
-                    "HManagerID": 0,
-                    "HMouldRepairWorkName": "",
-                    "HMouldRepairWorkID": 0,
-                    "HExplanation": "",
-                    "HRemark": "",
-                    "HOrgID": uni.getStorageSync("OrganizationID"),
-                    "HMaker": getUserInfo()["Czymc"],
-                    "HChecker": "",
-                    "HCloseMan": "",
-                    "HUpDater": "",
-                    "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD"),
-                    "HCheckDate": "",
-                    "HCloseDate": "",
-                    "HUpDateDate": "",
-                    "HDeleteMan": "",
-                    "HDeleteDate": "",
-                    "HRepairCheckMainID": 0,
-                    "HRepairCheckMainContent": "",
-                },
-                HBillSub: [{ // 鍚庣鎺ュ彛闇�瑕併�傚惁鍒欐暟鎹笉浼氭樉绀哄湪缂撳瓨涓�
-                    "HRepairCheckID": 0,
-                    "HRepairCheckCode": "",
-                    "HRepairCheckName": "",
-                    "HRepairCheckContent": "",
-                    "HManagerID": 0,
-                    "HManagerCode": "",
-                    "HManagerName": "",
-                    "HRemark": "",
-                    "LAY_TABLE_INDEX": 0
-                }]
-            };
-        },
-        computed: {
-            containerHeight: {
-                get() {
-                    return this.btnTop - this.tabsBottom - 5
-                }
-            },
-        },
-        methods: {
-            // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
-            ValidCheck() {
-                if (this.hform.HEquipID == 0) {
-                    return {
-                        Message: "鏈綍鍏ユā鍏蜂俊鎭紝璇峰厛褰曞叆妯″叿淇℃伅!",
-                        state: false
-                    }
-                }
-                if (this.hform.HDeptID == 0) {
-                    return {
-                        Message: "閮ㄩ棬涓嶅緱涓虹┖!",
-                        state: false
-                    }
-                }
-                if (this.hform.HEmpID == 0) {
-                    return {
-                        Message: "楠屾敹浜轰笉寰椾负绌�!",
-                        state: false
-                    }
-                }
-                if (this.hform.HRepairCheckMainID == 0) {
-                    return {
-                        Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
-                        state: false
-                    }
-                }
-                if (this.hform.HManagerID == 0) {
-                    return {
-                        Message: "璐熻矗浜轰笉寰椾负绌�!",
-                        state: false
-                    }
-                }
+				// 鎺у埗婧愬崟绫诲瀷鏄惁鍙紪杈�
+				showHMainSourceBillType: true,
+				HMainSourceBillType: '妯″叿鏁呴殰鐧昏鍗�',
+				arrayHMainSourceBillType: ['妯″叿鏁呴殰鐧昏鍗�'],
+				arrayHMainSourceBillTypeID: ['3815'],
 
-                return {
-                    Message: "",
-                    state: true
-                }
-            },
-            addNew() {
-                uni.redirectTo({
-                    url: './Sb_MouldRepairCheckBill?operationType=1'
-                })
-            },
-            goBack() {
-                uni.navigateBack()
-            },
-            checkBoxChangeHandler(index, e) {
-                let cr = e.detail.value
-                if (cr.length == 0) {
-                    this.HCheckFileList[index]["HDotCheckResult"] = false
-                } else {
-                    this.HCheckFileList[index]["HDotCheckResult"] = true
-                }
-            },
-            uploadFile(index) {
-                console.log('filePath: ', this.attachmentInfo[index].filePath);
-                // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
-                uni.uploadFile({
-                    url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
-                    filePath: this.attachmentInfo[index].filePath,
-                    name: 'file',
-                    formData: {
-                        HBillNo: this.hform.HBillNo,
-                        HRemark: "",
-                        HUserName: getUserInfo()["Czymc"]
-                    },
-                    success: (uploadRes) => {
-                        CommonUtils.showTips({
-                            message: "涓婁紶鎴愬姛"
-                        })
-                        this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
-                    },
-                    fail: (err) => {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: `涓婁紶澶辫触: ${err}`
-                        })
-                    }
-                })
-            },
-            delFile(index) {
-                console.log('attachmentInfo: ', this.attachmentInfo[index]);
-                uni.showModal({
-                    title: '鎻愮ず',
-                    content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
-                    success: (res) => {
-                        if (res.confirm) {
-                            this.attachmentInfo.splice(index, 1)
-                        }
-                    },
-                })
+				HDeptList: [],
+				HRepairCheckList: [],
+				HEmpList: [],
 
-            },
-            handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
-                console.log('file: ', res);
-                let fileInfo = res.data[0]
-                this.attachmentInfo.push({
-                    fileName: fileInfo.name,
-                    size: fileInfo.size,
-                    status: '绛夊緟涓婁紶',
-                    filePath: fileInfo.tempFilePath
-                })
-            },
-            // 涓婁紶鏂囦欢
-            fileUpload() {
-                this.$refs.XeUpload.upload('file', {});
-            },
-            //鑾峰彇鐝鏁版嵁
-            async getShiftList() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: '/Web/GetGy_ShiftsList_Json',
-                        data: {
-                            Shifts: "",
-                        }
-                    })
+				hform: {
+					"HBillType": 3817,
+					"HBarCode": "",
+					"HBillNo": "",
+					"HInterID": 0,
+					"HDate": dayjs(new Date()).format("YYYY-MM-DD"),
+					"HInnerBillNo": "",
+					"HMouldName": "",
+					"HMouldSpec": "",
+					"HMouldModel": "",
+					"HMouldID": 0,
+					"HMainSourceBillType": "3815",
+					"HMainSourceInterID": 0,
+					"HMainSourceEntryID": 0,
+					"HCheckResult": "OK",
+					"HEmpName": getUserInfo().HEmpName,
+					"HEmpID": getUserInfo().HEmpID,
+					"HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD"),
+					"HDeptName": getUserInfo().HDeptName,
+					"HDeptID": getUserInfo().HDeptID,
+					"HMainSourceBillNo": "",
+					"HManagerName": getUserInfo().HManagerName,
+					"HManagerID": getUserInfo().HManagerID,
+					"HMouldRepairWorkName": "",
+					"HMouldRepairWorkID": 0,
+					"HExplanation": "",
+					"HRemark": "",
+					"HOrgID": uni.getStorageSync("OrganizationID"),
+					"HStockOrgID": uni.getStorageSync("OrganizationID"),
+					"HMaker": getUserInfo()["Czymc"],
+					"HChecker": "",
+					"HCloseMan": "",
+					"HUpDater": "",
+					"HMakeDate": dayjs(new Date()).format("YYYY-MM-DD"),
+					"HCheckDate": "",
+					"HCloseDate": "",
+					"HUpDateDate": "",
+					"HDeleteMan": "",
+					"HDeleteDate": "",
+					"HRepairCheckMainID": 0,
+					"HRepairCheckMainContent": "",
+				},
+				HBillSub: [{ // 鍚庣鎺ュ彛闇�瑕併�傚惁鍒欐暟鎹笉浼氭樉绀哄湪缂撳瓨涓�
+					"HRepairCheckID": 0,
+					"HRepairCheckCode": "",
+					"HRepairCheckName": "",
+					"HRepairCheckContent": "",
+					"HManagerID": 0,
+					"HManagerCode": "",
+					"HManagerName": "",
+					"HRemark": "",
+					"LAY_TABLE_INDEX": 0
+				}]
+			};
+		},
+		computed: {
+			containerHeight: {
+				get() {
+					return this.btnTop - this.tabsBottom - 5
+				}
+			},
+		},
+		methods: {
+			// 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
+			ValidCheck() {
+				if (this.hform.HEquipID == 0) {
+					return {
+						Message: "鏈綍鍏ユā鍏蜂俊鎭紝璇峰厛褰曞叆妯″叿淇℃伅!",
+						state: false
+					}
+				}
+				if (this.hform.HDeptID == 0) {
+					return {
+						Message: "閮ㄩ棬涓嶅緱涓虹┖!",
+						state: false
+					}
+				}
+				if (this.hform.HEmpID == 0) {
+					return {
+						Message: "楠屾敹浜轰笉寰椾负绌�!",
+						state: false
+					}
+				}
+				if (this.hform.HRepairCheckMainID == 0) {
+					return {
+						Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
+						state: false
+					}
+				}
+				if (this.hform.HManagerID == 0) {
+					return {
+						Message: "璐熻矗浜轰笉寰椾负绌�!",
+						state: false
+					}
+				}
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        this.HShiftsList = data
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: Message
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: err
-                    })
-                }
-            },
-            //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
-            async getHDeptList() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: '/Gy_Department/list',
-                        data: {
-                            sWhere: ` and HUSEORGID = ${uni.getStorageSync('OrganizationID')}`,
-                            user: uni.getStorageSync('HUserName'),
-                            Organization: uni.getStorageSync('Organization')
-                        }
-                    })
+				return {
+					Message: "",
+					state: true
+				}
+			},
+			addNew() {
+				uni.redirectTo({
+					url: './Sc_MouldRepairCheckBill?operationType=1'
+				})
+			},
+			goBack() {
+				uni.navigateBack()
+			},
+			showBillList() {
+				this.$refs.billList.showPopup()
+			},
+			showRepairRecordList() {
+				if (this.hform.HMouldID === 0) {
+					CommonUtils.showTips({
+						title: '鎻愮ず',
+						message: '璇峰厛閫夋嫨妯″叿'
+					});
+					return;
+				}
+				this.$refs.repairRecordList.showPopup(this.hform.HMouldID);
+			},
+			//閫夋嫨婧愬崟绫诲瀷
+			HMainSourceBillTypeChange(e) {
+				if (e.detail.value == -1 || e.detail.value == NaN) {
+					this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+					this.hform.HMainSourceBillType = -1
+					return
+				}
+				console.log(e.detail.value)
+				console.log(e)
+				this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+				this.hform.HMainSourceBillType = this.arrayHMainSourceBillTypeID[e.detail.value]
+				const pages = getCurrentPages()
+				// 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+				const currentPage = pages[pages.length - 1]
+				// 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
+				uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
+					HSourceBillTypeName: this.HMainSourceBillType,
+					HSourceBillType: this.hform.HMainSourceBillType
+				})
+			},
+			checkBoxChangeHandler(index, e) {
+				let cr = e.detail.value
+				if (cr.length == 0) {
+					this.HCheckFileList[index]["HDotCheckResult"] = false
+				} else {
+					this.HCheckFileList[index]["HDotCheckResult"] = true
+				}
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			async getHDeptList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Gy_Department/list',
+						data: {
+							sWhere: ` and HUSEORGID = ${uni.getStorageSync('OrganizationID')}`,
+							user: uni.getStorageSync('HUserName'),
+							Organization: uni.getStorageSync('Organization')
+						}
+					})
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        this.HDeptList = data
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: Message
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: err
-                    })
-                }
-            },
-            // 鑾峰彇鑱屽憳鏁版嵁
-            async getEmpList() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: '/PublicPageMethod/UserList',
-                        data: {
-                            sWhere: " where 1=1",
-                        }
-                    })
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HDeptList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			// 鑾峰彇鑱屽憳鏁版嵁
+			async getEmpList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/PublicPageMethod/UserList',
+						data: {
+							sWhere: " where 1=1",
+						}
+					})
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        this.HEmpList = data
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: Message
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: err
-                    })
-                }
-            },
-            // 鑾峰彇楠岃瘉椤圭洰鏁版嵁
-            async getCheckProjList() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: '/Gy_RepairCheck/GetRepairCheckList',
-                        data: {
-                            sWhere: "",
-                            user: uni.getStorageSync('HUserName'),
-                        }
-                    })
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HEmpList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			// 鑾峰彇楠岃瘉椤圭洰鏁版嵁
+			async getCheckProjList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Gy_RepairCheck/GetRepairCheckList',
+						data: {
+							sWhere: "",
+							user: uni.getStorageSync('HUserName'),
+						}
+					})
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        this.HRepairCheckList = data
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: Message
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: err
-                    })
-                }
-            },
-            toScanCode() {
-                MpaasScan.scanCode(cb => {
-                    this.hfrom.HBarCode = cb
-                    this.GetMessageByBarCode(cb)
-                })
-            },
-            async GetMessageByBarCode(HBarCode) {
-                try {
-                    let res = await CommonUtils.doRequest2Sync({
-                        url: "/Sc_PDA_MouldRepairCheckBill/txtHBarCode_KeyDown_List",
-                        data: {
-                            HBarCode: HBarCode,
-                        },
-                    })
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HRepairCheckList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			toScanCode() {
+				MpaasScan.scanCode(cb => {
+					this.hfrom.HBarCode = cb
+					this.GetMessageByBarCode(cb)
+				})
+			},
+			async GetMessageByBarCode(HBarCode) {
+				try {
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Sc_PDA_MouldRepairCheckBill/txtHBarCode_KeyDown_List",
+						data: {
+							HBarCode: HBarCode,
+						},
+					})
 
 
-                    if (!res) {
-                        return
-                    }
+					if (!res) {
+						return
+					}
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
+					let {
+						data,
+						count,
+						Message
+					} = res.data
 
-                    if (count == 1) {
-                        console.log('data: ', data);
-                        this.hform.HMouldID = data[0].hmainid
-                        this.hform.HMouldName = data[0].妯″叿鍚嶇О
-                        this.hform.HMouldSpec = data[0].妯″叿鍝佺被
-                        this.hform.HMouldModel = data[0].妯″叿鍨嬪彿
-                        this.hform.HQty = 1
+					if (count == 1) {
+						console.log('data: ', data);
+						this.hform.HMouldID = data[0].hmainid
+						this.hform.HMouldName = data[0].妯″叿鍚嶇О
+						this.hform.HMouldSpec = data[0].妯″叿鍝佺被
+						this.hform.HMouldModel = data[0].妯″叿鍨嬪彿
+						this.hform.HQty = 1
 
-                        this.enableEdit = false
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: Message
-                        })
-                    }
+						this.enableEdit = false
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: Message
+						})
+					}
 
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: err
-                    })
-                }
-            },
-            async GetItemByEquipFile() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Web/GetItemByEquipFile",
-                        data: {
-                            "EquipProjectID": this.hform.HEquipID,
-                            "Type": "DJ",
-                            "HDate": this.hform.HBeginDate
-                        }
-                    })
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: err
+					})
+				}
+			},
+			radioChange({
+				detail: {
+					value
+				}
+			}) {
+				this.hform.HCheckResult = value
+			},
+			async getMaxNum() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Web/GetMAXNum",
+						data: {
+							"HBillType": this.HBillType
+						}
+					})
 
-                    let {
-                        data,
-                        Message,
-                        count
-                    } = res.data
-                    if (count == 1) {
-                        this.hform.HEquipDotCheckRuleInterID = data[0].鐐规瑙勭▼ID
-                        this.hform.HEquipDotCheckRuleInterNo = data[0].鐐规瑙勭▼鍗曞彿
-                        this.hform.HPlanNo = data[0].鐐规璁″垝鍗�
-                        this.hform.HPlanInterID = (data[0].鐐规璁″垝ID == null ? 0 : data[0].鐐规璁″垝ID) == "" ? 0 : data[0]
-                            .鐐规璁″垝ID
-                        this.hform.HPlanEntryID = (data[0].鐐规璁″垝瀛怚D == null ? 0 : data[0].鐐规璁″垝瀛怚D) == "" ? 0 : data[
-                            0].鐐规璁″垝瀛怚D
+					let {
+						count,
+						data,
+						Message
+					} = res.data
+					console.log('data: ', data);
+					this.hform.HInterID = 0
+					this.hform.HBillNo = data[0]["HBillNo"]
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+					})
+				}
+			},
+			async submit() {
+				let valid = this.ValidCheck()
+				if (!valid.state) {
+					CommonUtils.showTips({
+						message: valid.Message
+					})
+					return
+				}
 
-                        this.HCheckFileList = Array.from(data).map(item => {
-                            return {
-                                "HDotCheckItemID": item.HDotCheckItemID,
-                                "HDotCheckCode": item.鐐规椤圭洰浠ｇ爜,
-                                "HDotCheckItem": item.鐐规椤圭洰,
-                                "HDotCheckPart": item.鐐规閮ㄤ綅,
-                                "HClaim": item.鍏蜂綋瑕佹眰,
-                                "HManagerID": item.璐熻矗浜篒D,
-                                "HManagerCode": item.璐熻矗浜轰唬鐮�,
-                                "HManagerName": item.璐熻矗浜哄悕绉�,
-                                "HSourceInterID": item.鐐规璁″垝ID == null ? 0 : item.鐐规璁″垝ID,
-                                "HSourceEntryID": item.鐐规璁″垝瀛怚D == null ? 0 : item.鐐规璁″垝瀛怚D,
-                                "HSourceBillNo": item.鐐规璁″垝鍗�,
-                                "HDotCheckItemClassID": 0,
-                                "HDotCheckItemClassName": "",
-                                "HDotCheckItemMethodID": 0,
-                                "HDotCheckItemMethodName": "",
-                                "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
-                            }
-                        })
+				try {
+					let oMain = JSON.stringify(this.hform);
+					this.HBillSub[0].HRepairCheckID = this.hform.HRepairCheckMainID
+					this.HBillSub[0].HManagerID = this.hform.HManagerID
+					this.HBillSub[0].HRepairCheckContent = this.hform.HRepairCheckMainContent
+					let sSubStr = JSON.stringify(this.HBillSub);
+					let sMainSub = oMain + ';' + sSubStr + ';' + getUserInfo()['Czymc'];
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Sc_MouldRepairCheckBill/SaveGetMouldRepairCheckBillList",
+						data: {
+							"msg": sMainSub
+						},
+						method: "POST"
+					})
 
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${Message}`
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
-                    })
-                }
-            },
-            radioChange({
-                detail: {
-                    value
-                }
-            }) {
-                this.hform.HCheckResult = value
-            },
-            async getMaxNum() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Web/GetMAXNum",
-                        data: {
-                            "HBillType": this.HBillType
-                        }
-                    })
+					if (!res) {
+						return
+					}
 
-                    let {
-                        count,
-                        data,
-                        Message
-                    } = res.data
-                    console.log('data: ', data);
-                    this.hform.HInterID = 0
-                    this.hform.HBillNo = data[0]["HBillNo"]
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
-                    })
-                }
-            },
-            async submit() {
-                let valid = this.ValidCheck()
-                if (!valid.state) {
-                    CommonUtils.showTips({
-                        message: valid.Message
-                    })
-                    return
-                }
-
-                try {
-                    let oMain = JSON.stringify(this.hform);
-                    this.HBillSub[0].HRepairCheckID = this.hform.HRepairCheckMainID
-                    this.HBillSub[0].HManagerID = this.hform.HManagerID
-                    this.HBillSub[0].HRepairCheckContent = this.hform.HRepairCheckMainContent
-                    let sSubStr = JSON.stringify(this.HBillSub);
-                    let sMainSub = oMain + ';' + sSubStr + ';' + getUserInfo()['Czymc'];
-                    let res = await CommonUtils.doRequest2Sync({
-                        url: "/Sc_MouldRepairCheckBill/SaveGetMouldRepairCheckBillList",
-                        data: {
-                            "msg": sMainSub
-                        },
-                        method: "POST"
-                    })
-
-                    if (!res) {
-                        return
-                    }
-
-                    let {
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        uni.showModal({
-                            title: '鎻愮ず',
-                            content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
-                            success: (res) => {
-                                if (res.confirm) {
-                                    console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-                                    uni.redirectTo({
-                                        url: '/pages/MJGL/Sb_EquipRepairCheck/Sb_EquipRepairCheckBill?operationType=1'
-                                    })
-                                } else if (res.cancel) {
-                                    console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                                    setTimeout(() => {
-                                        uni.navigateBack();
-                                    }, 50)
-                                }
-                            }
-                        });
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: "鎻愪氦鍗曟嵁澶辫触: " + Message
-                        })
-                    }
+					let {
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						uni.showModal({
+							title: '鎻愮ず',
+							content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+							success: (res) => {
+								if (res.confirm) {
+									console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+									uni.redirectTo({
+										url: '/pages/MJGL/Sb_EquipRepairCheck/Sb_EquipRepairCheckBill?operationType=1'
+									})
+								} else if (res.cancel) {
+									console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+									setTimeout(() => {
+										uni.navigateBack();
+									}, 50)
+								}
+							}
+						});
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+						})
+					}
 
 
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: "鎻愪氦鍗曟嵁澶辫触: " + err
-                    })
-                }
-            }
-        },
-        onLoad(e) {
-            console.log('e: ', e);
-            if (!e.operationType) {
-                this.operationType = 1
-            } else {
-                this.operationType = e.operationType
-            }
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鎻愪氦鍗曟嵁澶辫触: " + err
+					})
+				}
+			}
+		},
+		onLoad(e) {
+			console.log('e: ', e);
+			if (!e.operationType) {
+				this.operationType = 1
+			} else {
+				this.operationType = e.operationType
+			}
 
-            if (this.operationType == 1) {
-                // 鏂板
-                this.getMaxNum()
-            } else if (this.operationType == 2) {
-                // 澶嶅埗
-            } else if (this.operationType == 3) {
-                // 缂栬緫
+			if (this.operationType == 1) {
+				// 鏂板
+				this.getMaxNum()
+			} else if (this.operationType == 2) {
+				// 澶嶅埗
+			} else if (this.operationType == 3) {
+				// 缂栬緫
 
-            } else if (this.operationType == 4) {
-                // 娴忚
+			} else if (this.operationType == 4) {
+				// 娴忚
 
-            }
+			}
 
-            this.getHDeptList()
-            this.getEmpList()
-            this.getCheckProjList()
-        },
-        onReady() {
-            const query = uni.createSelectorQuery().in(this)
-            query.select("#buttons")
-                .boundingClientRect()
-                .select("#tabs")
-                .boundingClientRect()
-                .exec(res => {
-                    this.btnTop = Math.floor(res[0].top)
-                    this.tabsBottom = Math.ceil(res[1].bottom)
-                })
-        }
-    }
+			this.getHDeptList()
+			this.getEmpList()
+			this.getCheckProjList()
+			// 鐩戝惉鏁呴殰鐧昏鍗曢�夋嫨瀹屾垚浜嬩欢
+			uni.$on('BillSelectComplete', (e) => {
+				console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
+				this.hform.HMainSourceInterID = e.HInterID
+				this.hform.HMainSourceBillNo = e.HBillNo
+				this.hform.HMainSourceEntryID = e.HEntryID
+				this.hform.HMouldID = e.HMouldID
+				this.hform.HMouldName = e.HMouldName
+				this.hform.HMouldSpec = e.HMouldSpec
+				this.hform.HMouldModel = e.HMouldModel
+				this.$refs.billList.exit()
+			})
+			// 鐩戝惉缁翠慨璁板綍閫夋嫨瀹屾垚浜嬩欢
+			uni.$on('RepairRecordSelectComplete', (e) => {
+				console.log("鎺ユ敹鍒扮淮淇褰曢�夋嫨: ", e);
+				if (e.HInterID) {
+					this.hform.HMouldRepairWorkName = e.HBillNo;
+					this.hform.HMouldRepairWorkID = e.HInterID;
+					// 鍙互鏍规嵁闇�瑕佽缃叾浠栧瓧娈�
+				}
+				this.$refs.repairRecordList.exit();
+			});
+		},
+		onUnload() {
+			uni.$off('BillSelectComplete');
+			uni.$off('RepairRecordSelectComplete');
+		},
+		onReady() {
+			const query = uni.createSelectorQuery().in(this)
+			query.select("#buttons")
+				.boundingClientRect()
+				.select("#tabs")
+				.boundingClientRect()
+				.exec(res => {
+					this.btnTop = Math.floor(res[0].top)
+					this.tabsBottom = Math.ceil(res[1].bottom)
+				})
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-    @import "@/pages/MJGL/style/MJBillStyle.scss"
+	@import "@/pages/MJGL/style/MJBillStyle.scss"
 </style>
\ No newline at end of file
diff --git a/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList.vue b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList.vue
index cc1cb4a..26795de 100644
--- a/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList.vue
+++ b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList.vue
@@ -148,7 +148,7 @@
                 serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                 tabs: 0,
                 urls: '/Web/GetMouldBillsList',
-                MvarReportTitle: '妯″叿缁翠慨妫�楠屽崟缂撳瓨',
+                MvarReportTitle: '妯″叿缁翠慨妫�楠屽崟鍒楄〃',
                 hform: {
                     HBillNo: '',
                     HSourceBillNo: '',
@@ -182,8 +182,7 @@
             }
         },
         onShow() {
-            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
-            this.CheckModRight()
+           
             this.changeTab(0)
             console.log(this.userInfo, uni.getStorageSync('HUserName'))
         },
@@ -224,30 +223,7 @@
                 await this.$nextTick()
                 this.$refs.barcodePopup.open()
             },
-            CheckModRight() {
-                uni.request({
-                    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
-                    data: {
-                        ModRightName: 'CE_OtherOut',
-                        HUserName: uni.getStorageSync('HUserName')
-                    },
-                    success: (res) => {
-                        if (res.data.count == 1) {} else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
+           
             onPaginationChangeHandler({
                 current
             }) {
@@ -268,9 +244,7 @@
                 if (this.tabs == 0) {
                     this.urls = '/Web/GetMouldBillsList'
                 }
-                // if (this.tabs == 1) {
-                // 	this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
-                // }
+               
                 this.search()
             },
             async getList() {
@@ -297,13 +271,13 @@
                     } else {
                         CommonUtils.showTips({
                             title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${Message}`
+                            message: `鑾峰彇妯″叿缁翠慨楠屾敹鍗曞け璐�: ${Message}`
                         })
                     }
                 } catch (err) {
                     CommonUtils.showTips({
                         title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${err}`
+                        message: `鑾峰彇妯″叿缁翠慨楠屾敹鍗曞け璐�: ${err}`
                     })
                 }
 
@@ -345,43 +319,10 @@
             },
             add() {
                 uni.navigateTo({
-                    url: '/pages/MJGL/Sb_EquipRepariCheckBill/Sb_EquipRepariCheckBill?operationType=1'
+                    url: '/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill?operationType=1'
                 })
             },
-            //缂栬緫
-            edit(item) {
-                console.log(item)
-                uni.request({
-                    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
-                    data: {
-                        "HInterID": item.HInterID,
-                        "HBillNo": item.鍗曟嵁鍙�,
-                        "HBillType": this.hform.HBillType
-                    },
-                    success: (res) => {
-                        console.log(1, res);
-                        if (res.data.count == 1) {
-                            uni.navigateTo({
-                                url: './OtherOutBill?OperationType=2&HInterID=' + item.HInterID
-                            })
-                        } else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.hideLoading()
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                })
-            },
+           
             //鍒犻櫎
             del(item) {
                 // console.log(item.hmainid,uni.getStorageSync('HUserName'))
@@ -422,51 +363,7 @@
                         }
                     }
                 });
-            },
-            //鎾ら攢
-            revoke(item) {
-                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
-                uni.showModal({
-                    title: '鎻愮ず',
-                    content: '鏄惁纭鎾ら攢',
-                    success: (res) => {
-                        if (res.confirm) {
-                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-                            uni.request({
-                                url: this.serverUrl +
-                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
-                                data: {
-                                    HInterID: item.HInterID,
-                                    HBillNo: item.鍗曟嵁鍙�,
-                                    HBillType: this.hform.HBillType,
-                                    HMaker: uni.getStorageSync('HUserName'),
-                                    MvarReportTitle: this.MvarReportTitle,
-                                },
-                                success: (res) => {
-                                    console.log(1, res);
-                                    if (res.data.count == 1) {
-                                        this.clear()
-                                    }
-                                    uni.showToast({
-                                        title: res.data.Message,
-                                        icon: 'none'
-                                    })
-                                },
-                                fail: (res) => {
-                                    console.log(res);
-                                    uni.hideLoading()
-                                    uni.showToast({
-                                        title: '鎺ュ彛璇锋眰澶辫触',
-                                        icon: 'none'
-                                    })
-                                },
-                            });
-                        } else if (res.cancel) {
-                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                        }
-                    }
-                });
-            },
+            }
         }
     }
 </script>
diff --git a/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue b/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
new file mode 100644
index 0000000..647fc59
--- /dev/null
+++ b/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
@@ -0,0 +1,986 @@
+<template>
+	<view>
+		<view class="tabs" id="tabs">
+			<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+			<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
+		</view>
+		<!-- 鍩烘湰淇℃伅 -->
+		<template v-if="tabs == 0">
+			<view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+				<view class="form-item">
+					<view class="title">璁惧鏉＄爜:</view>
+					<view :class="enableEdit?'right':'righton'">
+						<input v-model="hform.HBarCode" :disabled="!enableEdit"
+							@confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)璁惧鏉＄爜" />
+					</view>
+					<view class="icon-wrapper">
+						<uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">缁翠慨寮�濮�:</view>
+					<view class="right">
+						<uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HRepairPlanBeginDate">
+							<input :value="hform.HRepairBeginDate" />
+						</uni-datetime-picker>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">缁翠慨缁撴潫:</view>
+					<view class="right">
+						<uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HRepairPlanEndDate">
+							<input :value="hform.HRepairEndDate" />
+						</uni-datetime-picker>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">缁翠慨鍐呭:</view>
+					<view class="right">
+						<textarea v-model="hform.HRepairContent" placeholder="璇疯緭鍏ョ淮淇唴瀹�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HBillNo" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鏃ユ湡:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">婧愬崟绫诲瀷:</view>
+					<view class="right" v-show="showHMainSourceBillType">
+						<picker :range="arrayHMainSourceBillType" @change="HMainSourceBillTypeChange">
+
+							<input disabled name="HMainSourceBillType" v-model="HMainSourceBillType"
+								placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+							<view class="picker-overlay"></view>
+						</picker>
+					</view>
+					<view class="righton" v-show="!showHMainSourceBillType">
+						<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+							placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title required">婧愬崟鍗曞彿:</view>
+					<view :class="enableSourceBillEdit?'right':'righton'">
+						<input v-model="hform.HMainSourceBillNo" :disabled="enableSourceBillEdit?false:true"
+							@confirm="GetMessageByHMainSourceBillNo(hform.HMainSourceBillNo)"
+							placeholder="璇疯緭鍏�(鎴栨壂鎻�)婧愬崟鍗曞彿" />
+					</view>
+					<view class="icon-wrapper" v-show="hform.HMainSourceBillType != '鎵嬪伐褰曞叆'"
+						:disabled="hform.HMainSourceBillType == '鎵嬪伐褰曞叆'">
+						<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+					</view>
+					<view class="icon-wrapper">
+						<uni-icons type="scan" size="20" @click="toScanHMainSourceBillNo"></uni-icons>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">缁翠慨瑕佹眰:</view>
+					<view class="right">
+						<textarea v-model="hform.HExplanation" placeholder="璇疯緭鍏ョ淮淇姹�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏃堕棿鍗曚綅:</view>
+					<zxz-uni-data-select class="right" :localdata="[
+                        {key: '灏忔椂', value: '灏忔椂'},
+                        {key: '澶�', value: '澶�'},
+                        {key: '鏈�', value: '鏈�'},
+                    ]" dataKey="key" dataValue="value" v-model="hform.HCycleUnit">
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title">缁翠慨宸ユ椂:</view>
+					<view class="right">
+						<input type="number" v-model="hform.HTimes" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title required">閮ㄩ棬:</view>
+					<zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
+						dataValue="HItemID" v-model="hform.HDeptID">
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title required">缁翠慨浜�:</view>
+					<zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+						dataValue="HItemID" v-model="hform.HEmpID">
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title required">缁翠慨椤圭洰:</view>
+					<zxz-uni-data-select required class="right" :localdata="HRepairList" dataKey="缁翠慨椤圭洰"
+						dataValue="hitemid" v-model="hform.HRepairID">
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title required">璐熻矗浜�:</view>
+					<zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+						dataValue="HItemID" v-model="hform.HManagerID">
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title">璁惧鍚嶇О:</view>
+					<view class="righton">
+						<input v-model="hform.HBarName" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">璁惧瑙勬牸:</view>
+					<view class="righton">
+						<input v-model="hform.HBarSpec" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">璁惧鍨嬪彿:</view>
+					<view class="righton">
+						<input v-model="hform.HBarModel" disabled />
+					</view>
+				</view>
+			</view>
+		</template>
+
+		<!-- 鍏朵粬淇℃伅 -->
+		<template v-if="tabs == 2">
+			<view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+				<view class="form-item">
+					<view class="title">鍒涘缓浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HMaker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒涘缓鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HMakeDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDater" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDateDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HChecker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳鏃堕棿:</view>
+					<view class="righton">
+						<input v-model="hform.HCheckDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteMan" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteDate" />
+					</view>
+				</view>
+			</view>
+
+		</template>
+		<!-- 鎿嶄綔鎸夐挳 -->
+		<view class="buttons" id="buttons">
+			<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			<view style="flex: 1;"></view>
+			<button class="btn-a" v-if="operationType!=4" size="mini" @tap="addNew">鏂板</button>
+			<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+		</view>
+		<!-- <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload> -->
+		<!-- 婧愬崟鍗曟嵁鍒楄〃寮圭獥 -->
+		<BillListPopupEquipConkBookBillVue ref="billList" :HBillType="hform.HBillType"
+			:HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
+		</BillListPopupEquipConkBookBillVue>
+	</view>
+</template>
+
+<script>
+	import dayjs from "dayjs";
+	import {
+		CommonUtils
+	} from "@/utils/common";
+	import {
+		MpaasScan
+	} from "@/utils/mpaasScan.js"
+	import {
+		getUserInfo
+	} from "../../../utils/auth";
+	// 寮曞叆婧愬崟鍗曟嵁鍒楄〃寮圭獥缁勪欢
+	import BillListPopupEquipConkBookBillVue from '../../../components/BillListPopup/BillListPopupEquipConkBookBill.vue';
+
+	export default {
+		// 璁惧缁翠慨璁板綍鍗�
+		name: 'Sb_EqpMaintenanceBill',
+		components: {
+			BillListPopupEquipConkBookBillVue
+		},
+		data() {
+			return {
+				tabs: 0,
+				
+				btnTop: 0,
+				tabsBottom: 0,
+				HModName: "Sb_EqpMaintenanceBill",
+				HBillType: '3910',
+				operationType: 1,
+				uploadOptions: {},
+				enableEdit: true,
+				enableSourceBillEdit: true,
+
+				// 婧愬崟绫诲瀷鐩稿叧
+				HMainSourceBillType: "璁惧缁翠慨鐧昏鍗�", // 鐢ㄤ簬鏄剧ず鐨勬簮鍗曠被鍨�
+				arrayHMainSourceBillType: ['璁惧缁翠慨鐧昏鍗�', '鎵嬪伐褰曞叆', '璁惧缁翠慨娲惧伐鍗�'],
+				arrayHMainSourceBillTypeID: ['璁惧缁翠慨鐧昏鍗�', '鎵嬪伐褰曞叆', '璁惧缁翠慨娲惧伐鍗�'], // 瀵瑰簲鐨勫崟鎹被鍨婭D
+				showHMainSourceBillType: true,
+
+				HDeptList: [],
+				HRepairCheckList: [],
+				HEmpList: [],
+				HRepairList: [],
+
+				hform: {
+					HBillType: '3910',
+					HStockOrgID: uni.getStorageSync("OrganizationID"),
+					HBarCode: "",
+					HBarCode: '',
+					HRepairBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+					HRepairEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+					HRepairContent: '',
+					HBillNo: '',
+					HInterID: 0,
+					HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+					HDeptName: getUserInfo().HDeptName,
+					HDeptID: getUserInfo().HDeptID,
+					HEmpName: getUserInfo().HEmpName,
+					HEmpID: getUserInfo().HEmpID,
+					HRepair: '',
+					HRepairID: 0,
+					HExplanation: '',
+					HMainSourceBillType: '璁惧缁翠慨鐧昏鍗�', // 榛樿涓鸿澶囩淮淇櫥璁板崟
+					HMainSourceBillNo: '',
+					HMainSourceInterID: 0,
+					HMainSourceEntryID: 0,
+					HManagerName: getUserInfo().HManagerName,
+					HManagerID: getUserInfo().HManagerID,
+					HTimes: 0,
+					HCycleUnit: '灏忔椂',
+					HBarName: '',
+					HNumber: '',
+					HEquipID: 0,
+					HBarSpec: '',
+					HBarModel: '',
+					HMaker: getUserInfo()["Czymc"],
+					HChecker: '',
+					HCloseMan: '',
+					HUpDater: '',
+					HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
+					HCheckDate: '',
+					HCloseDate: '',
+					HUpDateDate: '',
+					HDeleteMan: '',
+					HDeleteDate: ''
+				},
+				HDetailList: [{
+					"HRepairID": 0,
+					"HRepairCode": "",
+					"HRepairName": "",
+					"HManagerID": 0,
+					"HManagerCode": "",
+					"HManagerName": "",
+					"HRepairExplanation": '',
+					"HRemark": "",
+					"HEmpID": '',
+					"HSourceInterID": 0,
+					"HSourceEntryID": 0,
+					"HSourceBillNo": ''
+				}]
+			};
+		},
+		computed: {
+			containerHeight: {
+				get() {
+					return this.btnTop - this.tabsBottom - 5
+				}
+			},
+		},
+		methods: {
+			// 鏄剧ず婧愬崟鍗曟嵁鍒楄〃寮圭獥
+			showBillList() {
+				this.$refs.billList.showPopup()
+			},
+
+			// 閫夋嫨婧愬崟绫诲瀷
+			HMainSourceBillTypeChange(e) {
+				if (e.detail.value == -1 || e.detail.value == NaN) {
+					this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+					this.hform.HMainSourceBillType = '鎵嬪伐褰曞叆'
+					return
+				}
+
+				this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+				this.hform.HMainSourceBillType = this.arrayHMainSourceBillTypeID[e.detail.value]
+
+				// 缂撳瓨褰撳墠椤甸潰閫夋嫨
+				const pages = getCurrentPages()
+				const currentPage = pages[pages.length - 1]
+				uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
+					HSourceBillTypeName: this.HMainSourceBillType,
+					HSourceBillType: this.hform.HMainSourceBillType
+				})
+			},
+
+			// 璇诲彇缂撳瓨
+			loadCache() {
+				const pages = getCurrentPages()
+				const currentPage = pages[pages.length - 1]
+				let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
+				if (HBillTypeCache) {
+					this.HMainSourceBillType = HBillTypeCache.HSourceBillTypeName
+					this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
+				}
+			},
+
+			// 缁翠慨椤圭洰
+			async getRepairList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Gy_Repair/GetRepairList',
+						data: {
+							sWhere: '',
+							user: getUserInfo()["Czymc"]
+						}
+					})
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HRepairList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: `鑾峰彇缁翠慨椤圭洰澶辫触: ${Message}`
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: `鑾峰彇缁翠慨椤圭洰澶辫触: ${err}`
+					})
+				}
+			},
+			// 鍒犻櫎鏄庣粏
+			delDetail(item) {
+
+			},
+			// 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
+			ValidCheck() {
+				if (this.hform.HEquipID == 0) {
+					return {
+						Message: "鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!",
+						state: false
+					}
+				}
+				if (this.hform.HDeptID == 0) {
+					return {
+						Message: "閮ㄩ棬涓嶅緱涓虹┖!",
+						state: false
+					}
+				}
+				if (this.hform.HEmpID == 0) {
+					return {
+						Message: "楠屾敹浜轰笉寰椾负绌�!",
+						state: false
+					}
+				}
+				if (this.hform.HRepairCheckMainID == 0) {
+					return {
+						Message: "缁翠慨椤圭洰涓嶅緱涓虹┖!",
+						state: false
+					}
+				}
+				if (this.hform.HManagerID == 0) {
+					return {
+						Message: "璐熻矗浜轰笉寰椾负绌�!",
+						state: false
+					}
+				}
+				if (this.hform.HMainSourceBillType !== '鎵嬪伐褰曞叆') {
+					if (!this.hform.HMainSourceBillNo || this.hform.HMainSourceBillNo.trim() === '') {
+						CommonUtils.showTips({
+							message: '婧愬崟绫诲瀷闈炴墜宸ュ綍鍏ワ紝蹇呴』閫夋嫨婧愬崟锛�'
+						})
+						return
+					}
+				}
+				return {
+					Message: "",
+					state: true
+				}
+			},
+			addNew() {
+				uni.redirectTo({
+					url: './Sb_EquipRepairSendWorkBill?operationType=1'
+				})
+			},
+			goBack() {
+				uni.navigateBack()
+			},
+			checkBoxChangeHandler(index, e) {
+				let cr = e.detail.value
+				if (cr.length == 0) {
+					this.HCheckFileList[index]["HDotCheckResult"] = false
+				} else {
+					this.HCheckFileList[index]["HDotCheckResult"] = true
+				}
+			},
+			uploadFile(index) {
+				console.log('filePath: ', this.attachmentInfo[index].filePath);
+				// 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
+				uni.uploadFile({
+					url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
+					filePath: this.attachmentInfo[index].filePath,
+					name: 'file',
+					formData: {
+						HBillNo: this.hform.HBillNo,
+						HRemark: "",
+						HUserName: getUserInfo()["Czymc"]
+					},
+					success: (uploadRes) => {
+						CommonUtils.showTips({
+							message: "涓婁紶鎴愬姛"
+						})
+						this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
+					},
+					fail: (err) => {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: `涓婁紶澶辫触: ${err}`
+						})
+					}
+				})
+			},
+			delFile(index) {
+				console.log('attachmentInfo: ', this.attachmentInfo[index]);
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+					success: (res) => {
+						if (res.confirm) {
+							this.attachmentInfo.splice(index, 1)
+						}
+					},
+				})
+
+			},
+			handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
+				console.log('file: ', res);
+				let fileInfo = res.data[0]
+				this.attachmentInfo.push({
+					fileName: fileInfo.name,
+					size: fileInfo.size,
+					status: '绛夊緟涓婁紶',
+					filePath: fileInfo.tempFilePath
+				})
+			},
+			// 涓婁紶鏂囦欢
+			fileUpload() {
+				this.$refs.XeUpload.upload('file', {});
+			},
+			//鑾峰彇鐝鏁版嵁
+			async getShiftList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Web/GetGy_ShiftsList_Json',
+						data: {
+							Shifts: "",
+						}
+					})
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HShiftsList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			async getHDeptList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Gy_Department/list',
+						data: {
+							sWhere: ` and HUSEORGID = ${uni.getStorageSync('OrganizationID')} `,
+							user: uni.getStorageSync('HUserName'),
+							Organization: uni.getStorageSync('Organization')
+						}
+					})
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HDeptList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			// 鑾峰彇鑱屽憳鏁版嵁
+			async getEmpList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/PublicPageMethod/UserList',
+						data: {
+							sWhere: " where 1=1",
+						}
+					})
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HEmpList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			// 鑾峰彇楠岃瘉椤圭洰鏁版嵁
+			async getCheckProjList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Gy_RepairCheck/GetRepairCheckList',
+						data: {
+							sWhere: "",
+							user: uni.getStorageSync('HUserName'),
+						}
+					})
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HRepairCheckList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			toScanCode() {
+				MpaasScan.scanCode(cb => {
+					this.hfrom.HBarCode = cb
+					this.GetMessageByBarCode(cb)
+				})
+			},
+			toScanHMainSourceBillNo() {
+				MpaasScan.scanCode(cb => {
+					this.hfrom.HMainSourceBillNo = cb
+					this.GetMessageByHMainSourceBillNo(cb)
+				})
+			},
+			async GetMessageByHMainSourceBillNo(HSouceBillNo) {
+				try {
+					// 鏍规嵁婧愬崟绫诲瀷閫夋嫨涓嶅悓鐨勬帴鍙�
+					if (this.hform.HMainSourceBillType === '璁惧缁翠慨鐧昏鍗�') {
+						url = "/Sb_EqpRepairWorkBill/GetEqpConkBookBillListPage";
+						dataField = {
+							sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
+							user: getUserInfo()["Czymc"],
+							page: 1,
+							size: 1,
+						};
+					} else if (this.hform.HMainSourceBillType === '璁惧缁翠慨娲惧伐鍗�') {
+						url = "/Sb_EquipRepairSendWorkBill/GetEquipRepairSendWorkBillListPage";
+						dataField = {
+							sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
+							user: getUserInfo()["Czymc"],
+							page: 1,
+							size: 1,
+						};
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鏆備笉鏀寔璇ユ簮鍗曠被鍨嬶細${this.hform.HMainSourceBillType}`
+						})
+						return;
+					}
+
+					let res = await CommonUtils.doRequest2Async({
+						url: url,
+						data: dataField
+					})
+
+					let { count, Message, data } = res.data
+					if (count == 1) {
+						this.hform.HMainSourceBillNo = data[0]["鍗曟嵁鍙�"]
+						this.hform.HMainSourceInterID = data[0]["hmainid"]
+						this.hform.HMainSourceEntryID = data[0]["hsubid"]
+
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇婧愬崟鍗曞彿澶辫触: ${Message}`
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇婧愬崟鍗曞彿澶辫触: ${err}`
+					})
+				}
+			},
+			async GetMessageByBarCode(HBarCode) {
+				try {
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List",
+						data: {
+							HBarCode: HBarCode,
+						},
+					})
+
+
+					if (!res) {
+						return
+					}
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+
+					if (count == 1) {
+						console.log('data: ', data);
+						this.hform.HEquipID = data[0].hmainid
+						this.hform.HBarName = data[0].璁惧鍚嶇О
+						this.hform.HBarSpec = data[0].璁惧瑙勬牸
+						this.hform.HBarModel = data[0].璁惧鍨嬪彿
+						this.hform.HQty = 1
+
+						this.enableEdit = false
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: Message
+						})
+					}
+
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: err
+					})
+				}
+			},
+			radioChange({
+				detail: {
+					value
+				}
+			}) {
+				this.hform.HCheckResult = value
+			},
+			async getMaxNum() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Web/GetMAXNum",
+						data: {
+							"HBillType": this.HBillType
+						}
+					})
+					let {
+						count,
+						data,
+						Message
+					} = res.data
+					this.hform.HInterID = 0
+					this.hform.HBillNo = data[0]["HBillNo"]
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+					})
+				}
+			},
+			async submit() {
+				let valid = this.ValidCheck()
+				if (!valid.state) {
+					CommonUtils.showTips({
+						message: valid.Message
+					})
+					return
+				}
+
+				try {
+					let oMain = JSON.stringify(this.hform);
+					this.HDetailList[0].HManagerID = this.hform.HManagerID
+					this.HDetailList[0].HRepairID = this.hform.HRepairID
+					this.HDetailList[0].HRepairExplanation = this.hform.HExplanation
+					this.HDetailList[0].HEmpID = this.hform.HEmpID
+					this.HDetailList[0].HSourceInterID = this.hform.HMainSourceInterID
+					this.HDetailList[0].HSourceEntryID = this.hform.HMainSourceEntryID
+					this.HDetailList[0].HSourceBillNo = this.hform.HMainSourceBillNo
+
+					let sSubStr = JSON.stringify(this.HDetailList);
+					let sMainSub = oMain + ';' + sSubStr + `;-1;${this.operationType}` + ';' + getUserInfo()[
+						'Czymc'];
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Sb_PDA_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList",
+						data: {
+							"msg": sMainSub
+						},
+						method: "POST"
+					})
+
+					if (!res) {
+						return
+					}
+
+					let {
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						if (this.operationType == 4) {
+							uni.showModal({
+								title: '鎻愮ず',
+								content: res.data.Message + '銆傚嵆灏嗚繑鍥炰笂绾ч〉闈�',
+								showCancel: false,
+								success: (res) => {
+									if (res.confirm) {
+										console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+										setTimeout(() => {
+											uni.navigateBack();
+										}, 50)
+										// uni.redirectTo({
+										//     url: './Sb_EquipRepairSendWorkBill?operationType=1'
+										// })
+									} else if (res.cancel) {
+										console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+										setTimeout(() => {
+											uni.navigateBack();
+										}, 50)
+									}
+								}
+							});
+							return
+						}
+						uni.showModal({
+							title: '鎻愮ず',
+							content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+							success: (res) => {
+								if (res.confirm) {
+									console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+									uni.redirectTo({
+										url: './Sb_EquipRepairSendWorkBill?operationType=1'
+									})
+								} else if (res.cancel) {
+									console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+									setTimeout(() => {
+										uni.navigateBack();
+									}, 50)
+								}
+							}
+						});
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+						})
+					}
+
+
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鎻愪氦鍗曟嵁澶辫触: " + err
+					})
+				}
+			},
+			async getEquipFileMain(HInterID) {
+				try {
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_ListByHEquipID",
+						data: {
+							HEquipID: HInterID,
+						},
+					})
+
+
+					if (!res) {
+						return
+					}
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+
+					if (count == 1) {
+						console.log('data: ', data);
+						this.hform.HEquipID = data[0].hmainid
+						this.hform.HBarName = data[0].璁惧鍚嶇О
+						this.hform.HBarSpec = data[0].璁惧瑙勬牸
+						this.hform.HBarModel = data[0].璁惧鍨嬪彿
+						this.hform.HQty = 1
+
+						this.enableEdit = false
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: Message
+						})
+					}
+
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: err
+					})
+				}
+			}
+		},
+		onLoad(e) {
+			console.log('e: ', e);
+			if (!e.operationType) {
+				this.operationType = 1
+			} else {
+				this.operationType = e.operationType
+			}
+
+			if (this.operationType == 1) {
+				// 鏂板
+				this.getMaxNum()
+			} else if (this.operationType == 2) {
+				// 澶嶅埗
+			} else if (this.operationType == 3) {
+				// 缂栬緫
+
+			} else if (this.operationType == 4) {
+				// 鐢辨姤宸ュ钩鍙版墦寮�
+				let HEquipID = e.HEquipID
+				this.getMaxNum()
+				this.getEquipFileMain(HEquipID)
+			}
+
+			this.getHDeptList()
+			this.getEmpList()
+			this.getRepairList()
+			this.loadCache()
+
+			// 鐩戝惉鍗曟嵁閫夋嫨瀹屾垚浜嬩欢
+			uni.$on('BillSelectComplete', (e) => {
+				console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
+				this.hform.HMainSourceInterID = e.HInterID
+				this.hform.HMainSourceBillNo = e.HBillNo
+				this.hform.HMainSourceEntryID = e.HEntryID
+				this.hform.HEquipID = e.HEquipID
+				this.hform.HBarName = e.HEquipName
+				this.hform.HBarSpec = e.HEquipSpec
+				this.hform.HBarModel = e.HEquipModel
+				this.$refs.billList.exit()
+			})
+		},
+		onUnload() {
+			uni.$off('BillSelectComplete')
+		},
+		onReady() {
+			const query = uni.createSelectorQuery().in(this)
+			query.select("#buttons")
+				.boundingClientRect()
+				.select("#tabs")
+				.boundingClientRect()
+				.exec(res => {
+					this.btnTop = Math.floor(res[0].top)
+					this.tabsBottom = Math.ceil(res[1].bottom)
+				})
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "@/pages/MJGL/style/MJBillStyle.scss";
+
+	.picker-overlay {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 1;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBillList.vue b/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBillList.vue
new file mode 100644
index 0000000..59ea547
--- /dev/null
+++ b/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBillList.vue
@@ -0,0 +1,460 @@
+<template>
+    <view class="content">
+        <view class="form">
+            <view class="form-item">
+                <view class="title">寮�濮嬫椂闂�:</view>
+                <view class="right">
+                    <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
+                        <input :value="hform.HBeginDate" />
+                    </uni-datetime-picker>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">缁撴潫鏃堕棿:</view>
+                <view class="right">
+                    <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HEndDate">
+                        <input :value="hform.HEndDate" />
+                    </uni-datetime-picker>
+                </view>
+            </view>
+            <view v-if="showmore">
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�:</view>
+                    <view class="right">
+                        <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+                    </view>
+                </view>
+
+            </view>
+            <view class="other">
+                <view v-if="!showmore" @tap="changeShowMore">
+                    灞曞紑鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
+                </view>
+                <view v-if="showmore" @tap="changeShowMore">
+                    鎶樺彔鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
+                </view>
+            </view>
+
+            <view class="buttons">
+                <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+                <button class="btn-b" size="mini" type="default" @tap="add">鏂板</button>
+                <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+            </view>
+        </view>
+
+        <view id="divide" style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+        <view :style="{
+            height: calcContentHeight + 'px',
+            overflowY: 'auto'
+        }">
+            <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+                <uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+                    @tap="showDetail = showDetail==index?-1:index">
+                    <view class="card-detail">
+                        <template
+                            v-for="(HBillField, index) in CommonUtils.emptyValueFilter(item,HFieldList).slice(0,10)">
+                            <view class="detail" v-if="HBillField.ColmType == 'DateTime'">
+                                <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] ? dayjs(item[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }}
+                            </view>
+                            <view class="detail" v-else>
+                                <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] }}
+                            </view>
+                        </template>
+                    </view>
+                    <view class="card-detail" v-if="showDetail == index">
+                        <view class="card-detail">
+                            <template
+                                v-for="(HBillField, index) in CommonUtils.emptyValueFilter(item,HFieldList).slice(10,-1)">
+                                <view class="detail" v-if="HBillField.ColmType == 'DateTime'">
+                                    <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] ? dayjs(item[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }}
+                                </view>
+                                <view class="detail" v-else>
+                                    <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] }}</view>
+                            </template>
+
+                        </view>
+                    </view>
+
+                    <view class="more" v-if="showDetail == index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+                    <view class="more" v-if="showDetail != index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+                    <view class="op" v-if="operations == index">
+                        <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+                        <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+                        <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+                    </view>
+                </uni-card>
+            </view>
+        </view>
+        <view class="pagination-zone" id="pagination-zone">
+            <uni-pagination show-icon :page-size="size" :total="dataLength" :current="page"
+                @change="onPaginationChangeHandler"></uni-pagination>
+        </view>
+        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+    </view>
+</template>
+
+<script>
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import BarCodePopupVue from "@/components/BarCodePopup/BarCodePopup.vue";
+    import {
+        CommonUtils
+    } from "@/utils/common";
+    import dayjs from "dayjs";
+    export default {
+        data() {
+            return {
+                dayjs,
+                CommonUtils,
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                tabs: 0,
+                urls: '/Web/GetEquipmentBillsList',
+                MvarReportTitle: '璁惧缁翠慨璁板綍鍗曠紦瀛�',
+                hform: {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: '',
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    Type: "WX",
+                    sWhere: "",
+                    HBeginDate: dayjs(new Date()).subtract(30, 'day').format("YYYY-MM-DD"),
+                    HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                },
+                sWhere: '',
+                listData: [],
+                showList: [],
+                HFieldList: [],
+                showDetail: -1,
+                operations: -1,
+
+                page: 1,
+                size: 20,
+                dataLength: 0,
+                divideBottom: 0,
+                paginationTop: 0,
+                showmore: false,
+            }
+        },
+        computed: {
+            calcContentHeight: {
+                get() {
+                    return this.paginationTop - this.divideBottom
+                }
+            }
+        },
+        onShow() {
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            // this.CheckModRight()
+            this.changeTab(0)
+            console.log(this.userInfo, uni.getStorageSync('HUserName'))
+        },
+        components: {
+            BarCodePopupVue
+        },
+        onPullDownRefresh: function() {
+            this.clear()
+            setTimeout(() => {
+                uni.stopPullDownRefresh();
+            }, 1000);
+        },
+        onReady() {
+            this.getCalcHeight()
+        },
+        methods: {
+            changeShowMore() {
+                this.showmore = !this.showmore
+                this.$nextTick(() => {
+                    // 閲嶆柊璁＄畻鍐呭瑙嗗彛楂樺害
+                    this.getCalcHeight()
+                })
+            },
+            getCalcHeight() {
+                let query = uni.createSelectorQuery().in(this)
+                query
+                    .select("#divide")
+                    .boundingClientRect()
+                    .select("#pagination-zone")
+                    .boundingClientRect()
+                    .exec(res => {
+                        this.divideBottom = Math.ceil(res[0].bottom)
+                        this.paginationTop = Math.floor(res[1].top)
+                    })
+            },
+            async qrCodeDisplay(item) {
+                this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+                await this.$nextTick()
+                this.$refs.barcodePopup.open()
+            },
+            CheckModRight() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+                    data: {
+                        ModRightName: 'CE_OtherOut',
+                        HUserName: uni.getStorageSync('HUserName')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {} else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            onPaginationChangeHandler({
+                current
+            }) {
+                this.page = current
+                this.showList = this.getPage(current, this.size, this.listData)
+            },
+            getPage(page, size, list) {
+                let sindex = (parseInt(page) - 1) * size
+                let eindex = parseInt(page) * size
+                let newList = list.slice(sindex, eindex)
+                return newList
+            },
+            changeTab(e) {
+                this.tabs = e
+                this.page = 1
+                this.showList = []
+
+                if (this.tabs == 0) {
+                    this.urls = '/Web/GetEquipmentBillsList'
+                }
+                // if (this.tabs == 1) {
+                // 	this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+                // }
+                this.search()
+            },
+            async getList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: this.urls,
+                        data: this.hform
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message,
+                        list
+                    } = res.data
+
+                    if (count == 1) {
+                        if (data == null) {
+                            data = []
+                        }
+                        this.listData = data
+                        this.showList = this.getPage(this.page, this.size, data)
+                        this.dataLength = data.length
+                        this.HFieldList = CommonUtils.fieldListFilterRole({
+                            ExcludeKeys: ["鍒跺崟鏃ユ湡", "鍗曟嵁鍙�"],
+                            FieldList: Array.from(list)
+                        }).data
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鑾峰彇璁惧鏁呴殰鐧昏鍗曞け璐�: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鑾峰彇璁惧鏁呴殰鐧昏鍗曞け璐�: ${err}`
+                    })
+                }
+
+            },
+            search() {
+                this.hform.sWhere = ''
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                if (this.hform.HBillNo) {
+                    this.hform.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+                }
+                if (this.hform.HBeginDate && this.hform.HEndDate) {
+                    this.hform.sWhere +=
+                        ` and convert(date,鏃ユ湡) between convert(date, '${this.hform.HBeginDate}') and convert(date, '${this.hform.HEndDate}')`;
+                }
+                this.getList()
+            },
+            clear() {
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                this.sWhere = ''
+                this.hform = {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: '',
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    Type: "WX",
+                    sWhere: "",
+                    HBeginDate: dayjs(new Date()).subtract(30, 'day').format("YYYY-MM-DD"),
+                    HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                }
+                this.search()
+            },
+            add() {
+                uni.navigateTo({
+                    url: '/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill?operationType=1'
+                })
+            },
+            //缂栬緫
+            edit(item) {
+                return
+                console.log(item)
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
+                    data: {
+                        "HInterID": item.HInterID,
+                        "HBillNo": item.鍗曟嵁鍙�,
+                        "HBillType": this.hform.HBillType
+                    },
+                    success: (res) => {
+                        console.log(1, res);
+                        if (res.data.count == 1) {
+                            uni.navigateTo({
+                                url: './OtherOutBill?OperationType=2&HInterID=' + item.HInterID
+                            })
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.hideLoading()
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                })
+            },
+            //鍒犻櫎
+            del(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/Sb_EqpRepairWorkBill/DeltetEqpRepairWorkBill',
+                                data: {
+                                    HInterID: item.hmainid,
+                                    user: uni.getStorageSync('HUserName'),
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+            //鎾ら攢
+            revoke(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '鏄惁纭鎾ら攢',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
+                                data: {
+                                    HInterID: item.HInterID,
+                                    HBillNo: item.鍗曟嵁鍙�,
+                                    HBillType: this.hform.HBillType,
+                                    HMaker: uni.getStorageSync('HUserName'),
+                                    MvarReportTitle: this.MvarReportTitle,
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJListStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipBegin/Sb_EquipBeginBill.vue b/pages/MJGL/Sb_EquipBegin/Sb_EquipBeginBill.vue
new file mode 100644
index 0000000..bbdae80
--- /dev/null
+++ b/pages/MJGL/Sb_EquipBegin/Sb_EquipBeginBill.vue
@@ -0,0 +1,475 @@
+<template>
+    <view>
+        <view class="tabs" id="tabs">
+            <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+            <!-- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鏄庣粏淇℃伅</view> -->
+            <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
+            <!-- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view> -->
+        </view>
+        <!-- 鍩烘湰淇℃伅 -->
+        <template v-if="tabs == 0">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HBillNo" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鏃ユ湡:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title required">璁惧:</view>
+                    <!--                    <zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
+                        dataValue="HItemID" v-model="hform.HEquipName">
+
+                    </zxz-uni-data-select> -->
+                    <view class="righton">
+                        <input disabled v-model="hform.HEquipName" placeholder="" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title required">鍏宠仈涓昏澶�:</view>
+                    <!--                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+                        dataValue="HItemID" v-model="hform.HEquipRelationName">
+
+                    </zxz-uni-data-select> -->
+                    <view class="righton">
+                        <input disabled v-model="hform.HEquipRelationName" placeholder="" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title required">寮�鏈轰汉:</view>
+                    <!--                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+                        dataValue="HItemID" v-model="hform.HBeginEmpName">
+
+                    </zxz-uni-data-select> -->
+                    <view class="righton">
+                        <input disabled v-model="hform.HBeginEmpName" placeholder="" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">寮�鏈烘椂闂�:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HBeginTime" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">澶囨敞:</view>
+                    <view class="right">
+                        <textarea v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+                    </view>
+                </view>
+            </view>
+        </template>
+
+        <!-- 鍏朵粬淇℃伅 -->
+        <template v-if="tabs == 2">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form-item">
+                    <view class="title">鍒涘缓浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMaker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍒涘缓鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMakeDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇敼浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HUpDater" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇敼鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HUpDateDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹℃牳浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HChecker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹℃牳鏃堕棿:</view>
+                    <view class="righton">
+                        <input v-model="hform.HCheckDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浣滃簾浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HDeleteMan" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浣滃簾鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HDeleteDate" />
+                    </view>
+                </view>
+            </view>
+
+        </template>
+        <!-- 鎿嶄綔鎸夐挳 -->
+        <view class="buttons" id="buttons">
+            <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+            <view style="flex: 1;"></view>
+            <!-- <button class="btn-a" size="mini" @tap="addNew">鏂板</button> -->
+            <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+        </view>
+        <!-- <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload> -->
+    </view>
+</template>
+
+<script>
+    import dayjs from "dayjs";
+    import {
+        CommonUtils
+    } from "@/utils/common";
+    import {
+        MpaasScan
+    } from "@/utils/mpaasScan.js"
+    import {
+        getUserInfo
+    } from "../../../utils/auth";
+    export default {
+        // 璁惧寮�鏈哄崟
+        name: 'Sb_EquipBeginBill',
+        data() {
+            return {
+                tabs: 0,
+                HMainSourceBillType: "",
+                btnTop: 0,
+                tabsBottom: 0,
+                HModName: "Sb_EquipBeginBill",
+                HBillType: '3917',
+                operationType: 1,
+                uploadOptions: {},
+                enableEdit: true,
+
+                HDeptList: [],
+                HRepairCheckList: [],
+                HEmpList: [],
+                HRepairList: [],
+
+                hform: {
+                    "HBillNo": "",
+                    "HInterID": "0",
+                    "HDate": dayjs(new Date()).format("YYYY-MM-DD"),
+                    "HEquipName": "",
+                    "HEquipID": "0",
+                    "HEquipRelationName": "",
+                    "HEquipRelationID": "0",
+                    "HBeginEmpName": getUserInfo()["HEmpName"],
+                    "HBeginEmpID": getUserInfo()["HEmpID"],
+                    "HBeginTime": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+                    "HRemark": "",
+                    HMaker: getUserInfo()["Czymc"],
+                    HChecker: '',
+                    HCloseMan: '',
+                    HUpDater: '',
+                    HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                    HCheckDate: '',
+                    HCloseDate: '',
+                    HUpDateDate: '',
+                    HDeleteMan: '',
+                    HDeleteDate: ''
+                },
+            };
+        },
+        computed: {
+            containerHeight: {
+                get() {
+                    return this.btnTop - this.tabsBottom - 5
+                }
+            },
+        },
+        methods: {
+            // 缁翠慨椤圭洰
+            async getRepairList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Gy_Repair/GetRepairList',
+                        data: {
+                            sWhere: '',
+                            user: getUserInfo()["Czymc"]
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HRepairList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鑾峰彇妫�楠岄」鐩け璐�: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鑾峰彇妫�楠岄」鐩け璐�: ${err}`
+                    })
+                }
+            },
+            // 鍒犻櫎鏄庣粏
+            delDetail(item) {
+
+            },
+            // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
+            ValidCheck() {
+                if (this.hform.HEquipID == 0) {
+                    return {
+                        Message: "鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!",
+                        state: false
+                    }
+                }
+
+                if (this.hform.HEmpID == 0) {
+                    return {
+                        Message: "楠屾敹浜轰笉寰椾负绌�!",
+                        state: false
+                    }
+                }
+
+                return {
+                    Message: "",
+                    state: true
+                }
+            },
+            addNew() {
+                uni.redirectTo({
+                    url: './Sb_EquipRepairSendWorkBill?operationType=1'
+                })
+            },
+            goBack() {
+                uni.navigateBack()
+            },
+            checkBoxChangeHandler(index, e) {
+                let cr = e.detail.value
+                if (cr.length == 0) {
+                    this.HCheckFileList[index]["HDotCheckResult"] = false
+                } else {
+                    this.HCheckFileList[index]["HDotCheckResult"] = true
+                }
+            },
+            radioChange({
+                detail: {
+                    value
+                }
+            }) {
+                this.hform.HCheckResult = value
+            },
+            async getMaxNum() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Web/GetMAXNum",
+                        data: {
+                            "HBillType": this.HBillType
+                        }
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message
+                    } = res.data
+                    console.log('data: ', data);
+                    this.hform.HInterID = data[0]["HInterID"]
+                    this.hform.HBillNo = data[0]["HBillNo"]
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+                    })
+                }
+            },
+            async set_CheckBill(HInterID, num) {
+                try{
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Sb_EquipBeginBill/AuditSb_EquipBeginBill",
+                        data: {
+                            HInterID: HInterID,
+                            type: num,
+                            user: getUserInfo()['Czymc']
+                        }
+                    })
+                    
+                    if(res.count == 1) {
+                        return
+                    }else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: "璁惧寮�鏈哄崟瀹℃牳澶辫触: " + res.Message
+                        })
+                    }
+                }catch(err){
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "璁惧寮�鏈哄崟瀹℃牳澶辫触: " + err
+                    })
+                }
+            },
+            async submit() {
+                let valid = this.ValidCheck()
+                if (!valid.state) {
+                    CommonUtils.showTips({
+                        message: valid.Message
+                    })
+                    return
+                }
+
+                try {
+                    let oMain = JSON.stringify(this.hform);
+                    let sMainSub = oMain + ';Add' + `;${getUserInfo()['Czymc']}`;
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: "/Sb_EquipBeginBill/Save锘縎b_EquipBeginBillMain",
+                        data: {
+                            "sMainSub": sMainSub
+                        },
+                        method: "POST"
+                    })
+
+                    if (!res) {
+                        return
+                    }
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        if (data.Verify == "Y") { //鑷姩瀹℃牳
+                            set_checkBill(data.HInterID, 1)
+                        }
+
+                        uni.showModal({
+                            title: '鎻愮ず',
+                            content: res.data.Message + '杩斿洖涓婄骇椤甸潰',
+                            showCancel: false,
+                            success: (res) => {
+                                if (res.confirm) {
+                                    setTimeout(() => {
+                                        uni.navigateBack();
+                                    }, 50)
+                                } else if (res.cancel) {
+                                    setTimeout(() => {
+                                        uni.navigateBack();
+                                    }, 50)
+                                }
+                            }
+                        });
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+                        })
+                    }
+
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "鎻愪氦鍗曟嵁澶辫触: " + err
+                    })
+                }
+            },
+            async getEquipInfo() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Gy_EquipFileMain/getSb_EquipList",
+                        data: {
+                            HInterID: this.hform.HEquipID,
+                            user: getUserInfo()['Czymc']
+                        }
+                    })
+
+                    let {
+                        data,
+                        Message,
+                        count
+                    } = res.data
+
+                    if (count == 1) {
+                        console.log('data: ', data);
+
+                        this.hform.HEquipID = data[0].hmainid
+                        this.hform.HEquipName = data[0].璁惧鍚嶇О
+                        this.hform.HEquipRelationID = data[0].HMainSourceID
+                        this.hform.HEquipRelationName = data[0].鎵�灞炰富鐢熶骇璁惧
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: "鑾峰彇璁惧淇℃伅澶辫触: " + Message
+                        })
+                    }
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "鑾峰彇璁惧淇℃伅澶辫触: " + err
+                    })
+                }
+            }
+        },
+        onLoad(e) {
+            console.log('e: ', e);
+            if (!e.operationType) {
+                this.operationType = 1
+            } else {
+                this.operationType = e.operationType
+            }
+
+            if (this.operationType == 1) {
+                this.hform.HEquipID = e.HEquipID
+                // 鏂板
+                this.getMaxNum()
+                this.getEquipInfo()
+            } else if (this.operationType == 2) {
+                // 澶嶅埗
+            } else if (this.operationType == 3) {
+                // 缂栬緫
+
+            } else if (this.operationType == 4) {
+                // 娴忚
+
+            }
+        },
+        onReady() {
+            const query = uni.createSelectorQuery().in(this)
+            query.select("#buttons")
+                .boundingClientRect()
+                .select("#tabs")
+                .boundingClientRect()
+                .exec(res => {
+                    this.btnTop = Math.floor(res[0].top)
+                    this.tabsBottom = Math.ceil(res[1].bottom)
+                })
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJBillStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
index cb66841..3fc78e3 100644
--- a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
+++ b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
@@ -216,12 +216,12 @@
                     HBillNo: "",
                     HInterID: 0,
                     HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
-                    HDeptName: "",
-                    HDeptID: 0,
-                    HEmpName: "",
-                    HEmpID: 0,
-                    HManagerName: "",
-                    HManagerID: 0,
+                    HDeptName: getUserInfo().HDeptName,
+					HDeptID: getUserInfo().HDeptID,
+                    HEmpName: getUserInfo().HEmpName,
+                    HEmpID: getUserInfo().HEmpID,
+                    HManagerName: getUserInfo().HManagerName,
+                    HManagerID: getUserInfo().HManagerID,
                     HBarName: "",
                     HEquipID: 0,
                     HBarSpec: "",
@@ -752,7 +752,7 @@
 
                     if (code == 1) {
                         data = data.h_v_Sb_EquipConkBookBillList_Edit[0]
-                        
+
                         this.enableEdit = false
                     } else {
                         CommonUtils.showTips({
@@ -765,6 +765,46 @@
                     CommonUtils.showTips({
                         title: '娓╅Θ鎻愮ず',
                         message: `鑾峰彇鏁呴殰鐧昏鍗曞け璐�: ${err}`
+                    })
+                }
+            },
+            async GetEquipInfo(HEquipID) {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Gy_EquipFileMain/getSb_EquipList",
+                        data: {
+                            HInterID: HEquipID,
+                            user: getUserInfo()["Czymc"]
+                        }
+                    })
+
+                    let {
+                        data,
+                        Message,
+                        count
+                    } = res.data
+                    if (count == 1) {
+                        console.log('data: ',data);
+                        Object.assign(this.hform, {
+                            HDeptID: data[0]["HDeptID"],
+                            HDeptName: data[0]["浣跨敤閮ㄩ棬"],
+                            HEquipID: data[0]["hmainid"],
+                            HBarName: data[0]["璁惧鍚嶇О"],
+                            HBarModel: data[0]["璁惧瑙勬牸"],
+                            HBarSpec: data[0]["璁惧鍨嬪彿"],
+                            HEmpID: getUserInfo()["HEmpID"],
+                            HManagerID: data[0]["HRepairEmpID"]
+                        })
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鑾峰彇璁惧鏁版嵁澶辫触: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鑾峰彇璁惧鏁版嵁澶辫触: ${err}`
                     })
                 }
             }
@@ -788,7 +828,10 @@
                 this.getEditData(hmainid)
 
             } else if (this.operationType == 4) {
-                // 娴忚
+                // 鎶ュ伐骞冲彴涓嬫帹
+                let HEquipID = e.HEquipID
+                this.getMaxNum()
+                this.GetEquipInfo(HEquipID)
 
             }
 
diff --git a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBillList.vue b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBillList.vue
index 17d7fe4..a165bc2 100644
--- a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBillList.vue
+++ b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBillList.vue
@@ -50,26 +50,31 @@
             <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
                 <uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
                     @tap="showDetail = showDetail==index?-1:index">
-                    <view class="card-detail"
-                        v-for="(HBillField, index) in CommonUtils.emptyValueFilter(item,HFieldList).slice(0,10)" :key="index">
+                    <view class="card-detail">
                         <template
-                            v-if="HBillField.ColmType == 'DateTime'"><text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] ? dayjs(item[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }}
+                            v-for="(HBillField, index) in CommonUtils.emptyValueFilter(item,HFieldList).slice(0,10)">
+                            <view class="detail" v-if="HBillField.ColmType == 'DateTime'">
+                                <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] ? dayjs(item[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }}
+                            </view>
+                            <view class="detail" v-else>
+                                <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] }}
+                            </view>
                         </template>
-                        <template
-                            v-else><text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] }}</template>
                     </view>
                     <view class="card-detail" v-if="showDetail == index">
-                        <view class="card-detail"
-                            v-for="(HBillField, index) in CommonUtils.emptyValueFilter(item,HFieldList).slice(10,-1)"
-                            :key="index">
+                        <view class="card-detail">
                             <template
-                                v-if="HBillField.ColmType == 'DateTime'"><text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] ? dayjs(item[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }}
+                                v-for="(HBillField, index) in CommonUtils.emptyValueFilter(item,HFieldList).slice(10,-1)">
+                                <view class="detail" v-if="HBillField.ColmType == 'DateTime'">
+                                    <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] ? dayjs(item[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }}
+                                </view>
+                                <view class="detail" v-else>
+                                    <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] }}</view>
                             </template>
-                            <template
-                                v-else><text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] }}</template>
+                
                         </view>
                     </view>
-
+                
                     <view class="more" v-if="showDetail == index && operations != index">
                         <view class="part" style="border-right: 1px solid #eee;">
                             <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
diff --git a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
index e33628e..f90d3c3 100644
--- a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
+++ b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
@@ -332,8 +332,8 @@
                     HBillNo: "",
                     HInterID: 0,
                     HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
-                    HDeptName: "",
-                    HDeptID: 0,
+                    HDeptName: getUserInfo().HDeptName,
+                    HDeptID: getUserInfo().HDeptID,
                     HRemark: "",
                     HBarName: "",
                     HEquipID: 0,
@@ -472,10 +472,11 @@
             async getShiftList() {
                 try {
                     let res = await CommonUtils.doRequest2Async({
-                        url: '/Web/GetGy_ShiftsList_Json',
+                        url: '/Gy_ShiftsController/Get_Gy_WorkShiftList',
                         data: {
-                            Shifts: "",
-                        }
+                        	sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'')  != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}'`,
+                        	HMaker: getUserInfo()["Czymc"],
+                        },
                     })
 
                     let {
@@ -670,7 +671,7 @@
                             return {
                                 "HDotCheckItemID": item.HDotCheckItemID,
                                 "HDotCheckCode": item.鐐规椤圭洰浠ｇ爜,
-                                "HDotCheckItem": item.鐐规椤圭洰,
+                                "HDotCheckItem": item.鐐规椤圭洰鍚嶇О,
                                 "HDotCheckPart": item.鐐规閮ㄤ綅,
                                 "HClaim": item.鍏蜂綋瑕佹眰,
                                 "HManagerID": item.璐熻矗浜篒D,
diff --git a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList.vue b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList.vue
index ba9e5cc..1175b86 100644
--- a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList.vue
+++ b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList.vue
@@ -145,7 +145,7 @@
                 serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                 tabs: 0,
                 urls: '/Web/GetEquipmentBillsList',
-                MvarReportTitle: '璁惧鐐规璁板綍鍗曠紦瀛�',
+                MvarReportTitle: '璁惧鐐规璁板綍鍗曞垪琛�',
                 showmore: false,
                 hform: {
                     HBillNo: '',
@@ -172,8 +172,6 @@
             }
         },
         onShow() {
-            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
-            this.CheckModRight()
             this.changeTab(0)
             console.log(this.userInfo, uni.getStorageSync('HUserName'))
         },
@@ -187,13 +185,7 @@
                 }
 
             }
-        },
-        // onPullDownRefresh: function() {
-        //     this.clear()
-        //     setTimeout(() => {
-        //         uni.stopPullDownRefresh();
-        //     }, 1000);
-        // },
+        },      
         onReady() {
             this.getCalcHeight()
         },
@@ -224,30 +216,6 @@
                 await this.$nextTick()
                 this.$refs.barcodePopup.open()
             },
-            CheckModRight() {
-                uni.request({
-                    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
-                    data: {
-                        ModRightName: 'CE_OtherOut',
-                        HUserName: uni.getStorageSync('HUserName')
-                    },
-                    success: (res) => {
-                        if (res.data.count == 1) {} else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
             onPaginationChangeHandler({
                 current
             }) {
@@ -268,9 +236,6 @@
                 if (this.tabs == 0) {
                     this.urls = '/Web/GetEquipmentBillsList'
                 }
-                // if (this.tabs == 1) {
-                // 	this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
-                // }
                 this.search()
             },
             async getList() {
@@ -343,43 +308,9 @@
                 }
                 this.search()
             },
-            add() {
+            creat() {
                 uni.navigateTo({
                     url: '/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill?operationType=1'
-                })
-            },
-            //缂栬緫
-            edit(item) {
-                console.log(item)
-                uni.request({
-                    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
-                    data: {
-                        "HInterID": item.HInterID,
-                        "HBillNo": item.鍗曟嵁鍙�,
-                        "HBillType": this.hform.HBillType
-                    },
-                    success: (res) => {
-                        console.log(1, res);
-                        if (res.data.count == 1) {
-                            uni.navigateTo({
-                                url: './OtherOutBill?OperationType=2&HInterID=' + item.HInterID
-                            })
-                        } else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.hideLoading()
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
                 })
             },
             //鍒犻櫎
@@ -422,51 +353,7 @@
                         }
                     }
                 });
-            },
-            //鎾ら攢
-            revoke(item) {
-                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
-                uni.showModal({
-                    title: '鎻愮ず',
-                    content: '鏄惁纭鎾ら攢',
-                    success: (res) => {
-                        if (res.confirm) {
-                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-                            uni.request({
-                                url: this.serverUrl +
-                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
-                                data: {
-                                    HInterID: item.HInterID,
-                                    HBillNo: item.鍗曟嵁鍙�,
-                                    HBillType: this.hform.HBillType,
-                                    HMaker: uni.getStorageSync('HUserName'),
-                                    MvarReportTitle: this.MvarReportTitle,
-                                },
-                                success: (res) => {
-                                    console.log(1, res);
-                                    if (res.data.count == 1) {
-                                        this.clear()
-                                    }
-                                    uni.showToast({
-                                        title: res.data.Message,
-                                        icon: 'none'
-                                    })
-                                },
-                                fail: (res) => {
-                                    console.log(res);
-                                    uni.hideLoading()
-                                    uni.showToast({
-                                        title: '鎺ュ彛璇锋眰澶辫触',
-                                        icon: 'none'
-                                    })
-                                },
-                            });
-                        } else if (res.cancel) {
-                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                        }
-                    }
-                });
-            },
+            }            
         }
     }
 </script>
diff --git a/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
index a687fab..32c589f 100644
--- a/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
+++ b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
@@ -1,828 +1,829 @@
 <template>
-    <view>
-        <view class="tabs" id="tabs">
-            <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
-            <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鏄庣粏淇℃伅</view>
-            <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
-            <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view>
-        </view>
-        <!-- 鍩烘湰淇℃伅 -->
-        <template v-if="tabs == 0">
-            <view class="form" :style="{
+	<view>
+		<view class="tabs" id="tabs">
+			<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+			<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鏄庣粏淇℃伅</view>
+			<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
+			<view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view>
+		</view>
+		<!-- 鍩烘湰淇℃伅 -->
+		<template v-if="tabs == 0">
+			<view class="form" :style="{
                 height: containerHeight + 'px',
                 overflow: 'auto'
             }">
-                <view class="form-item">
-                    <view class="title">璁惧鏉＄爜:</view>
-                    <view :class="enableEdit?'right':'righton'">
-                        <input :disabled="!enableEdit" v-model="hform.HBarCode"
-                            @confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)璁惧鏉＄爜" />
-                    </view>
-                    <view class="icon-wrapper">
-                        <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">淇濆吇寮�濮�:</view>
-                    <view class="right">
-                        <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
-                            <input :value="hform.HBeginDate" />
-                        </uni-datetime-picker>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">淇濆吇缁撴潫:</view>
-                    <view class="right">
-                        <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HEndDate">
-                            <input :value="hform.HEndDate" />
-                        </uni-datetime-picker>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鏈�缁堢粨璁�:</view>
-                    <view class="right none-border">
-                        <radio-group @change="radioChange" class="radio_Container">
-                            <label>
-                                <view>
-                                    <radio value="OK" :checked="calcHLastResult == 'OK'" />
-                                    <text>OK</text>
-                                </view>
-                            </label>
-                            </label>
-                            <view>
-                                <radio value="NG" :checked="calcHLastResult == 'NG'" />
-                                <text>NG</text>
-                            </view>
-                            </label>
-                        </radio-group>
-                    </view>
-                </view>
+				<view class="form-item">
+					<view class="title">璁惧鏉＄爜:</view>
+					<view :class="enableEdit?'right':'righton'">
+						<input :disabled="!enableEdit" v-model="hform.HBarCode"
+							@confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)璁惧鏉＄爜" />
+					</view>
+					<view class="icon-wrapper">
+						<uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇濆吇寮�濮�:</view>
+					<view class="right">
+						<uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
+							<input :value="hform.HBeginDate" />
+						</uni-datetime-picker>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇濆吇缁撴潫:</view>
+					<view class="right">
+						<uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HEndDate">
+							<input :value="hform.HEndDate" />
+						</uni-datetime-picker>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏈�缁堢粨璁�:</view>
+					<view class="right none-border">
+						<radio-group @change="radioChange" class="radio_Container">
+							<label>
+								<view>
+									<radio value="OK" :checked="calcHLastResult == 'OK'" />
+									<text>OK</text>
+								</view>
+							</label>
+							</label>
+							<view>
+								<radio value="NG" :checked="calcHLastResult == 'NG'" />
+								<text>NG</text>
+							</view>
+							</label>
+						</radio-group>
+					</view>
+				</view>
 
-                <view class="form-item">
-                    <view class="title">鍗曟嵁鍙�:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HBillNo" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍗曟嵁鏃ユ湡:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">閮ㄩ棬:</view>
-                    <zxz-uni-data-select class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О" dataValue="HItemID"
-                        v-model="hform.HDeptID">
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HBillNo" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鏃ユ湡:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">閮ㄩ棬:</view>
+					<zxz-uni-data-select class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О" dataValue="HItemID"
+						v-model="hform.HDeptID">
 
-                    </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
-                </view>
-                <view class="form-item">
-                    <view class="title">澶囨敞:</view>
-                    <view class="right">
-                        <input v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">璁惧鍚嶇О:</view>
-                    <view class="righton">
-                        <input v-model="hform.HBarName" disabled />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">璁惧瑙勬牸:</view>
-                    <view class="righton">
-                        <input v-model="hform.HBarSpec" disabled />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">璁惧鍨嬪彿:</view>
-                    <view class="righton">
-                        <input v-model="hform.HBarModel" disabled />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">淇濆吇璁″垝:</view>
-                    <view class="righton">
-                        <input v-model="hform.HPlanNo" disabled />
-                    </view>
-                </view>
-            </view>
-        </template>
-        <!-- 鏄庣粏淇℃伅 -->
-        <template v-if="tabs == 1">
-            <view :style="{
+					</zxz-uni-data-select>
+					<!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+				</view>
+				<view class="form-item">
+					<view class="title">澶囨敞:</view>
+					<view class="right">
+						<input v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">璁惧鍚嶇О:</view>
+					<view class="righton">
+						<input v-model="hform.HBarName" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">璁惧瑙勬牸:</view>
+					<view class="righton">
+						<input v-model="hform.HBarSpec" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">璁惧鍨嬪彿:</view>
+					<view class="righton">
+						<input v-model="hform.HBarModel" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇濆吇璁″垝:</view>
+					<view class="righton">
+						<input v-model="hform.HPlanNo" disabled />
+					</view>
+				</view>
+			</view>
+		</template>
+		<!-- 鏄庣粏淇℃伅 -->
+		<template v-if="tabs == 1">
+			<view :style="{
                 height: containerHeight + 'px',
                 overflow: 'auto'
             }">
-                <view class="form">
-                    <view class="form-item">
-                        <view class="left">
-                            璁惧淇濆吇瑙勭▼
-                        </view>
-                        <view class="right">
-                            <input type="text" :value="hform.HEquipMaintainRuleInterNo" />
-                        </view>
-                        <view class="icon-wrapper">
-                            <uni-icons type="search" size="20" @click="toCheckFile"></uni-icons>
-                        </view>
-                    </view>
+				<view class="form">
+					<view class="form-item">
+						<view class="left">
+							璁惧淇濆吇瑙勭▼
+						</view>
+						<view class="right">
+							<input type="text" :value="hform.HEquipMaintainRuleInterNo" />
+						</view>
+						<view class="icon-wrapper">
+							<uni-icons type="search" size="20" @click="toCheckFile"></uni-icons>
+						</view>
+					</view>
 
-                    <view class="list" v-for="(item,index) in HCheckFileList" :key="index">
-                        <uni-card style="margin: 10px;">
-                            <view class="card-detail">
-                                <view class="detail">
-                                    <text>搴忓彿锛�</text>{{index+1}}
-                                </view>
-                                <view class="detail">
-                                    <text>缁撴灉锛�</text>
-                                    <checkbox-group style="display: inline-block;"
-                                        @change="checkBoxChangeHandler(index, $event)">
-                                        <checkbox value="enabled" :checked="item.HMaintainResult" />
-                                    </checkbox-group>
-                                </view>
-                                <view class="detail">
-                                    <text>淇濆吇椤圭洰锛�</text>{{item.HMaintainItem}}
-                                </view>
-                                <view class="detail" v-if="item.HMaintainPart">
-                                    <text>淇濆吇閮ㄤ綅锛�</text>{{item.HMaintainPart}}
-                                </view>
-                                <view class="detail" v-if="item.HClaim">
-                                    <text>鍏蜂綋瑕佹眰锛�</text>{{item.HClaim}}
-                                </view>
-                                <view class="detail">
-                                    <text>璐熻矗浜猴細</text>{{item.HManagerName}}
-                                </view>
-                                <view class="detail" v-if="item.Remark">
-                                    <text>澶囨敞锛�</text>{{item.Remark}}
-                                </view>
-                            </view>
-                        </uni-card>
-                    </view>
-                    <view class="over" v-if="HCheckFileList.length == 0">鏆傛棤鏁版嵁</view>
-                </view>
-            </view>
-        </template>
-        <!-- 鍏朵粬淇℃伅 -->
-        <template v-if="tabs == 2">
-            <view class="form" :style="{
+					<view class="list" v-for="(item,index) in HCheckFileList" :key="index">
+						<uni-card style="margin: 10px;">
+							<view class="card-detail">
+								<view class="detail">
+									<text>搴忓彿锛�</text>{{index+1}}
+								</view>
+								<view class="detail">
+									<text>缁撴灉锛�</text>
+									<checkbox-group style="display: inline-block;"
+										@change="checkBoxChangeHandler(index, $event)">
+										<checkbox value="enabled" :checked="item.HMaintainResult" />
+									</checkbox-group>
+								</view>
+								<view class="detail">
+									<text>淇濆吇椤圭洰锛�</text>{{item.HMaintainItem}}
+								</view>
+								<view class="detail" v-if="item.HMaintainPart">
+									<text>淇濆吇閮ㄤ綅锛�</text>{{item.HMaintainPart}}
+								</view>
+								<view class="detail" v-if="item.HClaim">
+									<text>鍏蜂綋瑕佹眰锛�</text>{{item.HClaim}}
+								</view>
+								<view class="detail">
+									<text>璐熻矗浜猴細</text>{{item.HManagerName}}
+								</view>
+								<view class="detail" v-if="item.Remark">
+									<text>澶囨敞锛�</text>{{item.Remark}}
+								</view>
+							</view>
+						</uni-card>
+					</view>
+					<view class="over" v-if="HCheckFileList.length == 0">鏆傛棤鏁版嵁</view>
+				</view>
+			</view>
+		</template>
+		<!-- 鍏朵粬淇℃伅 -->
+		<template v-if="tabs == 2">
+			<view class="form" :style="{
                 height: containerHeight + 'px',
                 overflow: 'auto'
             }">
-                <view class="form-item">
-                    <view class="title">鍒涘缓浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMaker" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍒涘缓鏃ユ湡:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMakeDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">淇敼浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HUpDater" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">淇敼鏃ユ湡:</view>
-                    <view class="righton">
-                        <input v-model="hform.HUpDateDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">瀹℃牳浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HChecker" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">瀹℃牳鏃堕棿:</view>
-                    <view class="righton">
-                        <input v-model="hform.HCheckDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">浣滃簾浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HDeleteMan" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">浣滃簾鏃ユ湡:</view>
-                    <view class="righton">
-                        <input v-model="hform.HDeleteDate" />
-                    </view>
-                </view>
-            </view>
+				<view class="form-item">
+					<view class="title">鍒涘缓浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HMaker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒涘缓鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HMakeDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDater" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDateDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HChecker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳鏃堕棿:</view>
+					<view class="righton">
+						<input v-model="hform.HCheckDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteMan" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteDate" />
+					</view>
+				</view>
+			</view>
 
-        </template>
-        <!-- 闄勪欢淇℃伅 -->
-        <template v-if="tabs == 3">
-            <view class="card-item-wrapper">
-                <view class="attachment-btns">
-                    <button type="primary" size="mini" @tap="fileUpload">閫夋嫨鏂囦欢</button>
-                    <view style="flex: 1;"></view>
-                </view>
-                <view v-for="(item, index) in attachmentInfo" :key="index">
-                    <uni-card :title="item['fileName']" :thumbnail="item.filePath">
-                        <view class="card-detail">
-                            <view class="detail">
-                                <text>澶у皬锛�</text>{{item["size"]}}
-                            </view>
-                            <view class="detail">
-                                <text>鐘舵�侊細</text>{{item["status"]}}
-                            </view>
-                            <view class="detail operation" v-if="item['status']!='涓婁紶鎴愬姛'">
-                                <text>鎿嶄綔锛�</text>
-                                <button class="btn-a" size="mini" @tap.stop="uploadFile(index)">涓婁紶</button>
-                                <button class="btn-b" size="mini" @tap.stop="delFile(index)">鍒犻櫎</button>
-                            </view>
-                        </view>
-                    </uni-card>
-                </view>
-            </view>
-        </template>
-        <!-- 鎿嶄綔鎸夐挳 -->
-        <view class="buttons" id="buttons">
-            <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-            <view style="flex: 1;"></view>
-            <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
-            <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
-        </view>
-        <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
-        <BillSelectorPopupVue @update="billSelectHandler" ref="billSelector" :Type="'BY'"></BillSelectorPopupVue>
-    </view>
+		</template>
+		<!-- 闄勪欢淇℃伅 -->
+		<template v-if="tabs == 3">
+			<view class="card-item-wrapper">
+				<view class="attachment-btns">
+					<button type="primary" size="mini" @tap="fileUpload">閫夋嫨鏂囦欢</button>
+					<view style="flex: 1;"></view>
+				</view>
+				<view v-for="(item, index) in attachmentInfo" :key="index">
+					<uni-card :title="item['fileName']" :thumbnail="item.filePath">
+						<view class="card-detail">
+							<view class="detail">
+								<text>澶у皬锛�</text>{{item["size"]}}
+							</view>
+							<view class="detail">
+								<text>鐘舵�侊細</text>{{item["status"]}}
+							</view>
+							<view class="detail operation" v-if="item['status']!='涓婁紶鎴愬姛'">
+								<text>鎿嶄綔锛�</text>
+								<button class="btn-a" size="mini" @tap.stop="uploadFile(index)">涓婁紶</button>
+								<button class="btn-b" size="mini" @tap.stop="delFile(index)">鍒犻櫎</button>
+							</view>
+						</view>
+					</uni-card>
+				</view>
+			</view>
+		</template>
+		<!-- 鎿嶄綔鎸夐挳 -->
+		<view class="buttons" id="buttons">
+			<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			<view style="flex: 1;"></view>
+			<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+			<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+		</view>
+		<xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
+		<BillSelectorPopupVue @update="billSelectHandler" ref="billSelector" :Type="'BY'"></BillSelectorPopupVue>
+	</view>
 </template>
 
 <script>
-    import dayjs from "dayjs";
-    import {
-        CommonUtils
-    } from "@/utils/common";
-    import {
-        MpaasScan
-    } from "@/utils/mpaasScan.js"
-    import {
-        getUserInfo
-    } from "../../../utils/auth";
-    import BillSelectorPopupVue from "../../../components/MJGL/BillSelectorPopup.vue";
-    export default {
-        name: 'sb_EquipMaintainBill',
-        components: {
-            BillSelectorPopupVue
-        },
-        data() {
-            return {
-                tabs: 0,
-                HMainSourceBillType: "",
-                btnTop: 0,
-                tabsBottom: 0,
-                HModName: "sb_EquipMaintainBill",
-                HBillType: '3901',
-                operationType: 1,
-                enableEdit: true,
-                uploadOptions: {},
+	import dayjs from "dayjs";
+	import {
+		CommonUtils
+	} from "@/utils/common";
+	import {
+		MpaasScan
+	} from "@/utils/mpaasScan.js"
+	import {
+		getUserInfo
+	} from "../../../utils/auth";
+	import BillSelectorPopupVue from "../../../components/MJGL/BillSelectorPopup.vue";
+	export default {
+		name: 'sb_EquipMaintainBill',
+		components: {
+			BillSelectorPopupVue
+		},
+		data() {
+			return {
+				tabs: 0,
+				HMainSourceBillType: "",
+				btnTop: 0,
+				tabsBottom: 0,
+				HModName: "sb_EquipMaintainBill",
+				HBillType: '3901',
+				operationType: 1,
+				enableEdit: true,
+				uploadOptions: {},
 
-                HDeptList: [],
-                HShiftsList: [],
-                HCheckFileList: [],
-                attachmentInfo: [],
+				HDeptList: [],
+				HShiftsList: [],
+				HCheckFileList: [],
+				attachmentInfo: [],
 
-                hform: {
-                    HBarCode: "",
-                    HBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
-                    HEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
-                    HQty: 0,
-                    HErrNote: "",
-                    HBigSafeNote: "",
-                    HShiftsName: "",
-                    HShiftsID: 0,
-                    HBillNo: "",
-                    HInterID: 0,
-                    HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
-                    HDeptName: "",
-                    HDeptID: 0,
-                    HRemark: "",
-                    HBarName: "",
-                    HEquipID: 0,
-                    HBarSpec: "",
-                    HBarModel: "",
-                    HPlanNo: "",
-                    HPlanInterID: 0,
-                    HPlanEntryID: 0,
-                    HEquipMaintainPlanInterID: 0,
-                    HEquipMaintainPlanEntryID: "",
-                    HMaker: getUserInfo()['Czymc'],
-                    HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
-                    HUpDater: "",
-                    HUpDateDate: "",
-                    HChecker: "",
-                    HCheckDate: "",
-                    HDeleteMan: "",
-                    HDeleteDate: "",
-                    lngBillKey: 0,
-                    lngBillSubKey: 0,
-                    HLastResult: "OK"
-                }
-            };
-        },
-        computed: {
-            containerHeight: {
-                get() {
-                    return this.btnTop - this.tabsBottom - 5
-                }
-            },
-            calcHLastResult: {
-                get() {
-                    if (this.HCheckFileList.length == 0) {
-                        return 'OK'
-                    } else {
-                        let okCount = this.HCheckFileList.reduce((acc, item) => {
-                            if (item.HMaintainResult) {
-                                return acc + 1
-                            }
-                            return acc
-                        }, 0)
-                        if (okCount == this.HCheckFileList.length) {
-                            return 'OK'
-                        }
-                        return 'NG'
-                    }
-                }
-            }
+				hform: {
+					HBarCode: "",
+					HBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+					HEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+					HQty: 0,
+					HErrNote: "",
+					HBigSafeNote: "",
+					HShiftsName: "",
+					HShiftsID: 0,
+					HBillNo: "",
+					HInterID: 0,
+					HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+					HDeptName: getUserInfo().HDeptName,
+					HDeptID: getUserInfo().HDeptID,
+					HRemark: "",
+					HBarName: "",
+					HEquipID: 0,
+					HBarSpec: "",
+					HBarModel: "",
+					HPlanNo: "",
+					HPlanInterID: 0,
+					HPlanEntryID: 0,
+					HEquipMaintainPlanInterID: 0,
+					HEquipMaintainPlanEntryID: "",
+					HMaker: getUserInfo()['Czymc'],
+					HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
+					HUpDater: "",
+					HUpDateDate: "",
+					HChecker: "",
+					HCheckDate: "",
+					HDeleteMan: "",
+					HDeleteDate: "",
+					lngBillKey: 0,
+					lngBillSubKey: 0,
+					HLastResult: "OK"
+				}
+			};
+		},
+		computed: {
+			containerHeight: {
+				get() {
+					return this.btnTop - this.tabsBottom - 5
+				}
+			},
+			calcHLastResult: {
+				get() {
+					if (this.HCheckFileList.length == 0) {
+						return 'OK'
+					} else {
+						let okCount = this.HCheckFileList.reduce((acc, item) => {
+							if (item.HMaintainResult) {
+								return acc + 1
+							}
+							return acc
+						}, 0)
+						if (okCount == this.HCheckFileList.length) {
+							return 'OK'
+						}
+						return 'NG'
+					}
+				}
+			}
 
-        },
-        methods: {
-            billSelectHandler(billData) {
-                console.log('billData: ', billData);
-                let data = billData.retVal[this.hform.HEquipID]
-                this.get_DocCheckItem2(data.hmainid)
-            },
-            // 鑾峰彇淇濆吇瑙勭▼
-            async get_DocCheckItem2(HEquipMaintainRuleInterID) {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Web/GetMaintainItemByMaintainRuleID",
-                        data: {
-                            "HEquipMaintainRuleInterID": HEquipMaintainRuleInterID
-                        },
-                    })
+		},
+		methods: {
+			billSelectHandler(billData) {
+				console.log('billData: ', billData);
+				let data = billData.retVal[this.hform.HEquipID]
+				this.get_DocCheckItem2(data.hmainid)
+			},
+			// 鑾峰彇淇濆吇瑙勭▼
+			async get_DocCheckItem2(HEquipMaintainRuleInterID) {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Web/GetMaintainItemByMaintainRuleID",
+						data: {
+							"HEquipMaintainRuleInterID": HEquipMaintainRuleInterID
+						},
+					})
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        console.log('data: ', data);
-                        this.hform.HEquipMaintainRuleInterID = data[0].淇濆吇瑙勭▼ID
-                        this.hform.HEquipMaintainRuleInterNo = data[0].淇濆吇瑙勭▼鍗曞彿
-                        this.hform.HPlanNo = data[0].淇濆吇璁″垝鍗�
-                        this.hform.HEquipMaintainPlanInterID = (data[0].淇濆吇璁″垝ID == null ? 0 : data[0].淇濆吇璁″垝ID) == "" ?
-                            0 : data[0].淇濆吇璁″垝ID
-                        this.hform.HEquipMaintainPlanEntryID = (data[0].淇濆吇璁″垝瀛怚D == null ? 0 : data[0].淇濆吇璁″垝瀛怚D) ==
-                            "" ? 0 : data[0].淇濆吇璁″垝瀛怚D
-                        this.hform.HMainSourceBillNo = data[0].淇濆吇璁″垝鍗�
-                        this.hform.HMainSourceInterID = (data[0].淇濆吇璁″垝ID == null ? 0 : data[0].淇濆吇璁″垝ID) == "" ? 0 :
-                            data[0].淇濆吇璁″垝ID
-                        this.hform.HMainSourceEntryID = (data[0].淇濆吇璁″垝瀛怚D == null ? 0 : data[0].淇濆吇璁″垝瀛怚D) == "" ? 0 :
-                            data[0].淇濆吇璁″垝瀛怚D
-                        
-                        this.HCheckFileList = Array.from(data).map(item => {
-                            return {
-                                "HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
-                                "HMaintainItemID": item.HMaintainItemID,
-                                "HMaintainNumber": item.淇濆吇椤圭洰浠ｇ爜,
-                                "HMaintainItem": item.淇濆吇椤圭洰,
-                                "HMaintainPart": item.淇濆吇閮ㄤ綅,
-                                "HClaim": item.鍏蜂綋瑕佹眰,
-                                "HManagerID": item.璐熻矗浜篒D,
-                                "HManagerNumber": item.璐熻矗浜轰唬鐮�,
-                                "HManagerName": item.璐熻矗浜哄悕绉�,
-                                "HRemark": "",
-                                "HSourceInterID": item.淇濆吇璁″垝ID || 0,
-                                "HSourceEntryID": item.淇濆吇璁″垝瀛怚D || 0,
-                                "HSourceBillNo": item.淇濆吇璁″垝鍗� || ""
-                            }
-                        })
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						console.log('data: ', data);
+						this.hform.HEquipMaintainRuleInterID = data[0].淇濆吇瑙勭▼ID
+						this.hform.HEquipMaintainRuleInterNo = data[0].淇濆吇瑙勭▼鍗曞彿
+						this.hform.HPlanNo = data[0].淇濆吇璁″垝鍗�
+						this.hform.HEquipMaintainPlanInterID = (data[0].淇濆吇璁″垝ID == null ? 0 : data[0].淇濆吇璁″垝ID) == "" ?
+							0 : data[0].淇濆吇璁″垝ID
+						this.hform.HEquipMaintainPlanEntryID = (data[0].淇濆吇璁″垝瀛怚D == null ? 0 : data[0].淇濆吇璁″垝瀛怚D) ==
+							"" ? 0 : data[0].淇濆吇璁″垝瀛怚D
+						this.hform.HMainSourceBillNo = data[0].淇濆吇璁″垝鍗�
+						this.hform.HMainSourceInterID = (data[0].淇濆吇璁″垝ID == null ? 0 : data[0].淇濆吇璁″垝ID) == "" ? 0 :
+							data[0].淇濆吇璁″垝ID
+						this.hform.HMainSourceEntryID = (data[0].淇濆吇璁″垝瀛怚D == null ? 0 : data[0].淇濆吇璁″垝瀛怚D) == "" ? 0 :
+							data[0].淇濆吇璁″垝瀛怚D
 
-                        this.enableEdit = false
-                        this.$refs["billSelector"].exit()
+						this.HCheckFileList = Array.from(data).map(item => {
+							return {
+								"HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
+								"HMaintainItemID": item.HMaintainItemID,
+								"HMaintainNumber": item.淇濆吇椤圭洰浠ｇ爜,
+								"HMaintainItem": item.淇濆吇椤圭洰,
+								"HMaintainPart": item.淇濆吇閮ㄤ綅,
+								"HClaim": item.鍏蜂綋瑕佹眰,
+								"HManagerID": item.璐熻矗浜篒D,
+								"HManagerNumber": item.璐熻矗浜轰唬鐮�,
+								"HManagerName": item.璐熻矗浜哄悕绉�,
+								"HRemark": "",
+								"HSourceInterID": item.淇濆吇璁″垝ID || 0,
+								"HSourceEntryID": item.淇濆吇璁″垝瀛怚D || 0,
+								"HSourceBillNo": item.淇濆吇璁″垝鍗� || ""
+							}
+						})
 
-                    } else {
-                        CommonUtils.showTips({
-                            message: Message
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        message: err
-                    })
-                }
-            },
-            toCheckFile() {
-                if (this.hform.HEquipID == 0) {
-                    return CommonUtils.showTips({
-                        message: '涓嶈兘閫夋嫨淇濆吇瑙勭▼锛岃鍏堟壂鎻忚澶囨潯鐮�!!!'
-                    })
-                }
-                this.$refs['billSelector'].showPopup(this.hform.HEquipID)
-            },
-            ValidCheck() {
-                if (this.hform.HEquipID == 0) {
-                    return {
-                        Message: "鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!",
-                        state: false
-                    }
-                }
+						this.enableEdit = false
+						this.$refs["billSelector"].exit()
 
-                return {
-                    Message: "",
-                    state: true
-                }
-            },
-            addNew() {
-                uni.redirectTo({
-                    url: './Sb_EquipMaintainBill?operationType=1'
-                })
-            },
-            goBack() {
-                uni.navigateBack()
-            },
-            checkBoxChangeHandler(index, e) {
-                let cr = e.detail.value
-                if (cr.length == 0) {
-                    this.HCheckFileList[index]["HMaintainResult"] = false
-                } else {
-                    this.HCheckFileList[index]["HMaintainResult"] = true
-                }
-            },
-            uploadFile(index) {
-                console.log('filePath: ', this.attachmentInfo[index].filePath);
-                // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
-                uni.uploadFile({
-                    url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
-                    filePath: this.attachmentInfo[index].filePath,
-                    name: 'file',
-                    formData: {
-                        HBillNo: this.hform.HBillNo,
-                        HRemark: "",
-                        HUserName: getUserInfo()["Czymc"]
-                    },
-                    success: (uploadRes) => {
-                        CommonUtils.showTips({
-                            message: "涓婁紶鎴愬姛"
-                        })
-                        this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
-                    },
-                    fail: (err) => {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: `涓婁紶澶辫触: ${err}`
-                        })
-                    }
-                })
-            },
-            delFile(index) {
-                console.log('attachmentInfo: ', this.attachmentInfo[index]);
-                uni.showModal({
-                    title: '鎻愮ず',
-                    content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
-                    success: (res) => {
-                        if (res.confirm) {
-                            this.attachmentInfo.splice(index, 1)
-                        }
-                    },
-                })
+					} else {
+						CommonUtils.showTips({
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						message: err
+					})
+				}
+			},
+			toCheckFile() {
+				if (this.hform.HEquipID == 0) {
+					return CommonUtils.showTips({
+						message: '涓嶈兘閫夋嫨淇濆吇瑙勭▼锛岃鍏堟壂鎻忚澶囨潯鐮�!!!'
+					})
+				}
+				this.$refs['billSelector'].showPopup(this.hform.HEquipID)
+			},
+			ValidCheck() {
+				if (this.hform.HEquipID == 0) {
+					return {
+						Message: "鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!",
+						state: false
+					}
+				}
 
-            },
-            handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
-                console.log('file: ', res);
-                let fileInfo = res.data[0]
-                this.attachmentInfo.push({
-                    fileName: fileInfo.name,
-                    size: fileInfo.size,
-                    status: '绛夊緟涓婁紶',
-                    filePath: fileInfo.tempFilePath
-                })
-            },
-            // 涓婁紶鏂囦欢
-            fileUpload() {
-                this.$refs.XeUpload.upload('file', {});
-            },
-            //鑾峰彇鐝鏁版嵁
-            async getShiftList() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: '/Web/GetGy_ShiftsList_Json',
-                        data: {
-                            Shifts: "",
-                        }
-                    })
+				return {
+					Message: "",
+					state: true
+				}
+			},
+			addNew() {
+				uni.redirectTo({
+					url: './Sb_EquipMaintainBill?operationType=1'
+				})
+			},
+			goBack() {
+				uni.navigateBack()
+			},
+			checkBoxChangeHandler(index, e) {
+				let cr = e.detail.value
+				if (cr.length == 0) {
+					this.HCheckFileList[index]["HMaintainResult"] = false
+				} else {
+					this.HCheckFileList[index]["HMaintainResult"] = true
+				}
+			},
+			uploadFile(index) {
+				console.log('filePath: ', this.attachmentInfo[index].filePath);
+				// 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
+				uni.uploadFile({
+					url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
+					filePath: this.attachmentInfo[index].filePath,
+					name: 'file',
+					formData: {
+						HBillNo: this.hform.HBillNo,
+						HRemark: "",
+						HUserName: getUserInfo()["Czymc"]
+					},
+					success: (uploadRes) => {
+						CommonUtils.showTips({
+							message: "涓婁紶鎴愬姛"
+						})
+						this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
+					},
+					fail: (err) => {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: `涓婁紶澶辫触: ${err}`
+						})
+					}
+				})
+			},
+			delFile(index) {
+				console.log('attachmentInfo: ', this.attachmentInfo[index]);
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+					success: (res) => {
+						if (res.confirm) {
+							this.attachmentInfo.splice(index, 1)
+						}
+					},
+				})
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        this.HShiftsList = data
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: Message
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: err
-                    })
-                }
-            },
-            //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
-            async getHDeptList() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: '/Gy_Department/list',
-                        data: {
-                            sWhere: ` AND HUSEORGID = ${uni.getStorageSync('OrganizationID')}`,
-                            user: uni.getStorageSync('HUserName'),
-                            Organization: uni.getStorageSync('Organization')
-                        }
-                    })
+			},
+			handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
+				console.log('file: ', res);
+				let fileInfo = res.data[0]
+				this.attachmentInfo.push({
+					fileName: fileInfo.name,
+					size: fileInfo.size,
+					status: '绛夊緟涓婁紶',
+					filePath: fileInfo.tempFilePath
+				})
+			},
+			// 涓婁紶鏂囦欢
+			fileUpload() {
+				this.$refs.XeUpload.upload('file', {});
+			},
+			//鑾峰彇鐝鏁版嵁
+			async getShiftList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Gy_ShiftsController/Get_Gy_WorkShiftList',
+						data: {
+							sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'')  != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}'`,
+							HMaker: getUserInfo()["Czymc"],
+						}
+					})
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        this.HDeptList = data
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: Message
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: err
-                    })
-                }
-            },
-            toScanCode() {
-                MpaasScan.scanCode(cb => {
-                    this.hfrom.HBarCode = cb
-                    this.GetMessageByBarCode(cb)
-                })
-            },
-            async GetMessageByBarCode(HBarCode) {
-                try {
-                    let res = await CommonUtils.doRequest2Sync({
-                        url: "/Gy_EquipFileBill/txtHBarCode_KeyDown",
-                        data: {
-                            HBarCode: HBarCode,
-                            user: getUserInfo()["Czymc"]
-                        },
-                    })
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HShiftsList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			async getHDeptList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Gy_Department/list',
+						data: {
+							sWhere: ` AND HUSEORGID = ${uni.getStorageSync('OrganizationID')}`,
+							user: uni.getStorageSync('HUserName'),
+							Organization: uni.getStorageSync('Organization')
+						}
+					})
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HDeptList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			toScanCode() {
+				MpaasScan.scanCode(cb => {
+					this.hfrom.HBarCode = cb
+					this.GetMessageByBarCode(cb)
+				})
+			},
+			async GetMessageByBarCode(HBarCode) {
+				try {
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Gy_EquipFileBill/txtHBarCode_KeyDown",
+						data: {
+							HBarCode: HBarCode,
+							user: getUserInfo()["Czymc"]
+						},
+					})
 
 
-                    if (!res) {
-                        return
-                    }
+					if (!res) {
+						return
+					}
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
+					let {
+						data,
+						count,
+						Message
+					} = res.data
 
-                    console.log('data: ', data);
+					console.log('data: ', data);
 
-                    if (count == 1) {
-                        this.hform.HEquipID = data[0].HInterID
-                        this.hform.HBarName = data[0].璁惧鍚嶇О
-                        this.hform.HBarSpec = data[0].璁惧瑙勬牸
-                        this.hform.HBarModel = data[0].璁惧鍨嬪彿
-                        this.hform.HQty = 1
+					if (count == 1) {
+						this.hform.HEquipID = data[0].HInterID
+						this.hform.HBarName = data[0].璁惧鍚嶇О
+						this.hform.HBarSpec = data[0].璁惧瑙勬牸
+						this.hform.HBarModel = data[0].璁惧鍨嬪彿
+						this.hform.HQty = 1
 
-                        // 鑾峰彇妫�楠岃绋�
-                        this.GetItemByEquipFile()
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: Message
-                        })
-                    }
+						// 鑾峰彇妫�楠岃绋�
+						this.GetItemByEquipFile()
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: Message
+						})
+					}
 
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: err
-                    })
-                }
-            },
-            async GetItemByEquipFile() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Web/GetItemByEquipFile",
-                        data: {
-                            "EquipProjectID": this.hform.HEquipID,
-                            "Type": "BY",
-                            "HDate": this.hform.HBeginDate
-                        }
-                    })
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: err
+					})
+				}
+			},
+			async GetItemByEquipFile() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Web/GetItemByEquipFile",
+						data: {
+							"EquipProjectID": this.hform.HEquipID,
+							"Type": "BY",
+							"HDate": this.hform.HBeginDate
+						}
+					})
 
-                    let {
-                        data,
-                        Message,
-                        count
-                    } = res.data
-                    if (count == 1) {
-                        this.hform.HEquipMaintainRuleInterID = data[0].淇濆吇瑙勭▼ID
-                        this.hform.HEquipMaintainRuleInterNo = data[0].淇濆吇瑙勭▼鍗曞彿
-                        this.hform.HPlanNo = data[0].淇濆吇璁″垝鍗�
-                        this.hform.HEquipMaintainPlanInterID = (data[0].淇濆吇璁″垝ID == null ? 0 : data[0].淇濆吇璁″垝ID) == "" ?
-                            0 : data[0].淇濆吇璁″垝ID
-                        this.hform.HEquipMaintainPlanEntryID = (data[0].淇濆吇璁″垝瀛怚D == null ? 0 : data[0].淇濆吇璁″垝瀛怚D) ==
-                            "" ? 0 : data[0].淇濆吇璁″垝瀛怚D
-                        this.hform.HMainSourceBillNo = data[0].淇濆吇璁″垝鍗�
-                        this.hform.HMainSourceInterID = (data[0].淇濆吇璁″垝ID == null ? 0 : data[0].淇濆吇璁″垝ID) == "" ? 0 :
-                            data[0].淇濆吇璁″垝ID
-                        this.hform.HMainSourceEntryID = (data[0].淇濆吇璁″垝瀛怚D == null ? 0 : data[0].淇濆吇璁″垝瀛怚D) == "" ? 0 :
-                            data[0].淇濆吇璁″垝瀛怚D
+					let {
+						data,
+						Message,
+						count
+					} = res.data
+					if (count == 1) {
+						this.hform.HEquipMaintainRuleInterID = data[0].淇濆吇瑙勭▼ID
+						this.hform.HEquipMaintainRuleInterNo = data[0].淇濆吇瑙勭▼鍗曞彿
+						this.hform.HPlanNo = data[0].淇濆吇璁″垝鍗�
+						this.hform.HEquipMaintainPlanInterID = (data[0].淇濆吇璁″垝ID == null ? 0 : data[0].淇濆吇璁″垝ID) == "" ?
+							0 : data[0].淇濆吇璁″垝ID
+						this.hform.HEquipMaintainPlanEntryID = (data[0].淇濆吇璁″垝瀛怚D == null ? 0 : data[0].淇濆吇璁″垝瀛怚D) ==
+							"" ? 0 : data[0].淇濆吇璁″垝瀛怚D
+						this.hform.HMainSourceBillNo = data[0].淇濆吇璁″垝鍗�
+						this.hform.HMainSourceInterID = (data[0].淇濆吇璁″垝ID == null ? 0 : data[0].淇濆吇璁″垝ID) == "" ? 0 :
+							data[0].淇濆吇璁″垝ID
+						this.hform.HMainSourceEntryID = (data[0].淇濆吇璁″垝瀛怚D == null ? 0 : data[0].淇濆吇璁″垝瀛怚D) == "" ? 0 :
+							data[0].淇濆吇璁″垝瀛怚D
 
-                        this.HCheckFileList = Array.from(data).map(item => {
-                            return {
-                                "HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
-                                "HMaintainItemID": item.淇濆吇椤圭洰ID,
-                                "HMaintainNumber": item.淇濆吇椤圭洰浠ｇ爜,
-                                "HMaintainItem": item.淇濆吇椤圭洰鍚嶇О,
-                                "HMaintainPart": item.淇濆吇閮ㄤ綅,
-                                "HClaim": item.鍏蜂綋瑕佹眰,
-                                "HManagerID": item.璐熻矗浜篒D,
-                                "HManagerNumber": item.璐熻矗浜轰唬鐮�,
-                                "HManagerName": item.璐熻矗浜哄悕绉�,
-                                "HRemark": "",
-                                "HSourceInterID": item.淇濆吇璁″垝ID,
-                                "HSourceEntryID": item.淇濆吇璁″垝瀛怚D,
-                                "HSourceBillNo": item.淇濆吇璁″垝鍗�
-                            }
-                        })
+						this.HCheckFileList = Array.from(data).map(item => {
+							return {
+								"HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
+								"HMaintainItemID": item.淇濆吇椤圭洰ID,
+								"HMaintainNumber": item.淇濆吇椤圭洰浠ｇ爜,
+								"HMaintainItem": item.淇濆吇椤圭洰鍚嶇О,
+								"HMaintainPart": item.淇濆吇閮ㄤ綅,
+								"HClaim": item.鍏蜂綋瑕佹眰,
+								"HManagerID": item.璐熻矗浜篒D,
+								"HManagerNumber": item.璐熻矗浜轰唬鐮�,
+								"HManagerName": item.璐熻矗浜哄悕绉�,
+								"HRemark": "",
+								"HSourceInterID": item.淇濆吇璁″垝ID,
+								"HSourceEntryID": item.淇濆吇璁″垝瀛怚D,
+								"HSourceBillNo": item.淇濆吇璁″垝鍗�
+							}
+						})
 
-                        this.enableEdit = false
+						this.enableEdit = false
 
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: `鑾峰彇淇濆吇瑙勭▼閿欒锛� ${Message}`
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
-                    })
-                }
-            },
-            radioChange({
-                detail: {
-                    value
-                }
-            }) {
-                this.HLastResult = value
-            },
-            async getMaxNum() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Web/GetMAXNum",
-                        data: {
-                            "HBillType": this.HBillType
-                        }
-                    })
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: `鑾峰彇淇濆吇瑙勭▼閿欒锛� ${Message}`
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
+					})
+				}
+			},
+			radioChange({
+				detail: {
+					value
+				}
+			}) {
+				this.HLastResult = value
+			},
+			async getMaxNum() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Web/GetMAXNum",
+						data: {
+							"HBillType": this.HBillType
+						}
+					})
 
-                    let {
-                        count,
-                        data,
-                        Message
-                    } = res.data
-                    console.log('data: ', data);
-                    this.hform.HInterID = 0
-                    this.hform.HBillNo = data[0]["HBillNo"]
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
-                    })
-                }
-            },
-            async submit() {
-                let valid = this.ValidCheck()
-                if (!valid.state) {
-                    return CommonUtils.showTips({
-                        message: valid.Message
-                    })
-                }
+					let {
+						count,
+						data,
+						Message
+					} = res.data
+					console.log('data: ', data);
+					this.hform.HInterID = 0
+					this.hform.HBillNo = data[0]["HBillNo"]
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+					})
+				}
+			},
+			async submit() {
+				let valid = this.ValidCheck()
+				if (!valid.state) {
+					return CommonUtils.showTips({
+						message: valid.Message
+					})
+				}
 
-                try {
-                    let oMain = JSON.stringify(this.hform);
-                    let sSubStr = JSON.stringify(this.HCheckFileList);
-                    let sMainSub = oMain + ';' + sSubStr;
-                    let res = await CommonUtils.doRequest2Sync({
-                        url: "/Sb_PDA_EquipMaintainBill/SaveGetEquipMaintainBillList",
-                        data: {
-                            "msg": sMainSub
-                        },
-                        method: "POST"
-                    })
+				try {
+					let oMain = JSON.stringify(this.hform);
+					let sSubStr = JSON.stringify(this.HCheckFileList);
+					let sMainSub = oMain + ';' + sSubStr;
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Sb_PDA_EquipMaintainBill/SaveGetEquipMaintainBillList",
+						data: {
+							"msg": sMainSub
+						},
+						method: "POST"
+					})
 
-                    if (!res) {
-                        return
-                    }
+					if (!res) {
+						return
+					}
 
-                    let {
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        uni.showModal({
-                            title: '鎻愮ず',
-                            content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
-                            success: (res) => {
-                                if (res.confirm) {
-                                    console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-                                    uni.redirectTo({
-                                        url: '/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill?operationType=1'
-                                    })
-                                } else if (res.cancel) {
-                                    console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                                    setTimeout(() => {
-                                        uni.navigateBack();
-                                    }, 50)
-                                }
-                            }
-                        });
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: "鎻愪氦鍗曟嵁澶辫触: " + Message
-                        })
-                    }
+					let {
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						uni.showModal({
+							title: '鎻愮ず',
+							content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+							success: (res) => {
+								if (res.confirm) {
+									console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+									uni.redirectTo({
+										url: '/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill?operationType=1'
+									})
+								} else if (res.cancel) {
+									console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+									setTimeout(() => {
+										uni.navigateBack();
+									}, 50)
+								}
+							}
+						});
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+						})
+					}
 
 
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: "鎻愪氦鍗曟嵁澶辫触: " + err
-                    })
-                }
-            }
-        },
-        onLoad(e) {
-            console.log('e: ', e);
-            if (!e.operationType) {
-                this.operationType = 1
-            } else {
-                this.operationType = e.operationType
-            }
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鎻愪氦鍗曟嵁澶辫触: " + err
+					})
+				}
+			}
+		},
+		onLoad(e) {
+			console.log('e: ', e);
+			if (!e.operationType) {
+				this.operationType = 1
+			} else {
+				this.operationType = e.operationType
+			}
 
-            if (this.operationType == 1) {
-                // 鏂板
-                this.getMaxNum()
-            } else if (this.operationType == 2) {
-                // 澶嶅埗
-            } else if (this.operationType == 3) {
-                // 缂栬緫
+			if (this.operationType == 1) {
+				// 鏂板
+				this.getMaxNum()
+			} else if (this.operationType == 2) {
+				// 澶嶅埗
+			} else if (this.operationType == 3) {
+				// 缂栬緫
 
-            } else if (this.operationType == 4) {
-                // 娴忚
+			} else if (this.operationType == 4) {
+				// 娴忚
 
-            }
+			}
 
-            this.getHDeptList()
-            this.getShiftList()
-        },
-        onReady() {
-            const query = uni.createSelectorQuery().in(this)
-            query.select("#buttons")
-                .boundingClientRect()
-                .select("#tabs")
-                .boundingClientRect()
-                .exec(res => {
-                    this.btnTop = Math.floor(res[0].top)
-                    this.tabsBottom = Math.ceil(res[1].bottom)
-                })
-        }
-    }
+			this.getHDeptList()
+			this.getShiftList()
+		},
+		onReady() {
+			const query = uni.createSelectorQuery().in(this)
+			query.select("#buttons")
+				.boundingClientRect()
+				.select("#tabs")
+				.boundingClientRect()
+				.exec(res => {
+					this.btnTop = Math.floor(res[0].top)
+					this.tabsBottom = Math.ceil(res[1].bottom)
+				})
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-    @import "@/pages/MJGL/style/MJBillStyle.scss"
+	@import "@/pages/MJGL/style/MJBillStyle.scss"
 </style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList.vue b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList.vue
index 73ade7e..f24e20f 100644
--- a/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList.vue
+++ b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList.vue
@@ -144,7 +144,7 @@
                 serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                 tabs: 0,
                 urls: '/Web/GetEquipmentBillsList',
-                MvarReportTitle: '璁惧鐐规璁板綍鍗曠紦瀛�',
+                MvarReportTitle: '璁惧鐐规璁板綍鍗曞垪琛�',
                 hform: {
                     HBillNo: '',
                     HSourceBillNo: '',
@@ -178,8 +178,6 @@
             }
         },
         onShow() {
-            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
-            this.CheckModRight()
             this.changeTab(0)
             console.log(this.userInfo, uni.getStorageSync('HUserName'))
         },
@@ -220,30 +218,6 @@
                 await this.$nextTick()
                 this.$refs.barcodePopup.open()
             },
-            CheckModRight() {
-                uni.request({
-                    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
-                    data: {
-                        ModRightName: 'CE_OtherOut',
-                        HUserName: uni.getStorageSync('HUserName')
-                    },
-                    success: (res) => {
-                        if (res.data.count == 1) {} else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
             onPaginationChangeHandler({
                 current
             }) {
@@ -264,9 +238,6 @@
                 if (this.tabs == 0) {
                     this.urls = '/Web/GetEquipmentBillsList'
                 }
-                // if (this.tabs == 1) {
-                // 	this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
-                // }
                 this.search()
             },
             async getList() {
@@ -344,40 +315,6 @@
                     url: '/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill?operationType=1'
                 })
             },
-            //缂栬緫
-            edit(item) {
-                console.log(item)
-                uni.request({
-                    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
-                    data: {
-                        "HInterID": item.HInterID,
-                        "HBillNo": item.鍗曟嵁鍙�,
-                        "HBillType": this.hform.HBillType
-                    },
-                    success: (res) => {
-                        console.log(1, res);
-                        if (res.data.count == 1) {
-                            uni.navigateTo({
-                                url: './OtherOutBill?OperationType=2&HInterID=' + item.HInterID
-                            })
-                        } else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.hideLoading()
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                })
-            },
             //鍒犻櫎
             del(item) {
                 // console.log(item.hmainid,uni.getStorageSync('HUserName'))
@@ -418,51 +355,7 @@
                         }
                     }
                 });
-            },
-            //鎾ら攢
-            revoke(item) {
-                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
-                uni.showModal({
-                    title: '鎻愮ず',
-                    content: '鏄惁纭鎾ら攢',
-                    success: (res) => {
-                        if (res.confirm) {
-                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-                            uni.request({
-                                url: this.serverUrl +
-                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
-                                data: {
-                                    HInterID: item.HInterID,
-                                    HBillNo: item.鍗曟嵁鍙�,
-                                    HBillType: this.hform.HBillType,
-                                    HMaker: uni.getStorageSync('HUserName'),
-                                    MvarReportTitle: this.MvarReportTitle,
-                                },
-                                success: (res) => {
-                                    console.log(1, res);
-                                    if (res.data.count == 1) {
-                                        this.clear()
-                                    }
-                                    uni.showToast({
-                                        title: res.data.Message,
-                                        icon: 'none'
-                                    })
-                                },
-                                fail: (res) => {
-                                    console.log(res);
-                                    uni.hideLoading()
-                                    uni.showToast({
-                                        title: '鎺ュ彛璇锋眰澶辫触',
-                                        icon: 'none'
-                                    })
-                                },
-                            });
-                        } else if (res.cancel) {
-                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                        }
-                    }
-                });
-            },
+            }
         }
     }
 </script>
diff --git a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
index cfbeb05..46200f5 100644
--- a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
+++ b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
@@ -1,736 +1,834 @@
 <template>
-    <view>
-        <view class="tabs" id="tabs">
-            <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
-            <!-- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鏄庣粏淇℃伅</view> -->
-            <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
-            <!-- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view> -->
-        </view>
-        <!-- 鍩烘湰淇℃伅 -->
-        <template v-if="tabs == 0">
-            <view class="form" :style="{
+	<view>
+		<view class="tabs" id="tabs">
+			<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+			<!-- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鏄庣粏淇℃伅</view> -->
+			<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
+			<!-- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view> -->
+		</view>
+		<!-- 鍩烘湰淇℃伅 -->
+		<template v-if="tabs == 0">
+			<view class="form" :style="{
                 height: containerHeight + 'px',
                 overflow: 'auto'
             }">
-                <view class="form-item">
-                    <view class="title">璁惧鏉＄爜:</view>
-                    <view :class="enableEdit?'right':'righton'">
-                        <input v-model="hform.HBarCode" :disabled="!enableEdit"
-                            @confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)璁惧鏉＄爜" />
-                    </view>
-                    <view class="icon-wrapper">
-                        <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鏈�缁堢粨璁�:</view>
-                    <view class="right none-border">
-                        <radio-group @change="radioChange" class="radio_Container">
-                            <label>
-                                <view>
-                                    <radio value="OK" :checked="hform.HCheckResult == 'OK'" />
-                                    <text>OK</text>
-                                </view>
-                            </label>
-                            </label>
-                            <view>
-                                <radio value="NG" :checked="hform.HCheckResult == 'NG'" />
-                                <text>NG</text>
-                            </view>
-                            </label>
-                        </radio-group>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">楠岃瘉鍐呭:</view>
-                    <view class="right">
-                        <textarea v-model="hform.HRepairCheckMainContent" placeholder="璇疯緭鍏ラ獙璇佸唴瀹�" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍗曟嵁鍙�:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HBillNo" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍗曟嵁鏃ユ湡:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title required">閮ㄩ棬:</view>
-                    <zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
-                        dataValue="HItemID" v-model="hform.HDeptID">
-
-                    </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
-                </view>
-                <view class="form-item">
-                    <view class="title required">楠屾敹浜�:</view>
-                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
-                        dataValue="HItemID" v-model="hform.HEmpID">
-
-                    </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
-                </view>
-                <view class="form-item">
-                    <view class="title required">楠岃瘉椤圭洰:</view>
-                    <zxz-uni-data-select required class="right" :localdata="HRepairCheckList" dataKey="缁翠慨楠屾敹椤圭洰"
-                        dataValue="hitemid" v-model="hform.HRepairCheckMainID">
-
-                    </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
-                </view>
-                <view class="form-item">
-                    <view class="title required">璐熻矗浜�:</view>
-                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
-                        dataValue="HItemID" v-model="hform.HManagerID">
-
-                    </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
-                </view>
-                <view class="form-item">
-                    <view class="title">璁惧鍚嶇О:</view>
-                    <view class="righton">
-                        <input v-model="hform.HBarName" disabled />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">璁惧瑙勬牸:</view>
-                    <view class="righton">
-                        <input v-model="hform.HBarSpec" disabled />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">璁惧鍨嬪彿:</view>
-                    <view class="righton">
-                        <input v-model="hform.HBarModel" disabled />
-                    </view>
-                </view>
-            </view>
-        </template>
-        <!-- 鍏朵粬淇℃伅 -->
-        <template v-if="tabs == 2">
-            <view class="form" :style="{
+				<view class="form-item">
+					<view class="title">璁惧鏉＄爜:</view>
+					<view :class="enableEdit?'right':'righton'">
+						<input v-model="hform.HBarCode" :disabled="!enableEdit"
+							@confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)璁惧鏉＄爜" />
+					</view>
+					<view class="icon-wrapper">
+						<uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏈�缁堢粨璁�:</view>
+					<view class="right none-border">
+						<radio-group @change="radioChange" class="radio_Container">
+							<label>
+								<view>
+									<radio value="OK" :checked="hform.HCheckResult == 'OK'" />
+									<text>OK</text>
+								</view>
+							</label>
+							</label>
+							<view>
+								<radio value="NG" :checked="hform.HCheckResult == 'NG'" />
+								<text>NG</text>
+							</view>
+							</label>
+						</radio-group>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">楠屾敹鍐呭:</view>
+					<view class="right">
+						<textarea v-model="HDetailList[0].HRepairCheckContent" placeholder="璇疯緭鍏ラ獙鏀跺唴瀹�" />
+					</view>
+				</view>
+				<!-- 缁翠慨璁板綍锛堟簮鍗曪級 -->
+				<view class="form-item">
+					<view class="title required">缁翠慨璁板綍:</view>
+					<view :class="enableSourceBillEdit?'right':'righton'">
+						<input v-model="hform.HMainSourceBillNo" :disabled="!enableSourceBillEdit"
+							@confirm="GetMessageByHMainSourceBillNo(hform.HMainSourceBillNo)"
+							placeholder="璇疯緭鍏�(鎴栨壂鎻�)缁翠慨璁板綍鍗曞彿" />
+					</view>
+					<!-- 鏀惧ぇ闀滃浘鏍� -->
+					<view class="icon-wrapper">
+						<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+					</view>
+					<!-- 鎵弿鍥炬爣 -->
+					<view class="icon-wrapper">
+						<uni-icons type="scan" size="20" @click="toScanHMainSourceBillNo"></uni-icons>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HBillNo" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鏃ユ湡:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title required">閮ㄩ棬:</view>
+					<zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
+						dataValue="HItemID" v-model="hform.HDeptID">
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title required">楠屾敹浜�:</view>
+					<zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+						dataValue="HItemID" v-model="hform.HEmpID">
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title required">楠屾敹椤圭洰:</view>
+					<zxz-uni-data-select required class="right" :localdata="HRepairCheckList" dataKey="缁翠慨楠屾敹椤圭洰"
+						dataValue="hitemid" v-model="hform.HRepairCheckID">
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title required">璐熻矗浜�:</view>
+					<zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+						dataValue="HItemID" v-model="hform.HManagerID">
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title">璁惧鍚嶇О:</view>
+					<view class="righton">
+						<input v-model="hform.HBarName" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">璁惧瑙勬牸:</view>
+					<view class="righton">
+						<input v-model="hform.HBarSpec" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">璁惧鍨嬪彿:</view>
+					<view class="righton">
+						<input v-model="hform.HBarModel" disabled />
+					</view>
+				</view>
+			</view>
+		</template>
+		<!-- 鍏朵粬淇℃伅 -->
+		<template v-if="tabs == 2">
+			<view class="form" :style="{
                 height: containerHeight + 'px',
                 overflow: 'auto'
             }">
-                <view class="form-item">
-                    <view class="title">鍒涘缓浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMaker" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍒涘缓鏃ユ湡:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMakeDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">淇敼浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HUpDater" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">淇敼鏃ユ湡:</view>
-                    <view class="righton">
-                        <input v-model="hform.HUpDateDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">瀹℃牳浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HChecker" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">瀹℃牳鏃堕棿:</view>
-                    <view class="righton">
-                        <input v-model="hform.HCheckDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">浣滃簾浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HDeleteMan" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">浣滃簾鏃ユ湡:</view>
-                    <view class="righton">
-                        <input v-model="hform.HDeleteDate" />
-                    </view>
-                </view>
-            </view>
+				<view class="form-item">
+					<view class="title">鍒涘缓浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HMaker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒涘缓鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HMakeDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDater" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDateDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HChecker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳鏃堕棿:</view>
+					<view class="righton">
+						<input v-model="hform.HCheckDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteMan" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteDate" />
+					</view>
+				</view>
+			</view>
 
-        </template>
-        <!-- 鎿嶄綔鎸夐挳 -->
-        <view class="buttons" id="buttons">
-            <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-            <view style="flex: 1;"></view>
-            <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
-            <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
-        </view>
-        <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
-    </view>
+		</template>
+		<!-- 鎿嶄綔鎸夐挳 -->
+		<view class="buttons" id="buttons">
+			<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			<view style="flex: 1;"></view>
+			<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+			<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+		</view>
+		<xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
+
+		<!-- 婧愬崟鍗曟嵁鍒楄〃寮圭獥 -->
+		<BillListPopupEquipConkBookBillVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="'璁惧缁翠慨璁板綍鍗�'"
+			:HStockOrgID="hform.HStockOrgID">
+		</BillListPopupEquipConkBookBillVue>
+	</view>
 </template>
 
 <script>
-    import dayjs from "dayjs";
-    import {
-        CommonUtils
-    } from "@/utils/common";
-    import {
-        MpaasScan
-    } from "@/utils/mpaasScan.js"
-    import {
-        getUserInfo
-    } from "../../../utils/auth";
-    export default {
-        name: 'sb_EquipRepairCheckBill',
-        data() {
-            return {
-                tabs: 0,
-                HMainSourceBillType: "",
-                btnTop: 0,
-                tabsBottom: 0,
-                HModName: "sb_EquipRepairCheckBill",
-                HBillType: '3911',
-                operationType: 1,
-                uploadOptions: {},
-                enableEdit: true,
+	import dayjs from "dayjs";
+	import {
+		CommonUtils
+	} from "@/utils/common";
+	import {
+		MpaasScan
+	} from "@/utils/mpaasScan.js"
+	import {
+		getUserInfo
+	} from "../../../utils/auth";
+	// 寮曞叆婧愬崟鍗曟嵁鍒楄〃寮圭獥缁勪欢
+	import BillListPopupEquipConkBookBillVue from '../../../components/BillListPopup/BillListPopupEquipConkBookBill.vue';
 
-                HDeptList: [],
-                HRepairCheckList: [],
-                HEmpList: [],
+	export default {
+		name: 'sb_EquipRepairCheckBill',
+		components: {
+			BillListPopupEquipConkBookBillVue
+		},
+		data() {
+			return {
+				tabs: 0,
+				btnTop: 0,
+				tabsBottom: 0,
+				HModName: "sb_EquipRepairCheckBill",
+				HBillType: '3911',
+				operationType: 1,
+				uploadOptions: {},
+				enableEdit: true,
+				enableSourceBillEdit: true, // 鏂板锛氭帶鍒剁淮淇褰曠紪杈戠姸鎬�
 
-                hform: {
-                    "HBarCode": "",
-                    "HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
-                    "HCheckResult": "OK",
-                    "HRepairCheckMainContent": "",
-                    "HBillNo": "",
-                    "HInterID": 0,
-                    "HDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
-                    "HDeptName": "",
-                    "HDeptID": 0,
-                    "HEmpName": "",
-                    "HEmpID": 0,
-                    "HRepairCheckMainName": "",
-                    "HRepairCheckMainID": 0,
-                    "HManagerName": "",
-                    "HManagerID": 0,
-                    "HBarName": "",
-                    "HEquipID": 0,
-                    "HBarSpec": "",
-                    "HBarModel": "",
-                    "HMaker": getUserInfo()["Czymc"],
-                    "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
-                    "HUpDater": "",
-                    "HUpDateDate": "",
-                    "HChecker": "",
-                    "HCheckDate": "",
-                    "HDeleteMan": "",
-                    "HDeleteDate": "",
-                    "lngBillKey": "",
-                    "lngBillSubKey": ""
-                },
-                HBillSub: [{ // 鍚庣鎺ュ彛闇�瑕併�傚惁鍒欐暟鎹笉浼氭樉绀哄湪缂撳瓨涓�
-                    "HRepairID": 0,
-                    "HRepairCode": "",
-                    "HRepairName": "",
-                    "HManagerID": 0,
-                    "HManagerCode": "",
-                    "HManagerName": "",
-                    "HRepairExplanation": "",
-                    "HRemark": "",
-                    "LAY_TABLE_INDEX": 0
-                }]
-            };
-        },
-        computed: {
-            containerHeight: {
-                get() {
-                    return this.btnTop - this.tabsBottom - 5
-                }
-            },
-        },
-        methods: {
-            // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
-            ValidCheck() {
-                if (this.hform.HEquipID == 0) {
-                    return {
-                        Message: "鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!",
-                        state: false
-                    }
-                }
-                if (this.hform.HDeptID == 0) {
-                    return {
-                        Message: "閮ㄩ棬涓嶅緱涓虹┖!",
-                        state: false
-                    }
-                }
-                if (this.hform.HEmpID == 0) {
-                    return {
-                        Message: "楠屾敹浜轰笉寰椾负绌�!",
-                        state: false
-                    }
-                }
-                if (this.hform.HRepairCheckMainID == 0) {
-                    return {
-                        Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
-                        state: false
-                    }
-                }
-                if (this.hform.HManagerID == 0) {
-                    return {
-                        Message: "璐熻矗浜轰笉寰椾负绌�!",
-                        state: false
-                    }
-                }
+				HDeptList: [],
+				HRepairCheckList: [],
+				HEmpList: [],
 
-                return {
-                    Message: "",
-                    state: true
-                }
-            },
-            addNew() {
-                uni.redirectTo({
-                    url: './Sb_EquipRepairCheckBill?operationType=1'
-                })
-            },
-            goBack() {
-                uni.navigateBack()
-            },
-            checkBoxChangeHandler(index, e) {
-                let cr = e.detail.value
-                if (cr.length == 0) {
-                    this.HCheckFileList[index]["HDotCheckResult"] = false
-                } else {
-                    this.HCheckFileList[index]["HDotCheckResult"] = true
-                }
-            },
-            uploadFile(index) {
-                console.log('filePath: ', this.attachmentInfo[index].filePath);
-                // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
-                uni.uploadFile({
-                    url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
-                    filePath: this.attachmentInfo[index].filePath,
-                    name: 'file',
-                    formData: {
-                        HBillNo: this.hform.HBillNo,
-                        HRemark: "",
-                        HUserName: getUserInfo()["Czymc"]
-                    },
-                    success: (uploadRes) => {
-                        CommonUtils.showTips({
-                            message: "涓婁紶鎴愬姛"
-                        })
-                        this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
-                    },
-                    fail: (err) => {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: `涓婁紶澶辫触: ${err}`
-                        })
-                    }
-                })
-            },
-            delFile(index) {
-                console.log('attachmentInfo: ', this.attachmentInfo[index]);
-                uni.showModal({
-                    title: '鎻愮ず',
-                    content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
-                    success: (res) => {
-                        if (res.confirm) {
-                            this.attachmentInfo.splice(index, 1)
-                        }
-                    },
-                })
+				hform: {
+					"HBillType": '3911',
+					"HBarCode": "",
+					"HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+					"HCheckResult": "OK",
+					"HRepairCheckContent": "",
+					"HBillNo": "",
+					"HInterID": 0,
+					"HDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+					"HDeptName": getUserInfo().HDeptName,
+					"HDeptID": getUserInfo().HDeptID,
+					"HEmpName": getUserInfo().HEmpName,
+					"HEmpID": getUserInfo().HEmpID,
+					"HManagerName": getUserInfo().HManagerName,
+					"HManagerID": getUserInfo().HManagerID,
+					"HRepairCheckMainName": "",
+					"HRepairCheckID": 0,
+					"HBarName": "",
+					"HEquipID": 0,
+					"HBarSpec": "",
+					"HBarModel": "",
+					"HMaker": getUserInfo()["Czymc"],
+					"HMakeDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+					"HUpDater": "",
+					"HUpDateDate": "",
+					"HChecker": "",
+					"HCheckDate": "",
+					"HDeleteMan": "",
+					"HDeleteDate": "",
+					"lngBillKey": "",
+					"lngBillSubKey": "",
+					// 鏂板锛氱淮淇褰曪紙婧愬崟锛夌浉鍏冲瓧娈�
+					"HMainSourceBillNo": "",
+					"HMainSourceInterID": 0,
+					"HMainSourceEntryID": 0,
+					"HMouldRepairWorkName":"",
+					"HMouldRepairWorkID":0,
+					"HStockOrgID": uni.getStorageSync("OrganizationID"),
+				},
+				HDetailList: [{ // 鍚庣鎺ュ彛鎻愪氦闇�瑕� 鏄庣粏淇℃伅
+				  "HRepairCheckID": 0,
+				  "HRepairCode": "",
+				  "HRepairName": "",
+				  "HManagerID": 0,
+				  "HManagerCode": "",
+				  "HManagerName": "",
+				  "HRepairCheckContent": "",
+				  "HRemark": "",
+				  "LAY_TABLE_INDEX": 0
+				}]
+			};
+		},
+		computed: {
+			containerHeight: {
+				get() {
+					return this.btnTop - this.tabsBottom - 5
+				}
+			},
+		},
+		methods: {
+			// 鏄剧ず婧愬崟鍗曟嵁鍒楄〃寮圭獥
+			showBillList() {
+				this.$refs.billList.showPopup();
+			},
 
-            },
-            handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
-                console.log('file: ', res);
-                let fileInfo = res.data[0]
-                this.attachmentInfo.push({
-                    fileName: fileInfo.name,
-                    size: fileInfo.size,
-                    status: '绛夊緟涓婁紶',
-                    filePath: fileInfo.tempFilePath
-                })
-            },
-            // 涓婁紶鏂囦欢
-            fileUpload() {
-                this.$refs.XeUpload.upload('file', {});
-            },
-            //鑾峰彇鐝鏁版嵁
-            async getShiftList() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: '/Web/GetGy_ShiftsList_Json',
-                        data: {
-                            Shifts: "",
-                        }
-                    })
+			// 鎵弿缁翠慨璁板綍鍗曞彿
+			toScanHMainSourceBillNo() {
+				MpaasScan.scanCode(cb => {
+					this.hform.HMainSourceBillNo = cb;
+					this.GetMessageByHMainSourceBillNo(cb);
+				});
+			},
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        this.HShiftsList = data
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: Message
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: err
-                    })
-                }
-            },
-            //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
-            async getHDeptList() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: '/Gy_Department/list',
-                        data: {
-                            sWhere: ` and HUSEORGID = ${uni.getStorageSync('OrganizationID')}`,
-                            user: uni.getStorageSync('HUserName'),
-                            Organization: uni.getStorageSync('Organization')
-                        }
-                    })
+			// 鏍规嵁缁翠慨璁板綍鍗曞彿鑾峰彇淇℃伅
+			async GetMessageByHMainSourceBillNo(HSouceBillNo) {
+				try {
+					let url = "/Sb_EqpRepairWorkBill/GetEqpRepairWorkBillListPage";
+					let dataField = {
+						sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
+						user: getUserInfo()["Czymc"],
+						page: 1,
+						size: 1,
+					};
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        this.HDeptList = data
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: Message
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: err
-                    })
-                }
-            },
-            // 鑾峰彇鑱屽憳鏁版嵁
-            async getEmpList() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: '/PublicPageMethod/UserList',
-                        data: {
-                            sWhere: " where 1=1",
-                        }
-                    })
+					let res = await CommonUtils.doRequest2Async({
+						url: url,
+						data: dataField
+					});
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        this.HEmpList = data
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: Message
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: err
-                    })
-                }
-            },
-            // 鑾峰彇楠岃瘉椤圭洰鏁版嵁
-            async getCheckProjList() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: '/Gy_RepairCheck/GetRepairCheckList',
-                        data: {
-                            sWhere: "",
-                            user: uni.getStorageSync('HUserName'),
-                        }
-                    })
+					let {
+						count,
+						Message,
+						data
+					} = res.data;
+					if (count == 1) {
+						this.hform.HMainSourceBillNo = data[0]["鍗曟嵁鍙�"];
+						this.hform.HMainSourceInterID = data[0]["hmainid"];
+						this.hform.HMainSourceEntryID = data[0]["hsubid"];
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        this.HRepairCheckList = data
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: Message
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: err
-                    })
-                }
-            },
-            toScanCode() {
-                MpaasScan.scanCode(cb => {
-                    this.hfrom.HBarCode = cb
-                    this.GetMessageByBarCode(cb)
-                })
-            },
-            async GetMessageByBarCode(HBarCode) {
-                try {
-                    let res = await CommonUtils.doRequest2Sync({
-                        url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List",
-                        data: {
-                            HBarCode: HBarCode,
-                        },
-                    })
+						// 濡傛灉婧愬崟鏈夎澶囦俊鎭紝鍙互鑷姩濉厖
+						if (data[0].HEquipID) {
+							this.hform.HEquipID = data[0].HEquipID;
+							this.getEquipFileMain(data[0].HEquipID);
+						}
 
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇缁翠慨璁板綍鍗曞け璐�: ${Message}`
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇缁翠慨璁板綍鍗曞け璐�: ${err}`
+					});
+				}
+			},
 
-                    if (!res) {
-                        return
-                    }
+			// 鏍规嵁璁惧ID鑾峰彇璁惧淇℃伅
+			async getEquipFileMain(HInterID) {
+				try {
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_ListByHEquipID",
+						data: {
+							HEquipID: HInterID,
+						},
+					});
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
+					if (!res) {
+						return;
+					}
 
-                    if (count == 1) {
-                        console.log('data: ', data);
-                        this.hform.HEquipID = data[0].hmainid
-                        this.hform.HBarName = data[0].璁惧鍚嶇О
-                        this.hform.HBarSpec = data[0].璁惧瑙勬牸
-                        this.hform.HBarModel = data[0].璁惧鍨嬪彿
-                        this.hform.HQty = 1
+					let {
+						data,
+						count,
+						Message
+					} = res.data;
 
-                        this.enableEdit = false
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: Message
-                        })
-                    }
+					if (count == 1) {
+						this.hform.HEquipID = data[0].hmainid;
+						this.hform.HBarName = data[0].璁惧鍚嶇О;
+						this.hform.HBarSpec = data[0].璁惧瑙勬牸;
+						this.hform.HBarModel = data[0].璁惧鍨嬪彿;
+						this.hform.HBarCode = data[0].璁惧鏉＄爜 || "";
+						this.enableEdit = false;
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: Message
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: err
+					});
+				}
+			},
 
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: err
-                    })
-                }
-            },
-            async GetItemByEquipFile() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Web/GetItemByEquipFile",
-                        data: {
-                            "EquipProjectID": this.hform.HEquipID,
-                            "Type": "DJ",
-                            "HDate": this.hform.HBeginDate
-                        }
-                    })
+			// 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
+			ValidCheck() {
+				if (this.hform.HEquipID == 0) {
+					return {
+						Message: "鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!",
+						state: false
+					}
+				}
+				if (this.hform.HDeptID == 0) {
+					return {
+						Message: "閮ㄩ棬涓嶅緱涓虹┖!",
+						state: false
+					}
+				}
+				if (this.hform.HEmpID == 0) {
+					return {
+						Message: "楠屾敹浜轰笉寰椾负绌�!",
+						state: false
+					}
+				}
+				if (this.hform.HRepairCheckID == 0) {
+					return {
+						Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
+						state: false
+					}
+				}
+				if (this.hform.HManagerID == 0) {
+					return {
+						Message: "璐熻矗浜轰笉寰椾负绌�!",
+						state: false
+					}
+				}
+				// 鏂板锛氱淮淇褰曟牎楠�
+				if (!this.hform.HMainSourceBillNo || this.hform.HMainSourceBillNo.trim() === '') {
+					return {
+						Message: "缁翠慨璁板綍涓嶅緱涓虹┖!",
+						state: false
+					}
+				}
 
-                    let {
-                        data,
-                        Message,
-                        count
-                    } = res.data
-                    if (count == 1) {
-                        this.hform.HEquipDotCheckRuleInterID = data[0].鐐规瑙勭▼ID
-                        this.hform.HEquipDotCheckRuleInterNo = data[0].鐐规瑙勭▼鍗曞彿
-                        this.hform.HPlanNo = data[0].鐐规璁″垝鍗�
-                        this.hform.HPlanInterID = (data[0].鐐规璁″垝ID == null ? 0 : data[0].鐐规璁″垝ID) == "" ? 0 : data[0]
-                            .鐐规璁″垝ID
-                        this.hform.HPlanEntryID = (data[0].鐐规璁″垝瀛怚D == null ? 0 : data[0].鐐规璁″垝瀛怚D) == "" ? 0 : data[
-                            0].鐐规璁″垝瀛怚D
+				return {
+					Message: "",
+					state: true
+				}
+			},
+			addNew() {
+				uni.redirectTo({
+					url: './Sb_EquipRepairCheckBill?operationType=1'
+				})
+			},
+			goBack() {
+				uni.navigateBack()
+			},
+			checkBoxChangeHandler(index, e) {
+				let cr = e.detail.value
+				if (cr.length == 0) {
+					this.HCheckFileList[index]["HDotCheckResult"] = false
+				} else {
+					this.HCheckFileList[index]["HDotCheckResult"] = true
+				}
+			},
+			uploadFile(index) {
+				console.log('filePath: ', this.attachmentInfo[index].filePath);
+				// 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
+				uni.uploadFile({
+					url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
+					filePath: this.attachmentInfo[index].filePath,
+					name: 'file',
+					formData: {
+						HBillNo: this.hform.HBillNo,
+						HRemark: "",
+						HUserName: getUserInfo()["Czymc"]
+					},
+					success: (uploadRes) => {
+						CommonUtils.showTips({
+							message: "涓婁紶鎴愬姛"
+						})
+						this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
+					},
+					fail: (err) => {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: `涓婁紶澶辫触: ${err}`
+						})
+					}
+				})
+			},
+			delFile(index) {
+				console.log('attachmentInfo: ', this.attachmentInfo[index]);
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+					success: (res) => {
+						if (res.confirm) {
+							this.attachmentInfo.splice(index, 1)
+						}
+					},
+				})
 
-                        this.HCheckFileList = Array.from(data).map(item => {
-                            return {
-                                "HDotCheckItemID": item.HDotCheckItemID,
-                                "HDotCheckCode": item.鐐规椤圭洰浠ｇ爜,
-                                "HDotCheckItem": item.鐐规椤圭洰,
-                                "HDotCheckPart": item.鐐规閮ㄤ綅,
-                                "HClaim": item.鍏蜂綋瑕佹眰,
-                                "HManagerID": item.璐熻矗浜篒D,
-                                "HManagerCode": item.璐熻矗浜轰唬鐮�,
-                                "HManagerName": item.璐熻矗浜哄悕绉�,
-                                "HSourceInterID": item.鐐规璁″垝ID == null ? 0 : item.鐐规璁″垝ID,
-                                "HSourceEntryID": item.鐐规璁″垝瀛怚D == null ? 0 : item.鐐规璁″垝瀛怚D,
-                                "HSourceBillNo": item.鐐规璁″垝鍗�,
-                                "HDotCheckItemClassID": 0,
-                                "HDotCheckItemClassName": "",
-                                "HDotCheckItemMethodID": 0,
-                                "HDotCheckItemMethodName": "",
-                                "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
-                            }
-                        })
+			},
+			handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
+				console.log('file: ', res);
+				let fileInfo = res.data[0]
+				this.attachmentInfo.push({
+					fileName: fileInfo.name,
+					size: fileInfo.size,
+					status: '绛夊緟涓婁紶',
+					filePath: fileInfo.tempFilePath
+				})
+			},
+			// 涓婁紶鏂囦欢
+			fileUpload() {
+				this.$refs.XeUpload.upload('file', {});
+			},
+			//鑾峰彇鐝鏁版嵁
+			async getShiftList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Web/GetGy_ShiftsList_Json',
+						data: {
+							Shifts: "",
+						}
+					})
 
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${Message}`
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
-                    })
-                }
-            },
-            radioChange({
-                detail: {
-                    value
-                }
-            }) {
-                this.hform.HCheckResult = value
-            },
-            async getMaxNum() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Web/GetMAXNum",
-                        data: {
-                            "HBillType": this.HBillType
-                        }
-                    })
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HShiftsList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			async getHDeptList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Gy_Department/list',
+						data: {
+							sWhere: ` and HUSEORGID = ${uni.getStorageSync('OrganizationID')}`,
+							user: uni.getStorageSync('HUserName'),
+							Organization: uni.getStorageSync('Organization')
+						}
+					})
 
-                    let {
-                        count,
-                        data,
-                        Message
-                    } = res.data
-                    console.log('data: ', data);
-                    this.hform.HInterID = 0
-                    this.hform.HBillNo = data[0]["HBillNo"]
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
-                    })
-                }
-            },
-            async submit() {
-                let valid = this.ValidCheck()
-                if (!valid.state) {
-                    CommonUtils.showTips({
-                        message: valid.Message
-                    })
-                    return
-                }
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HDeptList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			// 鑾峰彇鑱屽憳鏁版嵁
+			async getEmpList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/PublicPageMethod/UserList',
+						data: {
+							sWhere: " where 1=1",
+						}
+					})
 
-                try {
-                    let oMain = JSON.stringify(this.hform);
-                    let sSubStr = JSON.stringify(this.HBillSub);
-                    let sMainSub = oMain + ';' + sSubStr + ';' + getUserInfo()['Czymc'];
-                    let res = await CommonUtils.doRequest2Sync({
-                        url: "/Sb_EqpRepairWorkBill/SaveGetEqpRepairCheckBillList",
-                        data: {
-                            "msg": sMainSub
-                        },
-                        method: "POST"
-                    })
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HEmpList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			// 鑾峰彇楠岃瘉椤圭洰鏁版嵁
+			async getCheckProjList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Gy_RepairCheck/GetRepairCheckList',
+						data: {
+							sWhere: "",
+							user: uni.getStorageSync('HUserName'),
+						}
+					})
 
-                    if (!res) {
-                        return
-                    }
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HRepairCheckList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			toScanCode() {
+				MpaasScan.scanCode(cb => {
+					this.hform.HBarCode = cb; // 淇锛氬師鏉ユ槸 hfrom 搴旇鏄� hform
+					this.GetMessageByBarCode(cb)
+				})
+			},
+			async GetMessageByBarCode(HBarCode) {
+				try {
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List",
+						data: {
+							HBarCode: HBarCode,
+						},
+					})
 
-                    let {
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        uni.showModal({
-                            title: '鎻愮ず',
-                            content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
-                            success: (res) => {
-                                if (res.confirm) {
-                                    console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-                                    uni.redirectTo({
-                                        url: '/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill?operationType=1'
-                                    })
-                                } else if (res.cancel) {
-                                    console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                                    setTimeout(() => {
-                                        uni.navigateBack();
-                                    }, 50)
-                                }
-                            }
-                        });
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: "鎻愪氦鍗曟嵁澶辫触: " + Message
-                        })
-                    }
+					if (!res) {
+						return
+					}
 
+					let {
+						data,
+						count,
+						Message
+					} = res.data
 
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: "鎻愪氦鍗曟嵁澶辫触: " + err
-                    })
-                }
-            }
-        },
-        onLoad(e) {
-            console.log('e: ', e);
-            if (!e.operationType) {
-                this.operationType = 1
-            } else {
-                this.operationType = e.operationType
-            }
+					if (count == 1) {
+						console.log('data: ', data);
+						this.hform.HEquipID = data[0].hmainid
+						this.hform.HBarName = data[0].璁惧鍚嶇О
+						this.hform.HBarSpec = data[0].璁惧瑙勬牸
+						this.hform.HBarModel = data[0].璁惧鍨嬪彿
+						this.hform.HBarCode = HBarCode;
+						this.hform.HQty = 1
 
-            if (this.operationType == 1) {
-                // 鏂板
-                this.getMaxNum()
-            } else if (this.operationType == 2) {
-                // 澶嶅埗
-            } else if (this.operationType == 3) {
-                // 缂栬緫
+						this.enableEdit = false
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: Message
+						})
+					}
 
-            } else if (this.operationType == 4) {
-                // 娴忚
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: err
+					})
+				}
+			},
+			radioChange({
+				detail: {
+					value
+				}
+			}) {
+				this.hform.HCheckResult = value
+			},
+			async getMaxNum() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Web/GetMAXNum",
+						data: {
+							"HBillType": this.HBillType
+						}
+					})
 
-            }
+					let {
+						count,
+						data,
+						Message
+					} = res.data
+					console.log('data: ', data);
+					this.hform.HInterID = 0
+					this.hform.HBillNo = data[0]["HBillNo"]
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+					})
+				}
+			},
+			async submit() {
+				let valid = this.ValidCheck()
+				if (!valid.state) {
+					CommonUtils.showTips({
+						message: valid.Message
+					})
+					return
+				}
 
-            this.getHDeptList()
-            this.getEmpList()
-            this.getCheckProjList()
-        },
-        onReady() {
-            const query = uni.createSelectorQuery().in(this)
-            query.select("#buttons")
-                .boundingClientRect()
-                .select("#tabs")
-                .boundingClientRect()
-                .exec(res => {
-                    this.btnTop = Math.floor(res[0].top)
-                    this.tabsBottom = Math.ceil(res[1].bottom)
-                })
-        }
-    }
+				try {
+					let oMain = JSON.stringify(this.hform);
+					this.HDetailList[0].HManagerID = this.hform.HManagerID
+					this.HDetailList[0].HRepairCheckID = this.hform.HRepairCheckID
+					let sSubStr = JSON.stringify(this.HDetailList);
+					let sMainSub = oMain + ';' + sSubStr + ';' + getUserInfo()['Czymc'];
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Sb_EqpRepairWorkBill/SaveGetEqpRepairCheckBillList",
+						data: {
+							"msg": sMainSub
+						},
+						method: "POST"
+					})
+
+					if (!res) {
+						return
+					}
+
+					let {
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						uni.showModal({
+							title: '鎻愮ず',
+							content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+							success: (res) => {
+								if (res.confirm) {
+									console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+									uni.redirectTo({
+										url: '/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill?operationType=1'
+									})
+								} else if (res.cancel) {
+									console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+									setTimeout(() => {
+										uni.navigateBack();
+									}, 50)
+								}
+							}
+						});
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+						})
+					}
+
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鎻愪氦鍗曟嵁澶辫触: " + err
+					})
+				}
+			}
+		},
+		onLoad(e) {
+			console.log('e: ', e);
+			if (!e.operationType) {
+				this.operationType = 1
+			} else {
+				this.operationType = e.operationType
+			}
+
+			if (this.operationType == 1) {
+				// 鏂板
+				this.getMaxNum()
+				this.enableEdit = true;
+				this.enableSourceBillEdit = true;
+			} else if (this.operationType == 2) {
+				// 澶嶅埗
+			} else if (this.operationType == 3) {
+				// 缂栬緫
+			} else if (this.operationType == 4) {
+				// 娴忚
+				this.enableEdit = false;
+				this.enableSourceBillEdit = false;
+			}
+
+			this.getHDeptList()
+			this.getEmpList()
+			this.getCheckProjList()
+
+			// 鐩戝惉鍗曟嵁閫夋嫨瀹屾垚浜嬩欢
+			uni.$on('BillSelectComplete', (e) => {
+				console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
+				this.hform.HMainSourceInterID = e.HInterID
+				this.hform.HMainSourceBillNo = e.HBillNo
+				this.hform.HMainSourceEntryID = e.HEntryID
+				this.hform.HMouldRepairWorkID = e.HInterID
+				this.hform.HMouldRepairWorkName = e.HBillNo
+				this.hform.HEquipID = e.HEquipID
+				this.hform.HBarName = e.HEquipName
+				this.hform.HBarSpec = e.HEquipSpec
+				this.hform.HBarModel = e.HEquipModel
+				this.hform.HBarCode = e.HEquipBarCode || ""
+				this.$refs.billList.exit()
+			})
+		},
+		onUnload() {
+			uni.$off('BillSelectComplete')
+		},
+		onReady() {
+			const query = uni.createSelectorQuery().in(this)
+			query.select("#buttons")
+				.boundingClientRect()
+				.select("#tabs")
+				.boundingClientRect()
+				.exec(res => {
+					this.btnTop = Math.floor(res[0].top)
+					this.tabsBottom = Math.ceil(res[1].bottom)
+				})
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-    @import "@/pages/MJGL/style/MJBillStyle.scss"
+	@import "@/pages/MJGL/style/MJBillStyle.scss"
 </style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList.vue b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList.vue
index 174694f..8556fd1 100644
--- a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList.vue
+++ b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList.vue
@@ -144,7 +144,7 @@
                 serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                 tabs: 0,
                 urls: '/Web/GetEquipmentBillsList',
-                MvarReportTitle: '璁惧鐐规璁板綍鍗曠紦瀛�',
+                MvarReportTitle: '璁惧缁翠慨楠屾敹鍗曞垪琛�',
                 hform: {
                     HBillNo: '',
                     HSourceBillNo: '',
@@ -264,9 +264,6 @@
                 if (this.tabs == 0) {
                     this.urls = '/Web/GetEquipmentBillsList'
                 }
-                // if (this.tabs == 1) {
-                // 	this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
-                // }
                 this.search()
             },
             async getList() {
@@ -293,13 +290,13 @@
                     } else {
                         CommonUtils.showTips({
                             title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${Message}`
+                            message: `鑾峰彇璁惧缁翠慨楠屾敹鍗曞け璐�: ${Message}`
                         })
                     }
                 } catch (err) {
                     CommonUtils.showTips({
                         title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${err}`
+                        message: `鑾峰彇璁惧缁翠慨楠屾敹鍗曞け璐�: ${err}`
                     })
                 }
 
@@ -341,41 +338,7 @@
             },
             add() {
                 uni.navigateTo({
-                    url: '/pages/MJGL/Sb_EquipRepariCheckBill/Sb_EquipRepariCheckBill?operationType=1'
-                })
-            },
-            //缂栬緫
-            edit(item) {
-                console.log(item)
-                uni.request({
-                    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
-                    data: {
-                        "HInterID": item.HInterID,
-                        "HBillNo": item.鍗曟嵁鍙�,
-                        "HBillType": this.hform.HBillType
-                    },
-                    success: (res) => {
-                        console.log(1, res);
-                        if (res.data.count == 1) {
-                            uni.navigateTo({
-                                url: './OtherOutBill?OperationType=2&HInterID=' + item.HInterID
-                            })
-                        } else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.hideLoading()
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
+                    url: '/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill?operationType=1'
                 })
             },
             //鍒犻櫎
@@ -418,51 +381,7 @@
                         }
                     }
                 });
-            },
-            //鎾ら攢
-            revoke(item) {
-                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
-                uni.showModal({
-                    title: '鎻愮ず',
-                    content: '鏄惁纭鎾ら攢',
-                    success: (res) => {
-                        if (res.confirm) {
-                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-                            uni.request({
-                                url: this.serverUrl +
-                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
-                                data: {
-                                    HInterID: item.HInterID,
-                                    HBillNo: item.鍗曟嵁鍙�,
-                                    HBillType: this.hform.HBillType,
-                                    HMaker: uni.getStorageSync('HUserName'),
-                                    MvarReportTitle: this.MvarReportTitle,
-                                },
-                                success: (res) => {
-                                    console.log(1, res);
-                                    if (res.data.count == 1) {
-                                        this.clear()
-                                    }
-                                    uni.showToast({
-                                        title: res.data.Message,
-                                        icon: 'none'
-                                    })
-                                },
-                                fail: (res) => {
-                                    console.log(res);
-                                    uni.hideLoading()
-                                    uni.showToast({
-                                        title: '鎺ュ彛璇锋眰澶辫触',
-                                        icon: 'none'
-                                    })
-                                },
-                            });
-                        } else if (res.cancel) {
-                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                        }
-                    }
-                });
-            },
+            }            
         }
     }
 </script>
diff --git a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
index fba70a1..7a5e2fb 100644
--- a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
+++ b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
@@ -2,16 +2,11 @@
     <view>
         <view class="tabs" id="tabs">
             <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
-            <!-- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鏄庣粏淇℃伅</view> -->
             <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
-            <!-- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view> -->
         </view>
         <!-- 鍩烘湰淇℃伅 -->
         <template v-if="tabs == 0">
-            <view class="form" :style="{
-                height: containerHeight + 'px',
-                overflow: 'auto'
-            }">
+            <view class="form" :style="{ height: containerHeight + 'px',overflow: 'auto'}">
                 <view class="form-item">
                     <view class="title">璁惧鏉＄爜:</view>
                     <view :class="enableEdit?'right':'righton'">
@@ -44,6 +39,40 @@
                         <textarea v-model="hform.HRepairContent" placeholder="璇疯緭鍏ラ獙璇佸唴瀹�" />
                     </view>
                 </view>
+				<!-- 婧愬崟绫诲瀷 -->
+				<view class="form-item">
+				    <view class="title">婧愬崟绫诲瀷:</view>
+				    <view class="right" v-show="showHMainSourceBillType">
+				        <picker :range="arrayHMainSourceBillType" @change="HMainSourceBillTypeChange">
+				            <input disabled name="HMainSourceBillType" v-model="HMainSourceBillType" 
+				                   placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+				            <view class="picker-overlay"></view>
+				        </picker>
+				    </view>
+				    <view class="righton" v-show="!showHMainSourceBillType">
+				        <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType" 
+				               placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+				    </view>
+				</view>
+				
+				<!-- 婧愬崟鍗曞彿 -->
+				<view class="form-item">
+				    <view class="title required">婧愬崟鍗曞彿:</view>
+				    <view :class="enableSourceBillEdit?'right':'righton'">
+				        <input v-model="hform.HMainSourceBillNo" :disabled="!enableSourceBillEdit"
+				               @confirm="GetMessageByHMainSourceBillNo(hform.HMainSourceBillNo)" 
+				               placeholder="璇疯緭鍏�(鎴栨壂鎻�)婧愬崟鍗曞彿" />
+				    </view>
+				    <!-- 鏀惧ぇ闀滃浘鏍囷紝褰撴簮鍗曠被鍨嬩笉鏄�"鎵嬪伐褰曞叆"鏃舵樉绀� -->
+				    <view class="icon-wrapper" v-if="hform.HMainSourceBillType != '鎵嬪伐褰曞叆'">
+				        <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+				    </view>
+				    <!-- 鎵弿鍥炬爣 -->
+				    <view class="icon-wrapper">
+				        <uni-icons type="scan" size="20" @click="toScanHMainSourceBillNo"></uni-icons>
+				    </view>
+				</view>
+				
                 <view class="form-item">
                     <view class="title">鍗曟嵁鍙�:</view>
                     <view class="righton">
@@ -75,33 +104,25 @@
                     <view class="title required">缁翠慨閮ㄩ棬:</view>
                     <zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
                         dataValue="HItemID" v-model="hform.HDeptID">
-
                     </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
                 </view>
                 <view class="form-item">
                     <view class="title required">缁翠慨浜�:</view>
                     <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
                         dataValue="HItemID" v-model="hform.HEmpID">
-
                     </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
                 </view>
                 <view class="form-item">
                     <view class="title required">缁翠慨椤圭洰:</view>
                     <zxz-uni-data-select required class="right" :localdata="HRepairList" dataKey="缁翠慨椤圭洰"
                         dataValue="hitemid" v-model="hform.HRepairID">
-
                     </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
                 </view>
                 <view class="form-item">
                     <view class="title required">璐熻矗浜�:</view>
                     <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
                         dataValue="HItemID" v-model="hform.HManagerID">
-
                     </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
                 </view>
                 <view class="form-item">
                     <view class="title">璁惧鍚嶇О:</view>
@@ -201,6 +222,10 @@
             <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
         </view>
         <!-- <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload> -->
+        <!-- 婧愬崟鍗曟嵁鍒楄〃寮圭獥 -->
+        <BillListPopupEquipConkBookBillVue ref="billList" :HBillType="hform.HBillType"
+            :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
+        </BillListPopupEquipConkBookBillVue>
     </view>
 </template>
 
@@ -215,13 +240,19 @@
     import {
         getUserInfo
     } from "../../../utils/auth";
+    // 寮曞叆婧愬崟鍗曟嵁鍒楄〃寮圭獥缁勪欢
+    import BillListPopupEquipConkBookBillVue from '../../../components/BillListPopup/BillListPopupEquipConkBookBill.vue';
+
     export default {
         // 璁惧缁翠慨娲惧伐鍗�
         name: 'Sb_EquipRepairSendWorkBill',
+        components: {
+            BillListPopupEquipConkBookBillVue
+        },
         data() {
             return {
                 tabs: 0,
-                HMainSourceBillType: "",
+                HMainSourceBillType: "", // 鐢ㄤ簬鏄剧ず鐨勬簮鍗曠被鍨�
                 btnTop: 0,
                 tabsBottom: 0,
                 HModName: "Sb_EquipRepairSendWorkBill",
@@ -229,6 +260,12 @@
                 operationType: 1,
                 uploadOptions: {},
                 enableEdit: true,
+                enableSourceBillEdit: true, // 淇锛氭坊鍔犺繖涓睘鎬�
+
+                // 婧愬崟绫诲瀷鐩稿叧
+                arrayHMainSourceBillType: ['璁惧缁翠慨鐧昏鍗�', '鎵嬪伐褰曞叆'], // 鍙�夌殑婧愬崟绫诲瀷
+                arrayHMainSourceBillTypeID: ['璁惧缁翠慨鐧昏鍗�', '鎵嬪伐褰曞叆'], // 瀵瑰簲鐨勫崟鎹被鍨婭D
+                showHMainSourceBillType: true,
 
                 HDeptList: [],
                 HRepairCheckList: [],
@@ -242,12 +279,12 @@
                     HDate: dayjs(new Date()).format("YYYY-MM-DD"),
                     HInnerBillNo: '',
                     HRepairContent: '',
-                    HDeptIDName: '',
-                    HDeptID: 0,
-                    HEmpIDName: '',
-                    HEmpID: 0,
-                    HManagerIDName: '',
-                    HManagerID: 0,
+                    HDeptName: getUserInfo().HDeptName,
+                    HDeptID: getUserInfo().HDeptID,
+                    HEmpName: getUserInfo().HEmpName,
+                    HEmpID: getUserInfo().HEmpID,
+                    HManagerName: getUserInfo().HManagerName,
+                    HManagerID: getUserInfo().HManagerID,
                     HEquipIDName: '',
                     HEquipID: 0,
                     HRepairIDName: '',
@@ -255,7 +292,7 @@
                     HRepairPlanBeginDate: dayjs(new Date()).format("YYYY-MM-DD"),
                     HRepairPlanEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
                     HCycleUnit: '灏忔椂',
-                    HPlanTimes: '',
+                    HPlanTimes: '0',
                     HExplanation: '',
                     HRemark: '',
                     HMaker: getUserInfo()["Czymc"],
@@ -267,7 +304,13 @@
                     HCloseDate: '',
                     HUpDateDate: '',
                     HDeleteMan: '',
-                    HDeleteDate: ''
+                    HDeleteDate: '',
+                    // 鏂板鐨勬簮鍗曠浉鍏冲瓧娈�
+                    HMainSourceBillType: '璁惧缁翠慨鐧昏鍗�', // 榛樿涓鸿澶囩淮淇櫥璁板崟
+                    HMainSourceBillNo: '',
+                    HMainSourceInterID: 0,
+                    HMainSourceEntryID: 0,
+                    HStockOrgID: uni.getStorageSync("OrganizationID"), // 鏂板搴撳瓨缁勭粐ID
                 },
                 HDetailList: [{ // 鍚庣鎺ュ彛鎻愪氦闇�瑕� 鏄庣粏淇℃伅
                     "瀛愮淮淇」鐩�": "",
@@ -289,6 +332,168 @@
             },
         },
         methods: {
+            // 鏄剧ず婧愬崟鍗曟嵁鍒楄〃寮圭獥
+            showBillList() {
+                if (this.hform.HMainSourceBillType === '鎵嬪伐褰曞叆') {
+                    CommonUtils.showTips({
+                        title: '鎻愮ず',
+                        message: '鎵嬪伐褰曞叆妯″紡涓嬩笉鑳介�夋嫨婧愬崟'
+                    });
+                    return;
+                }
+                this.$refs.billList.showPopup();
+            },
+
+            // 閫夋嫨婧愬崟绫诲瀷
+            HMainSourceBillTypeChange(e) {
+                if (e.detail.value == -1 || e.detail.value == NaN) {
+                    this.HMainSourceBillType = '鎵嬪伐褰曞叆';
+                    this.hform.HMainSourceBillType = '鎵嬪伐褰曞叆';
+                    return;
+                }
+
+                this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value];
+                this.hform.HMainSourceBillType = this.arrayHMainSourceBillTypeID[e.detail.value];
+
+                // 濡傛灉鏄墜宸ュ綍鍏ワ紝娓呯┖婧愬崟淇℃伅
+                if (this.hform.HMainSourceBillType === '鎵嬪伐褰曞叆') {
+                    this.hform.HMainSourceBillNo = '';
+                    this.hform.HMainSourceInterID = 0;
+                    this.hform.HMainSourceEntryID = 0;
+                    this.enableSourceBillEdit = false; // 鎵嬪伐褰曞叆鏃剁鐢ㄦ簮鍗曞崟鍙风紪杈�
+                } else {
+                    this.enableSourceBillEdit = true; // 闈炴墜宸ュ綍鍏ユ椂鍙紪杈�
+                }
+
+                // 缂撳瓨褰撳墠椤甸潰閫夋嫨
+                const pages = getCurrentPages();
+                const currentPage = pages[pages.length - 1];
+                uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
+                    HSourceBillTypeName: this.HMainSourceBillType,
+                    HSourceBillType: this.hform.HMainSourceBillType
+                });
+            },
+
+            // 璇诲彇缂撳瓨
+            loadCache() {
+                const pages = getCurrentPages();
+                const currentPage = pages[pages.length - 1];
+                let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`);
+                if (HBillTypeCache) {
+                    this.HMainSourceBillType = HBillTypeCache.HSourceBillTypeName;
+                    this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType;
+                    
+                    // 鏍规嵁缂撳瓨鐨勬簮鍗曠被鍨嬭缃紪杈戠姸鎬�
+                    if (this.hform.HMainSourceBillType === '鎵嬪伐褰曞叆') {
+                        this.enableSourceBillEdit = false;
+                    } else {
+                        this.enableSourceBillEdit = true;
+                    }
+                }
+            },
+
+            // 鎵弿婧愬崟鍗曞彿
+            toScanHMainSourceBillNo() {
+                MpaasScan.scanCode(cb => {
+                    this.hform.HMainSourceBillNo = cb;
+                    this.GetMessageByHMainSourceBillNo(cb);
+                });
+            },
+
+            // 鏍规嵁婧愬崟鍗曞彿鑾峰彇淇℃伅
+            async GetMessageByHMainSourceBillNo(HSouceBillNo) {
+                try {
+                    let url, dataField;
+                    
+                    // 鏍规嵁婧愬崟绫诲瀷閫夋嫨涓嶅悓鐨勬帴鍙�
+                    if (this.hform.HMainSourceBillType === '璁惧缁翠慨鐧昏鍗�') {
+                        url = "/Sb_EqpRepairWorkBill/GetEqpConkBookBillListPage";
+                        dataField = {
+                            sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
+                            user: getUserInfo()["Czymc"],
+                            page: 1,
+                            size: 1,
+                        };
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鏆備笉鏀寔璇ユ簮鍗曠被鍨嬶細${this.hform.HMainSourceBillType}`
+                        });
+                        return;
+                    }
+
+                    let res = await CommonUtils.doRequest2Async({
+                        url: url,
+                        data: dataField
+                    });
+
+                    let { count, Message, data } = res.data;
+                    if (count == 1) {
+                        this.hform.HMainSourceBillNo = data[0]["鍗曟嵁鍙�"];
+                        this.hform.HMainSourceInterID = data[0]["hmainid"];
+                        this.hform.HMainSourceEntryID = data[0]["hsubid"];
+                        
+                        // 濡傛灉婧愬崟鏈夎澶囦俊鎭紝鍙互鑷姩濉厖
+                        if (data[0].HEquipID) {
+                            this.hform.HEquipID = data[0].HEquipID;
+                            this.getEquipFileMain(data[0].HEquipID);
+                        }
+
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鑾峰彇婧愬崟鍗曞彿澶辫触: ${Message}`
+                        });
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鑾峰彇婧愬崟鍗曞彿澶辫触: ${err}`
+                    });
+                }
+            },
+
+            // 鏍规嵁璁惧ID鑾峰彇璁惧淇℃伅
+            async getEquipFileMain(HInterID) {
+                try {
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_ListByHEquipID",
+                        data: {
+                            HEquipID: HInterID,
+                        },
+                    });
+
+                    if (!res) {
+                        return;
+                    }
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data;
+
+                    if (count == 1) {
+                        this.hform.HEquipID = data[0].hmainid;
+                        this.hform.HBarName = data[0].璁惧鍚嶇О;
+                        this.hform.HBarSpec = data[0].璁惧瑙勬牸;
+                        this.hform.HBarModel = data[0].璁惧鍨嬪彿;
+                        this.hform.HBarCode = data[0].璁惧鏉＄爜 || "";
+                        this.enableEdit = false;
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: Message
+                        });
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: err
+                    });
+                }
+            },
+
             // 缁翠慨椤圭洰
             async getRepairList() {
                 try{ 
@@ -336,13 +541,13 @@
                 }
                 if (this.hform.HEmpID == 0) {
                     return {
-                        Message: "楠屾敹浜轰笉寰椾负绌�!",
+                        Message: "缁翠慨浜轰笉寰椾负绌�!",
                         state: false
                     }
                 }
-                if (this.hform.HRepairCheckMainID == 0) {
+                if (this.hform.HRepairID == 0) {
                     return {
-                        Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
+                        Message: "缁翠慨椤圭洰涓嶅緱涓虹┖!",
                         state: false
                     }
                 }
@@ -350,6 +555,15 @@
                     return {
                         Message: "璐熻矗浜轰笉寰椾负绌�!",
                         state: false
+                    }
+                }
+                // 娣诲姞婧愬崟鏍￠獙锛堝鏋滀笉鏄墜宸ュ綍鍏ワ紝鍒欏繀椤婚�夋嫨婧愬崟锛�
+                if (this.hform.HMainSourceBillType !== '鎵嬪伐褰曞叆') {
+                    if (!this.hform.HMainSourceBillNo || this.hform.HMainSourceBillNo.trim() === '') {
+                        return {
+                            Message: "婧愬崟绫诲瀷闈炴墜宸ュ綍鍏ワ紝蹇呴』閫夋嫨婧愬崟锛�",
+                            state: false
+                        }
                     }
                 }
 
@@ -552,7 +766,7 @@
             },
             toScanCode() {
                 MpaasScan.scanCode(cb => {
-                    this.hfrom.HBarCode = cb
+                    this.hform.HBarCode = cb; // 淇锛氬師鏉ユ槸 hfrom 搴旇鏄� hform
                     this.GetMessageByBarCode(cb)
                 })
             },
@@ -564,7 +778,6 @@
                             HBarCode: HBarCode,
                         },
                     })
-
 
                     if (!res) {
                         return
@@ -582,6 +795,7 @@
                         this.hform.HBarName = data[0].璁惧鍚嶇О
                         this.hform.HBarSpec = data[0].璁惧瑙勬牸
                         this.hform.HBarModel = data[0].璁惧鍨嬪彿
+                        this.hform.HBarCode = HBarCode; // 纭繚鏉＄爜姝ｇ‘鏄剧ず
                         this.hform.HQty = 1
 
                         this.enableEdit = false
@@ -598,66 +812,7 @@
                         message: err
                     })
                 }
-            },
-            async GetItemByEquipFile() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Web/GetItemByEquipFile",
-                        data: {
-                            "EquipProjectID": this.hform.HEquipID,
-                            "Type": "DJ",
-                            "HDate": this.hform.HBeginDate
-                        }
-                    })
-
-                    let {
-                        data,
-                        Message,
-                        count
-                    } = res.data
-                    if (count == 1) {
-                        this.hform.HEquipDotCheckRuleInterID = data[0].鐐规瑙勭▼ID
-                        this.hform.HEquipDotCheckRuleInterNo = data[0].鐐规瑙勭▼鍗曞彿
-                        this.hform.HPlanNo = data[0].鐐规璁″垝鍗�
-                        this.hform.HPlanInterID = (data[0].鐐规璁″垝ID == null ? 0 : data[0].鐐规璁″垝ID) == "" ? 0 : data[0]
-                            .鐐规璁″垝ID
-                        this.hform.HPlanEntryID = (data[0].鐐规璁″垝瀛怚D == null ? 0 : data[0].鐐规璁″垝瀛怚D) == "" ? 0 : data[
-                            0].鐐规璁″垝瀛怚D
-
-                        this.HCheckFileList = Array.from(data).map(item => {
-                            return {
-                                "HDotCheckItemID": item.HDotCheckItemID,
-                                "HDotCheckCode": item.鐐规椤圭洰浠ｇ爜,
-                                "HDotCheckItem": item.鐐规椤圭洰,
-                                "HDotCheckPart": item.鐐规閮ㄤ綅,
-                                "HClaim": item.鍏蜂綋瑕佹眰,
-                                "HManagerID": item.璐熻矗浜篒D,
-                                "HManagerCode": item.璐熻矗浜轰唬鐮�,
-                                "HManagerName": item.璐熻矗浜哄悕绉�,
-                                "HSourceInterID": item.鐐规璁″垝ID == null ? 0 : item.鐐规璁″垝ID,
-                                "HSourceEntryID": item.鐐规璁″垝瀛怚D == null ? 0 : item.鐐规璁″垝瀛怚D,
-                                "HSourceBillNo": item.鐐规璁″垝鍗�,
-                                "HDotCheckItemClassID": 0,
-                                "HDotCheckItemClassName": "",
-                                "HDotCheckItemMethodID": 0,
-                                "HDotCheckItemMethodName": "",
-                                "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
-                            }
-                        })
-
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${Message}`
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
-                    })
-                }
-            },
+            },          
             radioChange({
                 detail: {
                     value
@@ -746,7 +901,6 @@
                         })
                     }
 
-
                 } catch (err) {
                     CommonUtils.showTips({
                         title: "娓╅Θ鎻愮ず",
@@ -770,16 +924,35 @@
                 // 澶嶅埗
             } else if (this.operationType == 3) {
                 // 缂栬緫
-
             } else if (this.operationType == 4) {
                 // 娴忚
-
+                this.enableEdit = false;
+                this.enableSourceBillEdit = false;
+                this.showHMainSourceBillType = false;
             }
 
             this.getHDeptList()
             this.getEmpList()
             this.getCheckProjList()
             this.getRepairList()
+            this.loadCache()
+
+            // 鐩戝惉鍗曟嵁閫夋嫨瀹屾垚浜嬩欢
+            uni.$on('BillSelectComplete', (e) => {
+                console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
+                this.hform.HMainSourceInterID = e.HInterID
+                this.hform.HMainSourceBillNo = e.HBillNo
+                this.hform.HMainSourceEntryID = e.HEntryID
+                this.hform.HEquipID = e.HEquipID
+                this.hform.HBarName = e.HEquipName
+                this.hform.HBarSpec = e.HEquipSpec
+                this.hform.HBarModel = e.HEquipModel
+                this.hform.HBarCode = e.HEquipBarCode || ""
+                this.$refs.billList.exit()
+            })
+        },
+        onUnload() {
+            uni.$off('BillSelectComplete')
         },
         onReady() {
             const query = uni.createSelectorQuery().in(this)
@@ -796,5 +969,14 @@
 </script>
 
 <style lang="scss" scoped>
-    @import "@/pages/MJGL/style/MJBillStyle.scss"
+    @import "@/pages/MJGL/style/MJBillStyle.scss";
+    
+    .picker-overlay {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        z-index: 1;
+    }
 </style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList.vue b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList.vue
index 3dec3c5..13224f5 100644
--- a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList.vue
+++ b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList.vue
@@ -150,7 +150,7 @@
                 serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                 tabs: 0,
                 urls: '/Web/GetEquipmentBillsList',
-                MvarReportTitle: '璁惧缁翠慨娲惧伐鍗曠紦瀛�',
+                MvarReportTitle: '璁惧缁翠慨娲惧伐鍗曞垪琛�',
                 hform: {
                     HBillNo: '',
                     HSourceBillNo: '',
diff --git a/pages/MJGL/Sb_EquipResumeCheckQuery/Sb_EquipResumeCheckQuery.vue b/pages/MJGL/Sb_EquipResumeCheckQuery/Sb_EquipResumeCheckQuery.vue
new file mode 100644
index 0000000..e91db0f
--- /dev/null
+++ b/pages/MJGL/Sb_EquipResumeCheckQuery/Sb_EquipResumeCheckQuery.vue
@@ -0,0 +1,213 @@
+<template>
+    <view class="content">
+        <view id="divide" style="width: 100%;height: 0rpx;background-color: #e5e5e5;"></view>
+        <view :style="{
+            height: calcContentHeight + 'px',
+            overflowY: 'auto'
+        }">
+            <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+                <uni-card :title="item.鍗曟嵁鍙�" style="margin: 10px;">
+                    <view class="card-detail">
+                        <template v-for="(field, index)  in CommonUtils.emptyValueFilter(item, HFieldList)">
+                            <view v-if="field.ColmType == 'DateTime'" class="detail">
+                                <text>{{field.ColmCols}}锛�</text>{{dayjs(item[field.ColmCols]).format("YYYY-MM-DD HH:mm:ss")}}
+                            </view>
+                            <view v-else class="detail">
+                                <text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
+                            </view>
+                        </template>
+                    </view>
+                </uni-card>
+            </view>
+        </view>
+        <view class="pagination-zone" id="pagination-zone">
+            <uni-pagination show-icon :page-size="size" :total="dataLength" :current="page"
+                @change="onPaginationChangeHandler"></uni-pagination>
+        </view>
+        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+    </view>
+</template>
+
+<script>
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import BarCodePopupVue from "@/components/BarCodePopup/BarCodePopup.vue";
+    import {
+        CommonUtils
+    } from "../../../utils/common";
+    import dayjs from "dayjs";
+    export default {
+        data() {
+            return {
+                dayjs,
+                CommonUtils,
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                tabs: 0,
+                urls: '/Gy_EquipFileMain/GetResumeList',
+                MvarReportTitle: '璁惧灞ュ巻',
+                hform: {
+                    HInterID: 0,
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    operationType: "4",
+                    sWhere: "",
+                },
+                sWhere: '',
+                listData: [],
+                showList: [],
+                HFieldList: [], // 瀛楁鍒楄〃
+                showDetail: -1,
+                operations: -1,
+
+                page: 1,
+                size: 20,
+                dataLength: 0,
+                divideBottom: 0,
+                paginationTop: 0,
+                showmore: false,
+            }
+        },
+        computed: {
+            calcContentHeight: {
+                get() {
+                    return this.paginationTop - this.divideBottom
+                }
+            }
+        },
+        onShow() {
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            this.changeTab(0)
+            console.log(this.userInfo, uni.getStorageSync('HUserName'))
+        },
+        components: {
+            BarCodePopupVue
+        },
+        onReady() {
+            this.getCalcHeight()
+        },
+        methods: {
+            changeShowMore() {
+                this.showmore = !this.showmore
+                this.$nextTick(() => {
+                    // 閲嶆柊璁＄畻鍐呭瑙嗗彛楂樺害
+                    this.getCalcHeight()
+                })
+            },
+            getCalcHeight() {
+                let query = uni.createSelectorQuery().in(this)
+                query
+                    .select("#divide")
+                    .boundingClientRect()
+                    .select("#pagination-zone")
+                    .boundingClientRect()
+                    .exec(res => {
+                        this.divideBottom = Math.ceil(res[0].bottom)
+                        this.paginationTop = Math.floor(res[1].top)
+                    })
+            },
+            async qrCodeDisplay(item) {
+                this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+                await this.$nextTick()
+                this.$refs.barcodePopup.open()
+            },
+            onPaginationChangeHandler({
+                current
+            }) {
+                this.page = current
+                this.showList = this.getPage(current, this.size, this.listData)
+            },
+            getPage(page, size, list) {
+                let sindex = (parseInt(page) - 1) * size
+                let eindex = parseInt(page) * size
+                let newList = list.slice(sindex, eindex)
+                return newList
+            },
+            changeTab(e) {
+                this.tabs = e
+                this.page = 1
+                this.showList = []
+
+                if (this.tabs == 0) {
+                    this.urls = '/Gy_EquipFileMain/GetResumeList'
+                }
+                // if (this.tabs == 1) {
+                // 	this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+                // }
+                this.search()
+            },
+            async getList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: this.urls,
+                        data: this.hform
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message,
+                        list
+                    } = res.data
+
+                    if (count == 1) {
+                        if (data == null) {
+                            data = []
+                        }
+                        this.listData = data
+                        console.log('data: ', data);
+                        this.showList = this.getPage(this.page, this.size, data)
+                        this.dataLength = data.length
+                        this.HFieldList = CommonUtils.fieldListFilterRole({
+                            FieldList: list,
+                            ExcludeKeys: ["鍗曟嵁鍙�"]
+                        }).data
+
+                        console.log('this.HFieldList: ', this.HFieldList);
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鑾峰彇璁惧灞ュ巻澶辫触: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鑾峰彇璁惧灞ュ巻澶辫触: ${err}`
+                    })
+                }
+
+            },
+            search() {
+                this.hform.sWhere = ''
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                this.hform.sWhere = {
+                    Type: this.hform.Type,
+                    HInterId: this.hform.HInterId
+                }
+
+                this.getList()
+            },
+        },
+        onLoad(e) {
+            let {
+                operationType,
+                HEquipID
+            } = e
+
+            if (operationType == 4) {
+                this.HInterID = HEquipID
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJListStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipStop/Sb_EquipStopBill.vue b/pages/MJGL/Sb_EquipStop/Sb_EquipStopBill.vue
new file mode 100644
index 0000000..c19cc6b
--- /dev/null
+++ b/pages/MJGL/Sb_EquipStop/Sb_EquipStopBill.vue
@@ -0,0 +1,480 @@
+<template>
+    <view>
+        <view class="tabs" id="tabs">
+            <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+            <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
+        </view>
+        <!-- 鍩烘湰淇℃伅 -->
+        <template v-if="tabs == 0">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HBillNo" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鏃ユ湡:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title required">璁惧:</view>
+                    <!--                    <zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
+                        dataValue="HItemID" v-model="hform.HEquipName">
+
+                    </zxz-uni-data-select> -->
+                    <view class="righton">
+                        <input disabled v-model="hform.HEquipName" placeholder="" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title required">鍏宠仈涓昏澶�:</view>
+                    <!--                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+                        dataValue="HItemID" v-model="hform.HEquipRelationName">
+
+                    </zxz-uni-data-select> -->
+                    <view class="righton">
+                        <input disabled v-model="hform.HEquipRelationName" placeholder="" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title required">鍋滄満浜�:</view>
+                    <!--                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+                        dataValue="HItemID" v-model="hform.HBeginEmpName">
+
+                    </zxz-uni-data-select> -->
+                    <view class="righton">
+                        <input disabled v-model="hform.HStopEmpName" placeholder="" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍋滄満鏃堕棿:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HStopTime" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍋滄満鍘熷洜:</view>
+                    <view class="right">
+                        <textarea v-model="hform.HStopReason" placeholder="璇疯緭鍏ュ仠鏈哄師鍥�" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">澶囨敞:</view>
+                    <view class="right">
+                        <textarea v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+                    </view>
+                </view>
+            </view>
+        </template>
+
+        <!-- 鍏朵粬淇℃伅 -->
+        <template v-if="tabs == 2">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form-item">
+                    <view class="title">鍒涘缓浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMaker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍒涘缓鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMakeDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇敼浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HUpDater" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇敼鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HUpDateDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹℃牳浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HChecker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹℃牳鏃堕棿:</view>
+                    <view class="righton">
+                        <input v-model="hform.HCheckDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浣滃簾浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HDeleteMan" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浣滃簾鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HDeleteDate" />
+                    </view>
+                </view>
+            </view>
+
+        </template>
+        <!-- 鎿嶄綔鎸夐挳 -->
+        <view class="buttons" id="buttons">
+            <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+            <view style="flex: 1;"></view>
+            <!-- <button class="btn-a" size="mini" @tap="addNew">鏂板</button> -->
+            <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+        </view>
+        <!-- <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload> -->
+    </view>
+</template>
+
+<script>
+    import dayjs from "dayjs";
+    import {
+        CommonUtils
+    } from "@/utils/common";
+    import {
+        MpaasScan
+    } from "@/utils/mpaasScan.js"
+    import {
+        getUserInfo
+    } from "../../../utils/auth";
+    export default {
+        // 璁惧鍋滄満鍗�
+        name: 'Sb_EquipBeginBill',
+        data() {
+            return {
+                tabs: 0,
+                HMainSourceBillType: "",
+                btnTop: 0,
+                tabsBottom: 0,
+                HModName: "Sb_EquipStopBillMain",
+                HBillType: '3918',
+                operationType: 1,
+                uploadOptions: {},
+                enableEdit: true,
+
+                HDeptList: [],
+                HRepairCheckList: [],
+                HEmpList: [],
+                HRepairList: [],
+
+                hform: {
+                    "HBillNo": "",
+                    "HInterID": "0",
+                    "HDate": dayjs(new Date()).format("YYYY-MM-DD"),
+                    "HEquipName": "",
+                    "HEquipID": "0",
+                    "HEquipRelationName": "",
+                    "HEquipRelationID": "0",
+                    "HStopEmpName": getUserInfo()["HEmpName"],
+                    "HStopEmpID": getUserInfo()["HEmpID"],
+                    "HStopTime": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+                    "HRemark": "",
+                    "HStopReason": "",
+                    HMaker: getUserInfo()["Czymc"],
+                    HChecker: '',
+                    HCloseMan: '',
+                    HUpDater: '',
+                    HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                    HCheckDate: '',
+                    HCloseDate: '',
+                    HUpDateDate: '',
+                    HDeleteMan: '',
+                    HDeleteDate: ''
+                },
+            };
+        },
+        computed: {
+            containerHeight: {
+                get() {
+                    return this.btnTop - this.tabsBottom - 5
+                }
+            },
+        },
+        methods: {
+            // 缁翠慨椤圭洰
+            async getRepairList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Gy_Repair/GetRepairList',
+                        data: {
+                            sWhere: '',
+                            user: getUserInfo()["Czymc"]
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HRepairList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鑾峰彇妫�楠岄」鐩け璐�: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鑾峰彇妫�楠岄」鐩け璐�: ${err}`
+                    })
+                }
+            },
+            // 鍒犻櫎鏄庣粏
+            delDetail(item) {
+
+            },
+            // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
+            ValidCheck() {
+                if (this.hform.HEquipID == 0) {
+                    return {
+                        Message: "鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!",
+                        state: false
+                    }
+                }
+
+                if (this.hform.HEmpID == 0) {
+                    return {
+                        Message: "楠屾敹浜轰笉寰椾负绌�!",
+                        state: false
+                    }
+                }
+
+                return {
+                    Message: "",
+                    state: true
+                }
+            },
+            addNew() {
+                uni.redirectTo({
+                    url: './Sb_EquipRepairSendWorkBill?operationType=1'
+                })
+            },
+            goBack() {
+                uni.navigateBack()
+            },
+            checkBoxChangeHandler(index, e) {
+                let cr = e.detail.value
+                if (cr.length == 0) {
+                    this.HCheckFileList[index]["HDotCheckResult"] = false
+                } else {
+                    this.HCheckFileList[index]["HDotCheckResult"] = true
+                }
+            },
+            radioChange({
+                detail: {
+                    value
+                }
+            }) {
+                this.hform.HCheckResult = value
+            },
+            async getMaxNum() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Web/GetMAXNum",
+                        data: {
+                            "HBillType": this.HBillType
+                        }
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message
+                    } = res.data
+                    console.log('data: ', data);
+                    this.hform.HInterID = data[0]["HInterID"]
+                    this.hform.HBillNo = data[0]["HBillNo"]
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+                    })
+                }
+            },
+            async set_CheckBill(HInterID, num) {
+                try{
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Sb_EquipStopBill/AuditSb_EquipStopBill",
+                        data: {
+                            HInterID: HInterID,
+                            type: num,
+                            user: getUserInfo()['Czymc']
+                        }
+                    })
+                    
+                    if(res.count == 1) {
+                        return
+                    }else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: "璁惧寮�鏈哄崟瀹℃牳澶辫触: " + res.Message
+                        })
+                    }
+                }catch(err){
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "璁惧寮�鏈哄崟瀹℃牳澶辫触: " + err
+                    })
+                }
+            },
+            async submit() {
+                let valid = this.ValidCheck()
+                if (!valid.state) {
+                    CommonUtils.showTips({
+                        message: valid.Message
+                    })
+                    return
+                }
+
+                try {
+                    let oMain = JSON.stringify(this.hform);
+                    let sMainSub = oMain + ';Add' + `;${getUserInfo()['Czymc']}`;
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: "/Sb_EquipStopBill/Save锘縎b_EquipStopBillMain",
+                        data: {
+                            "sMainSub": sMainSub
+                        },
+                        method: "POST"
+                    })
+
+                    if (!res) {
+                        return
+                    }
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        if (data.Verify == "Y") { //鑷姩瀹℃牳
+                            set_checkBill(data.HInterID, 1)
+                        }
+
+                        uni.showModal({
+                            title: '鎻愮ず',
+                            content: res.data.Message + '杩斿洖涓婄骇椤甸潰',
+                            showCancel: false,
+                            success: (res) => {
+                                if (res.confirm) {
+                                    setTimeout(() => {
+                                        uni.navigateBack();
+                                    }, 50)
+                                } else if (res.cancel) {
+                                    setTimeout(() => {
+                                        uni.navigateBack();
+                                    }, 50)
+                                }
+                            }
+                        });
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+                        })
+                    }
+
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "鎻愪氦鍗曟嵁澶辫触: " + err
+                    })
+                }
+            },
+            async getEquipInfo() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Gy_EquipFileMain/getSb_EquipList",
+                        data: {
+                            HInterID: this.hform.HEquipID,
+                            user: getUserInfo()['Czymc']
+                        }
+                    })
+
+                    let {
+                        data,
+                        Message,
+                        count
+                    } = res.data
+
+                    if (count == 1) {
+                        console.log('data: ', data);
+
+                        this.hform.HEquipID = data[0].hmainid
+                        this.hform.HEquipName = data[0].璁惧鍚嶇О
+                        this.hform.HEquipRelationID = data[0].HMainSourceID
+                        this.hform.HEquipRelationName = data[0].鎵�灞炰富鐢熶骇璁惧
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: "鑾峰彇璁惧淇℃伅澶辫触: " + Message
+                        })
+                    }
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "鑾峰彇璁惧淇℃伅澶辫触: " + err
+                    })
+                }
+            }
+        },
+        onLoad(e) {
+            console.log('e: ', e);
+            if (!e.operationType) {
+                this.operationType = 1
+            } else {
+                this.operationType = e.operationType
+            }
+
+            if (this.operationType == 1) {
+                this.hform.HEquipID = e.HEquipID
+                // 鏂板
+                this.getMaxNum()
+                this.getEquipInfo()
+            } else if (this.operationType == 2) {
+                // 澶嶅埗
+            } else if (this.operationType == 3) {
+                // 缂栬緫
+
+            } else if (this.operationType == 4) {
+                // 娴忚
+
+            }
+        },
+        onReady() {
+            const query = uni.createSelectorQuery().in(this)
+            query.select("#buttons")
+                .boundingClientRect()
+                .select("#tabs")
+                .boundingClientRect()
+                .exec(res => {
+                    this.btnTop = Math.floor(res[0].top)
+                    this.tabsBottom = Math.ceil(res[1].bottom)
+                })
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJBillStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sc_EquipmentProcessList/Sc_EquipmentProcess.vue b/pages/MJGL/Sc_EquipmentProcessList/Sc_EquipmentProcess.vue
new file mode 100644
index 0000000..5875786
--- /dev/null
+++ b/pages/MJGL/Sc_EquipmentProcessList/Sc_EquipmentProcess.vue
@@ -0,0 +1,221 @@
+<template>
+    <view class="content">
+        <view id="divide" style="width: 100%;height: 0rpx;background-color: #e5e5e5;"></view>
+        <view :style="{
+            height: calcContentHeight + 'px',
+            overflowY: 'auto'
+        }">
+            <view class="list" v-for="(item,index) in showList" :key="index" v-if="showList.length>0">
+                <uni-card style="margin: 10px;">
+                    <view class="card-detail">
+                        <template v-for="(field, index)  in CommonUtils.emptyValueFilter(item, HFieldList)">
+                            <view v-if="field.ColmType == 'DateTime'" class="detail">
+                                <text>{{field.ColmCols}}锛�</text>{{dayjs(item[field.ColmCols]).format("YYYY-MM-DD HH:mm:ss")}}
+                            </view>
+                            <view v-else class="detail">
+                                <text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
+                            </view>
+                        </template>
+                    </view>
+                </uni-card>
+            </view>
+            <view class="over" v-if="showList.length == 0">鏆傛棤鏁版嵁</view>
+        </view>
+        <view class="pagination-zone" id="pagination-zone">
+            <uni-pagination show-icon :page-size="size" :total="dataLength" :current="page"
+                @change="onPaginationChangeHandler"></uni-pagination>
+        </view>
+        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+    </view>
+</template>
+
+<script>
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import BarCodePopupVue from "@/components/BarCodePopup/BarCodePopup.vue";
+    import {
+        CommonUtils
+    } from "../../../utils/common";
+    import dayjs from "dayjs";
+    export default {
+        data() {
+            return {
+                dayjs,
+                CommonUtils,
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                tabs: 0,
+                urls: '/Sc_HEquipStateDistribution/Get_EquipICMOTechParamList_Json',
+                MvarReportTitle: '璁惧宸ヨ壓',
+                hform: {
+                    HInterID: 0,
+                    HICMOInterID: 0,
+                    HICMOEntryID: 0,
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    operationType: "4",
+                    sWhere: "",
+                },
+                sWhere: '',
+                listData: [],
+                showList: [],
+                HFieldList: [], // 瀛楁鍒楄〃
+                showDetail: -1,
+                operations: -1,
+
+                page: 1,
+                size: 20,
+                dataLength: 0,
+                divideBottom: 0,
+                paginationTop: 0,
+                showmore: false,
+            }
+        },
+        computed: {
+            calcContentHeight: {
+                get() {
+                    return this.paginationTop - this.divideBottom
+                }
+            }
+        },
+        onShow() {
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            // this.changeTab(0)
+            console.log(this.userInfo, uni.getStorageSync('HUserName'))
+        },
+        components: {
+            BarCodePopupVue
+        },
+        onReady() {
+            this.getCalcHeight()
+        },
+        methods: {
+            changeShowMore() {
+                this.showmore = !this.showmore
+                this.$nextTick(() => {
+                    // 閲嶆柊璁＄畻鍐呭瑙嗗彛楂樺害
+                    this.getCalcHeight()
+                })
+            },
+            getCalcHeight() {
+                let query = uni.createSelectorQuery().in(this)
+                query
+                    .select("#divide")
+                    .boundingClientRect()
+                    .select("#pagination-zone")
+                    .boundingClientRect()
+                    .exec(res => {
+                        this.divideBottom = Math.ceil(res[0].bottom)
+                        this.paginationTop = Math.floor(res[1].top)
+                    })
+            },
+            async qrCodeDisplay(item) {
+                this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+                await this.$nextTick()
+                this.$refs.barcodePopup.open()
+            },
+            onPaginationChangeHandler({
+                current
+            }) {
+                this.page = current
+                this.showList = this.getPage(current, this.size, this.listData)
+            },
+            getPage(page, size, list) {
+                let sindex = (parseInt(page) - 1) * size
+                let eindex = parseInt(page) * size
+                let newList = list.slice(sindex, eindex)
+                return newList
+            },
+            changeTab(e) {
+                this.tabs = e
+                this.page = 1
+                this.showList = []
+
+                // if (this.tabs == 0) {
+                //     this.urls = '/Sc_HEquipStateDistribution/Get_EquipICMOTechParamList_Json'
+                // }
+                // if (this.tabs == 1) {
+                // 	this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+                // }
+                this.search()
+            },
+            async getList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: this.urls,
+                        data: this.hform
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message,
+                        list
+                    } = res.data
+
+                    if (count == 1) {
+                        if (data == null) {
+                            data = []
+                        }
+                        this.listData = data
+                        console.log('data: ', data);
+                        this.showList = this.getPage(this.page, this.size, data)
+                        this.dataLength = data.length
+                        this.HFieldList = CommonUtils.fieldListFilterRole({
+                            FieldList: list,
+                            ExcludeKeys: []
+                        }).data
+
+                        console.log('showList: ', this.showList);
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鑾峰彇璁惧灞ュ巻澶辫触: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鑾峰彇璁惧灞ュ巻澶辫触: ${err}`
+                    })
+                }
+
+            },
+            search() {
+                this.hform.sWhere = ''
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                this.hform.sWhere = {
+                    HEquipID: this.hform.HInterID,
+                    HICMOInterID: this.hform.HICMOInterID,
+                    HICMOEntryID: this.hform.HICMOEntryID,
+                }
+
+                this.getList()
+            },
+        },
+        onLoad(e) {
+            let {
+                operationType,
+                HEquipID,
+                HICMOInterID,
+                HICMOEntryID
+            } = e
+            if (operationType == 4) {
+                this.hform.HInterID = HEquipID
+                this.hform.HICMOInterID = HICMOInterID
+                this.hform.HICMOEntryID = HICMOEntryID
+            }
+            this.changeTab(0)
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJListStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/qijvguzhangdengji/mouldMistakeBill.vue b/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
similarity index 77%
rename from pages/qijvguzhangdengji/mouldMistakeBill.vue
rename to pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
index 72018db..d7feb1b 100644
--- a/pages/qijvguzhangdengji/mouldMistakeBill.vue
+++ b/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
@@ -169,8 +169,6 @@
                 <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
             </view>
         </view>
-        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
-		<BillListPopupMouldVue @BillSelectComplete="MouldBillHandler" ref="billListMould"></BillListPopupMouldVue>
     </view>
 </template>
 <script>
@@ -180,24 +178,10 @@
     } from "@/utils/auth.js";
     import {
         CommonUtils
-    } from '../../utils/common';
-    import {
-        getUserStockRelation
-    } from '../../utils/userRelationManager';
-    import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
-    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
-    import BillSelectPopupXiaoWeiVue from '../../components/BillSelectPopupXiaoWei/BillSelectPopupXiaoWei.vue';
-	import BillListPopupMouldVue from '../../components/BillListPopup/BillListPopup_Mould.vue';
+    } from '../../../utils/common';
     import dayjs from 'dayjs';
-    import { MpaasScan } from '../../utils/mpaasScan';
+    import { MpaasScan } from '../../../utils/mpaasScan';
     export default {
-        components: {
-            BillListPopupVue,
-            BarCodePopupVue,
-            BillSelectPopupXiaoWeiVue,
-			BillListPopupMouldVue,
-        },
-
         data() {
             return {
                 HSourceBillNoFocus: false,
@@ -288,7 +272,6 @@
             this.OperationType = e.OperationType
             if (e.HInterID) {
                 this.HInterID_Temp = e.HInterID
-                // this.btnType = 1
                 this.RoadBillMain(e.HInterID)
                 this.barCodeFocus = true
             } else {
@@ -599,109 +582,11 @@
                 }
 
             },
-            //鐗╂枡淇℃伅
-            DisBillEntryList() {
-                uni.request({
-                    url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json',
-                    data: {
-                        HInterID: this.hform.HInterID,
-                        HBillNo: this.hform.HBillNo,
-                        HBillType: this.hform.HBillType,
-                        HStockOrgID: this.hform.HStockOrgID
-                    },
-                    success: (res) => {
-                        console.log('鐗╂枡', res.data)
-                        if (res.data.count == 1) {
-                            var data = res.data.data
-                            this.materMeta = data.BarCodeDetailslist
-                            this.Materlist = data.Materlist
-                            if (/鍏磋揪/.test(uni.getStorageSync("Organization"))) {
-                                // 鍏磋揪瀹㈡埛 甯﹀嚭 浠撳簱
-                                console.log("鍏磋揪甯﹀嚭榛樿浠撳簱")
-                                this.HWHNameChange(data.BarCodeDetailslist[0].HWHName)
-                            }
-
-
-                            if (!data.BarCodeDetailslist[0].HBarCode) {
-                                this.hform.HMaterName_B = ''
-                                this.hform.HMaterModel_B = ''
-                                this.hform.HBatchNo_B = ''
-                                this.hform.HUnitName_B = ''
-                                this.hform.HQty_B = ''
-                                this.hform.HTMQty_B = ''
-                                this.hform.HWHName_B = ''
-                                this.hform.HSPName_B = ''
-                            } else {
-                                this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
-                                this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
-                                this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
-                                this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
-                                this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
-                                this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
-                                this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
-                                this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
-                            }
-                        } else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            //鍒犻櫎鐗╂枡鐮�
-            delMater(item) {
-                uni.showModal({
-                    title: '鎻愮ず',
-                    content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
-                    success: (res) => {
-                        if (res.confirm) {
-                            uni.request({
-                                url: this.serverUrl +
-                                    '/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json',
-                                data: {
-                                    HInterID: this.hform.HInterID,
-                                    HMaterID: item.HMaterID,
-                                    HAuxPropID: item.HAuxPropID,
-                                    HMTONo: item.HMTONo,
-                                    HSourceInterID: item.HSourceInterID,
-                                    HSourceEntryID: item.HSourceEntryID,
-                                    HBillType: this.hform.HBillType
-                                },
-                                success: (res) => {
-                                    if (res.data.count == 1) {
-                                        this.DisBillEntryList()
-                                    } else {
-                                        uni.showToast({
-                                            title: res.data.Message,
-                                            icon: 'none'
-                                        })
-                                    }
-                                },
-                                fail: (res) => {
-                                    console.log(res);
-                                    uni.showToast({
-                                        title: '鎺ュ彛璇锋眰澶辫触',
-                                        icon: 'none'
-                                    })
-                                },
-                            });
-                        }
-                    }
-                });
-            },
+            
             // 鏂板鍥炶皟
             addNew() {
                 uni.redirectTo({
-                    url: '/pages/qijvguzhangdengji/mouldMistakeBill?OperationType=1'
+                    url: '/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill?OperationType=1'
                 })
             },
             //鏂板
@@ -731,67 +616,7 @@
                         })
                     },
                 });
-            },
-            //淇敼鍥炲～鏁版嵁
-            RoadBillMain(HInterID) {
-                uni.request({
-                    url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json',
-                    data: {
-                        HInterID: HInterID,
-                        HBillType: this.hform.HBillType
-                    },
-                    success: (res) => {
-                        console.log(33, res.data.data[0]);
-                        if (res.data.count == 1) {
-                            var data = res.data.data[0]
-                            this.hform.HInterID = data.HInterID
-                            this.hform.HBillNo = data.HBillNo
-                            this.hform.HMainSourceBillType = data.HSourceBillType
-                            this.hform.HSourceBillNo = data.HSourceBillNo
-                            if (data.HSourceBillType == 1105) {
-                                this.hform.HMainSourceBillType = 1105
-                                this.HMainSourceBillType = '閫�鏂欓�氱煡鍗�'
-                                this.showHSupName = false
-                            } else if (data.HSourceBillType == 1102) {
-                                this.hform.HMainSourceBillType = 1102
-                                this.HMainSourceBillType = '閲囪喘璁㈠崟'
-                                this.showHSupName = false
-                            } else if (data.HSourceBillType == 1201) {
-                                this.hform.HMainSourceBillType = 1201
-                                this.HMainSourceBillType = '閲囪喘鍏ュ簱鍗�'
-                                this.showHSupName = false
-                            } else {
-                                this.hform.HMainSourceBillType = -1
-                                this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-                            }
-                            this.showHMainSourceBillType = false
-
-                            //闈炲婧愬崟妯″紡
-                            if (data.HMulSourceBill == 0) {
-                                this.showHSourceBillNo = false
-                            }
-                            this.hform.HDeptID = data.HDeptID
-                            this.hform.HDeptName = data.HDeptName
-                            this.hform.HSupID = data.HCusID
-                            this.hform.HSupName = data.HSupName
-                            this.DisBillEntryList()
-                            this.tabs = 2
-                        } else {
-                            uni.showToast({
-                                title: '鑾峰彇鏁版嵁鍥炲～澶辫触',
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
+            },           
             checkBillValidate() {
                 let message = ''
 
@@ -804,10 +629,6 @@
                 } else if (!this.hform.HEmpName) {
                     message = '鏈～鍐欏彂鐜颁汉'
                 } 
-				// else if (!this.hform.HManagerName) {
-    //                 message = '鏈～鍐欒礋璐ｄ汉'
-    //             }
-
                 if (!message) {
                     return true
                 }
@@ -859,13 +680,13 @@
                                 if (res.confirm) {
                                     console.log('鐢ㄦ埛鐐瑰嚮纭畾');
                                     uni.redirectTo({
-                                        url: '/pages/qijvguzhangdengji/mouldMistakeBill?OperationType=1'
+                                        url: '/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill?OperationType=1'
                                     })
                                 } else if (res.cancel) {
                                     console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                                    // setTimeout(() => {
-                                    // 	uni.navigateBack();
-                                    // }, 50)
+                                    setTimeout(() => {
+                                    	uni.navigateBack();
+                                    }, 50)
                                 }
                             }
                         });
diff --git a/pages/qijvguzhangdengji/mouldMistake.vue b/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList.vue
similarity index 98%
rename from pages/qijvguzhangdengji/mouldMistake.vue
rename to pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList.vue
index b3ac1ed..3746191 100644
--- a/pages/qijvguzhangdengji/mouldMistake.vue
+++ b/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList.vue
@@ -203,10 +203,10 @@
 <script>
     import {
         CommonUtils
-    } from '../../utils/common'
+    } from '../../../utils/common'
     import {
         getUserInfo
-    } from '../../utils/auth'
+    } from '../../../utils/auth'
     import dayjs, {
         Dayjs
     } from 'dayjs'
@@ -256,7 +256,7 @@
             },
             cmdAdd() {
                 uni.navigateTo({
-                    url: "/pages/qijvguzhangdengji/mouldMistakeBill?operationType=1"
+                    url: "/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill?operationType=1"
                 })
             },
             async cmdSearch() {
diff --git a/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue b/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
index ef6f93b..1b6dd86 100644
--- a/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
+++ b/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
@@ -1,887 +1,951 @@
 <template>
-    <view>
-        <view class="tabs" id="tabs">
-            <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
-            <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鍏朵粬淇℃伅</view>
-            <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍒跺崟淇℃伅</view>
-            <!-- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view> -->
-        </view>
-        <!-- 鍩烘湰淇℃伅 -->
-        <template v-if="tabs == 0">
-            <view class="form" :style="{
+	<view>
+		<view class="tabs" id="tabs">
+			<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+			<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鍏朵粬淇℃伅</view>
+			<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍒跺崟淇℃伅</view>
+			<!-- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view> -->
+		</view>
+		<!-- 鍩烘湰淇℃伅 -->
+		<template v-if="tabs == 0">
+			<view class="form" :style="{
                 height: containerHeight + 'px',
                 overflow: 'auto'
             }">
-                <view class="form-item">
-                    <view class="title">鍣ㄥ叿鏉＄爜:</view>
-                    <view :class="enableEdit?'right':'righton'">
-                        <input v-model="hform.HBarCode" :disabled="!enableEdit"
-                            @confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍣ㄥ叿鏉＄爜" />
-                    </view>
-                    <view class="icon-wrapper">
-                        <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">缁翠慨寮�濮嬫棩鏈�:</view>
-                    <view class="right">
-                        <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HRepairBeginDate">
-                            <input :value="hform.HRepairBeginDate" />
-                        </uni-datetime-picker>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">缁翠慨缁撴潫鏃ユ湡:</view>
-                    <view class="right">
-                        <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HRepairEndDate">
-                            <input :value="hform.HRepairEndDate" />
-                        </uni-datetime-picker>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍗曟嵁鍙�:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HBillNo" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍗曟嵁鏃ユ湡:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鏃堕棿鍗曚綅:</view>
-                    <zxz-uni-data-select class="right" :localdata="[
-                        {key: '灏忔椂', value: '灏忔椂'},
-                        {key: '澶�', value: '澶�'},
-                        {key: '鏈�', value: '鏈�'},
-                    ]" dataKey="key" dataValue="value" v-model="hform.HCycleUnit">
-                    </zxz-uni-data-select>
-                </view>
-                <view class="form-item">
-                    <view class="title required">璁″垝缁翠慨宸ユ椂:</view>
-                    <view class="right">
-                        <input type="number" v-model="hform.HPlanTimes" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title required">瀹為檯缁翠慨宸ユ椂:</view>
-                    <view class="right">
-                        <input type="number" v-model="hform.HTimes" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title required">缁翠慨閮ㄩ棬:</view>
-                    <zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
-                        dataValue="HItemID" v-model="hform.HDeptID">
 
-                    </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
-                </view>
-                <view class="form-item">
-                    <view class="title required">缁翠慨浜�:</view>
-                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
-                        dataValue="HItemID" v-model="hform.HEmpID">
+				<!-- 鍘熷唴瀹逛繚鎸佷笉鍙� -->
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鏉＄爜:</view>
+					<view :class="enableEdit?'right':'righton'">
+						<input v-model="hform.HBarCode" :disabled="!enableEdit"
+							@confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍣ㄥ叿鏉＄爜" />
+					</view>
+					<view class="icon-wrapper">
+						<uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">缁翠慨寮�濮嬫棩鏈�:</view>
+					<view class="right">
+						<uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HRepairBeginDate">
+							<input :value="hform.HRepairBeginDate" />
+						</uni-datetime-picker>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">缁翠慨缁撴潫鏃ユ湡:</view>
+					<view class="right">
+						<uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HRepairEndDate">
+							<input :value="hform.HRepairEndDate" />
+						</uni-datetime-picker>
+					</view>
+				</view>
+				<!-- 鏂板婧愬崟绫诲瀷鍜屾晠闅滅櫥璁板崟閫夋嫨 -->
+				<view class="form-item">
+					<view class="title">婧愬崟绫诲瀷</view>
+					<view class="right" v-show="showHMainSourceBillType">
+						<picker :range="arrayHMainSourceBillType" @change="HMainSourceBillTypeChange">
 
-                    </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
-                </view>
-                <view class="form-item">
-                    <view class="title required">缁翠慨椤圭洰:</view>
-                    <zxz-uni-data-select required class="right" :localdata="HRepairList" dataKey="缁翠慨椤圭洰"
-                        dataValue="hitemid" v-model="hform.HRepairID">
+							<input disabled name="HMainSourceBillType" v-model="HMainSourceBillType"
+								placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+							<view class="picker-overlay"></view>
+						</picker>
+					</view>
+					<view class="righton" v-show="!showHMainSourceBillType">
+						<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+							placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title required">鏁呴殰鐧昏鍗�</view>
+					<view class="right" v-show="hform.HMainSourceBillType != 1">
+						<input type="text" name="HBarCode" v-model="hform.HMainSourceBillNo" />
+					</view>
+					<view class="icon-wrapper" v-show="hform.HMainSourceBillType != 1"
+						:disabled="hform.HMainSourceBillType == -1">
+						<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+					</view>
+					<view class="righton" v-show="hform.HMainSourceBillType == 1">
+						<input type="text" disabled name="HBarCode" v-model="hform.HMainSourceBillNo" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HBillNo" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鏃ユ湡:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HDate" />
+					</view>
+				</view>
 
-                    </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
-                </view>
-                <view class="form-item">
-                    <view class="title required">涓荤:</view>
-                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
-                        dataValue="HItemID" v-model="hform.HManagerID">
+				<view class="form-item">
+					<view class="title required">缁翠慨閮ㄩ棬:</view>
+					<zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
+						dataValue="HItemID" v-model="hform.HDeptID">
 
-                    </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
-                </view>
-                <view class="form-item">
-                    <view class="title">鍣ㄥ叿鍚嶇О:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMouldName" disabled />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍣ㄥ叿瑙勬牸:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMouldModel" disabled />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍣ㄥ叿鍨嬪彿:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMouldSpec" disabled />
-                    </view>
-                </view>
-            </view>
-        </template>
-        <!-- 鍏朵粬淇℃伅(闈為噸瑕佷俊鎭�) -->
-        <template v-if="tabs == 1">
-            <view class="form" :style="{
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title required">缁翠慨浜�:</view>
+					<zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+						dataValue="HItemID" v-model="hform.HEmpID">
+
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title required">缁翠慨椤圭洰:</view>
+					<zxz-uni-data-select required class="right" :localdata="HRepairList" dataKey="缁翠慨椤圭洰"
+						dataValue="hitemid" v-model="hform.HRepairID">
+
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title required">涓荤:</view>
+					<zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+						dataValue="HItemID" v-model="hform.HManagerID">
+
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鍚嶇О:</view>
+					<view class="righton">
+						<input v-model="hform.HMouldName" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿瑙勬牸:</view>
+					<view class="righton">
+						<input v-model="hform.HMouldModel" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鍨嬪彿:</view>
+					<view class="righton">
+						<input v-model="hform.HMouldSpec" disabled />
+					</view>
+				</view>
+			</view>
+		</template>
+		<!-- 鍏朵粬淇℃伅(闈為噸瑕佷俊鎭�) -->
+		<template v-if="tabs == 1">
+			<view class="form" :style="{
                 height: containerHeight + 'px',
                 overflow: 'auto'
             }">
-                <view class="form-item">
-                    <view class="title">渚涘簲鍟�:</view>
-                    <view class="right">
-                        <input v-model="hform.HSupID" placeholder="" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">缁翠慨绫诲瀷:</view>
-                    <zxz-uni-data-select class="right" :localdata="[
-                        {key: '鍐呴儴缁翠慨', value: '鍐呴儴缁翠慨'},
-                        {key: '澶栭儴缁翠慨', value: '澶栭儴缁翠慨'},
-                    ]" dataKey="key" dataValue="value" v-model="hform.HRepairType">
-                    </zxz-uni-data-select>
-                </view>
-                <view class="form-item">
-                    <view class="title">缁翠慨鍚庢柊瑙勬牸:</view>
-                    <view class="right">
-                        <input type="number" v-model="hform.HNewModel" placeholder="" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鏂拌璁″鍛�:</view>
-                    <view class="right">
-                        <input type="number" v-model="hform.HNewDesignLife" placeholder="" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">璁惧:</view>
-                    <view class="right">
-                        <input v-model="hform.HEquipID" placeholder="" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">缁翠慨璐圭敤:</view>
-                    <view class="right">
-                        <input type="number" v-model="HDetailList[0].HMoney" placeholder="" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">缁翠慨鍐呭:</view>
-                    <view class="right">
-                        <textarea v-model="hform.HRepairContent" placeholder="璇疯緭鍏ョ淮淇唴瀹�" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">缁翠慨瑕佹眰:</view>
-                    <view class="right">
-                        <textarea v-model="hform.HExplanation" placeholder="璇疯緭鍏ョ淮淇姹�" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">澶囨敞:</view>
-                    <view class="right">
-                        <textarea v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
-                    </view>
-                </view>
-            </view>
-        </template>
-        <!-- 鍒跺崟淇℃伅  -->
-        <template v-if="tabs == 2">
-            <view class="form" :style="{
-                height: containerHeight + 'px',
-                overflow: 'auto'
-            }">
-                <view class="form-item">
-                    <view class="title">鍒涘缓浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMaker" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍒涘缓鏃ユ湡:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMakeDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">淇敼浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HUpDater" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">淇敼鏃ユ湡:</view>
-                    <view class="righton">
-                        <input v-model="hform.HUpDateDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">瀹℃牳浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HChecker" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">瀹℃牳鏃堕棿:</view>
-                    <view class="righton">
-                        <input v-model="hform.HCheckDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">浣滃簾浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HDeleteMan" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">浣滃簾鏃ユ湡:</view>
-                    <view class="righton">
-                        <input v-model="hform.HDeleteDate" />
-                    </view>
-                </view>
-            </view>
+				<view class="form-item">
+					<view class="title">鏃堕棿鍗曚綅:</view>
+					<zxz-uni-data-select class="right" :localdata="[
+               			        {key: '灏忔椂', value: '灏忔椂'},
+               			        {key: '澶�', value: '澶�'},
+               			        {key: '鏈�', value: '鏈�'},
+               			    ]" dataKey="key" dataValue="value" v-model="hform.HCycleUnit">
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title">璁″垝缁翠慨宸ユ椂:</view>
+					<view class="right">
+						<input type="number" v-model="hform.HPlanTimes" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹為檯缁翠慨宸ユ椂:</view>
+					<view class="right">
+						<input type="number" v-model="hform.HTimes" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">渚涘簲鍟�:</view>
+					<view class="right">
+						<input v-model="hform.HSupID" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">缁翠慨绫诲瀷:</view>
+					<zxz-uni-data-select class="right" :localdata="[
+                                       {key: '鍐呴儴缁翠慨', value: '鍐呴儴缁翠慨'},
+                                       {key: '澶栭儴缁翠慨', value: '澶栭儴缁翠慨'},
+                                   ]" dataKey="key" dataValue="value" v-model="hform.HRepairType">
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title">缁翠慨鍚庢柊瑙勬牸:</view>
+					<view class="right">
+						<input type="number" v-model="hform.HNewModel" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏂拌璁″鍛�:</view>
+					<view class="right">
+						<input type="number" v-model="hform.HNewDesignLife" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">璁惧:</view>
+					<view class="right">
+						<input v-model="hform.HEquipID" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">缁翠慨璐圭敤:</view>
+					<view class="right">
+						<input type="number" v-model="HDetailList[0].HMoney" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">缁翠慨鍐呭:</view>
+					<view class="right">
+						<textarea v-model="hform.HRepairContent" placeholder="璇疯緭鍏ョ淮淇唴瀹�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">缁翠慨瑕佹眰:</view>
+					<view class="right">
+						<textarea v-model="hform.HExplanation" placeholder="璇疯緭鍏ョ淮淇姹�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">澶囨敞:</view>
+					<view class="right">
+						<textarea v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+					</view>
+				</view>
+			</view>
+		</template>
+		<!-- 鍒跺崟淇℃伅  -->
+		<template v-if="tabs == 2">
+			<view class="form" :style="{
+                               height: containerHeight + 'px',
+                               overflow: 'auto'
+                           }">
+				<view class="form-item">
+					<view class="title">鍒涘缓浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HMaker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒涘缓鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HMakeDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDater" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDateDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HChecker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳鏃堕棿:</view>
+					<view class="righton">
+						<input v-model="hform.HCheckDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteMan" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteDate" />
+					</view>
+				</view>
+			</view>
+		</template>
 
-        </template>
-        <!-- 鎿嶄綔鎸夐挳 -->
-        <view class="buttons" id="buttons">
-            <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-            <view style="flex: 1;"></view>
-            <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
-            <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
-        </view>
-        <!-- <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload> -->
-    </view>
+		<!-- 鎿嶄綔鎸夐挳 -->
+		<view class="buttons" id="buttons">
+			<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			<view style="flex: 1;"></view>
+			<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+			<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+		</view>
+
+		<!-- 鏂板寮圭獥缁勪欢 -->
+		<BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType"
+			:HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
+		</BillListPopupMouldConkBookBillVue>
+	</view>
 </template>
 
 <script>
-    import dayjs from "dayjs";
-    import {
-        CommonUtils
-    } from "@/utils/common";
-    import {
-        MpaasScan
-    } from "@/utils/mpaasScan.js"
-    import {
-        getUserInfo
-    } from "../../../utils/auth";
-    export default {
-        // 鍣ㄥ叿缁翠慨娲惧伐鍗�
-        name: 'Sc_MouldRepairSendWorkBill',
-        data() {
-            return {
-                tabs: 0,
-                HMainSourceBillType: "",
-                btnTop: 0,
-                tabsBottom: 0,
-                HModName: "Sc_MouldRepairSendWorkBill",
-                HBillType: '3843',
-                operationType: 1,
-                uploadOptions: {},
-                enableEdit: true,
+	import dayjs from "dayjs";
+	import {
+		CommonUtils
+	} from "@/utils/common";
+	import {
+		MpaasScan
+	} from "@/utils/mpaasScan.js"
+	import {
+		getUserInfo
+	} from "../../../utils/auth";
+	// 鏂板寮曞叆缁勪欢
+	import BillListPopupMouldConkBookBillVue from '../../../components/BillListPopup/BillListPopupMouldConkBookBill.vue';
 
-                HDeptList: [],
-                HRepairCheckList: [],
-                HEmpList: [],
-                HRepairList: [],
+	export default {
+		// 鍣ㄥ叿缁翠慨娲惧伐鍗�
+		name: 'Sc_MouldRepairSendWorkBill',
+		components: {
+			BillListPopupMouldConkBookBillVue,
+		},
+		data() {
+			return {
+				tabs: 0,
+				HMainSourceBillType: '妯″叿鏁呴殰鐧昏鍗�', // 鏂板
+				showHMainSourceBillType: true, // 鏂板
+				arrayHMainSourceBillType: ['妯″叿鏁呴殰鐧昏鍗�'], // 鏂板
+				arrayHMainSourceBillTypeID: ['3815'], // 鏂板
+				btnTop: 0,
+				tabsBottom: 0,
+				HModName: "Sc_MouldRepairSendWorkBill",
+				HBillType: '3843',
+				operationType: 1,
+				uploadOptions: {},
+				enableEdit: true,
 
-                hform: {
-                    "HBarCode": "",
-                    "HBillNo": "",
-                    "HInterID": "0",
-                    "HDate": dayjs(new Date()).format('YYYY-MM-DD'),
-                    "HInnerBillNo": "",
-                    "MouldHNumber": "",
-                    "HMouldID": "0",
-                    "HRepairIDName": "",
-                    "HRepairID": "0",
-                    "HCycleUnit": "灏忔椂",
-                    "MouldHName": "",
-                    "MouldHModel": "",
-                    "HDeptIDName": "",
-                    "HDeptID": "0",
-                    "HManagerIDName": "",
-                    "HManagerID": "0",
-                    "HEmpIDName": "",
-                    "HEmpID": "0",
-                    "HRepairBeginDate": dayjs(new Date()).format('YYYY-MM-DD'),
-                    "HMainSourceBillType": "",
-                    "HMainSourceInterID": "0",
-                    "HMainSourceEntryID": "0",
-                    "HPlanTimes": "0",
-                    "HTimes": "0",
-                    "HRepairEndDate": dayjs(new Date()).format('YYYY-MM-DD'),
-                    "HMainSourceBillNo": "",
-                    "HSupIDName": "",
-                    "HSupID": "0",
-                    "HRepairType": "鍐呴儴缁翠慨",
-                    "HNewModel": "0",
-                    "HOrgID": "",
-                    "HNewDesignLife": "0",
-                    "HEquipIDName": "",
-                    "HEquipID": "0",
-                    "HRepairContent": "",
-                    "HExplanation": "",
-                    "HRemark": "",
-                    "HMaker": getUserInfo()["Czymc"],
-                    "HChecker": "",
-                    "HCloseMan": "",
-                    "HUpDater": "",
-                    "HMakeDate": dayjs(new Date()).format('YYYY-MM-DD'),
-                    "HCheckDate": "",
-                    "HCloseDate": "",
-                    "HUpDateDate": "",
-                    "HDeleteMan": "",
-                    "HDeleteDate": "",
-                    HMouldName: "",
-                    HMouldSpec: "",
-                    HMouldModel: "",
-                },
-                HDetailList: [{ // 鍚庣鎺ュ彛鎻愪氦闇�瑕� 鏄庣粏淇℃伅
-                    "瀛愮淮淇」鐩�": "",
-                    "HRepairID": 0,
-                    "瀛愮淮淇」鐩唬鐮�": "",
-                    "HRepairExplanation": "",
-                    "瀛愯礋璐ｄ汉浠ｇ爜": "",
-                    "HManagerID": "",
-                    "瀛愯礋璐ｄ汉": "",
-                    "HMoney": 0,
-                    "HRemark": ""
-                }]
-            };
-        },
-        computed: {
-            containerHeight: {
-                get() {
-                    return this.btnTop - this.tabsBottom - 5
-                }
-            },
-        },
-        methods: {
-            // 缁翠慨椤圭洰
-            async getRepairList() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: '/Gy_Repair/GetRepairList',
-                        data: {
-                            sWhere: '',
-                            user: getUserInfo()["Czymc"]
-                        }
-                    })
+				HDeptList: [],
+				HRepairCheckList: [],
+				HEmpList: [],
+				HRepairList: [],
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        this.HRepairList = data
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: `鑾峰彇妫�楠岄」鐩け璐�: ${Message}`
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: `鑾峰彇妫�楠岄」鐩け璐�: ${err}`
-                    })
-                }
-            },
-            // 鍒犻櫎鏄庣粏
-            delDetail(item) {
+				hform: {
+					"HBarCode": "",
+					"HBillNo": "",
+					"HInterID": "0",
+					"HDate": dayjs(new Date()).format('YYYY-MM-DD'),
+					"HInnerBillNo": "",
+					"MouldHNumber": "",
+					"HMouldID": "0",
+					"HRepairIDName": "",
+					"HRepairID": "0",
+					"HCycleUnit": "灏忔椂",
+					"MouldHName": "",
+					"MouldHModel": "",
+					"HDeptName": getUserInfo()["HDeptName"],
+					"HDeptID": getUserInfo()["HDeptID"],
+					"HEmpName": getUserInfo().HEmpName,
+					"HEmpID": getUserInfo().HEmpID,
+					"HManagerName": getUserInfo().HSecManager,
+					"HManagerID": getUserInfo().HSecManagerID,
+					"HRepairBeginDate": dayjs(new Date()).format('YYYY-MM-DD'),
+					"HMainSourceBillType": 3815, // 鏂板锛氶粯璁ゆā鍏锋晠闅滅櫥璁板崟
+					"HMainSourceInterID": "0", // 鏂板
+					"HMainSourceEntryID": "0", // 鏂板
+					"HPlanTimes": "0",
+					"HTimes": "0",
+					"HRepairEndDate": dayjs(new Date()).format('YYYY-MM-DD'),
+					"HMainSourceBillNo": "", // 鏂板
+					"HSupIDName": "",
+					"HSupID": "0",
+					"HRepairType": "鍐呴儴缁翠慨",
+					"HNewModel": "0",
+					"HOrgID": "",
+					"HNewDesignLife": "0",
+					"HEquipIDName": "",
+					"HEquipID": "0",
+					"HRepairContent": "",
+					"HExplanation": "",
+					"HRemark": "",
+					"HMaker": getUserInfo()["Czymc"],
+					"HChecker": "",
+					"HCloseMan": "",
+					"HUpDater": "",
+					"HMakeDate": dayjs(new Date()).format('YYYY-MM-DD'),
+					"HCheckDate": "",
+					"HCloseDate": "",
+					"HUpDateDate": "",
+					"HDeleteMan": "",
+					"HDeleteDate": "",
+					HMouldName: "",
+					HMouldSpec: "",
+					HMouldModel: "",
+					"HStockOrgID": uni.getStorageSync("OrganizationID") || "0" // 鏂板
+				},
+				HDetailList: [{ // 鍚庣鎺ュ彛鎻愪氦闇�瑕� 鏄庣粏淇℃伅
+					"瀛愮淮淇」鐩�": "",
+					"HRepairID": 0,
+					"瀛愮淮淇」鐩唬鐮�": "",
+					"HRepairExplanation": "",
+					"瀛愯礋璐ｄ汉浠ｇ爜": "",
+					"HManagerID": "",
+					"瀛愯礋璐ｄ汉": "",
+					"HMoney": 0,
+					"HRemark": ""
+				}]
+			};
+		},
+		computed: {
+			containerHeight: {
+				get() {
+					return this.btnTop - this.tabsBottom - 5
+				}
+			},
+		},
+		methods: {
+			// 鏂板锛氶�夋嫨婧愬崟绫诲瀷
+			HMainSourceBillTypeChange(e) {
+				if (e.detail.value == -1 || e.detail.value == NaN) {
+					this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+					this.hform.HMainSourceBillType = -1
+					return
+				}
+				console.log(e.detail.value)
+				console.log(e)
+				this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+				this.hform.HMainSourceBillType = this.arrayHMainSourceBillTypeID[e.detail.value]
 
-            },
-            // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
-            ValidCheck() {
-                if (this.hform.HMouldID == 0) {
-                    return {
-                        Message: "鏈綍鍏ュ櫒鍏蜂俊鎭紝璇峰厛褰曞叆鍣ㄥ叿淇℃伅!",
-                        state: false
-                    }
-                }
-                if (this.hform.HDeptID == 0) {
-                    return {
-                        Message: "閮ㄩ棬涓嶅緱涓虹┖!",
-                        state: false
-                    }
-                }
-                if (this.hform.HEmpID == 0) {
-                    return {
-                        Message: "楠屾敹浜轰笉寰椾负绌�!",
-                        state: false
-                    }
-                }
-                if (this.hform.HRepairCheckMainID == 0) {
-                    return {
-                        Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
-                        state: false
-                    }
-                }
-                if (this.hform.HManagerID == 0) {
-                    return {
-                        Message: "璐熻矗浜轰笉寰椾负绌�!",
-                        state: false
-                    }
-                }
-                if (this.hform.HPlanTimes == '') {
-                    return {
-                        Message: "璁″垝缁翠慨宸ユ椂涓嶅緱涓虹┖!",
-                        state: false
-                    }
-                }
-                if (this.hform.HTimes == '') {
-                    return {
-                        Message: "瀹為檯缁翠慨宸ユ椂涓嶅緱涓虹┖!",
-                        state: false
-                    }
-                }
+				// 缂撳瓨褰撳墠椤甸潰閫夋嫨
+				const pages = getCurrentPages()
+				const currentPage = pages[pages.length - 1]
+				uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
+					HSourceBillTypeName: this.HMainSourceBillType,
+					HSourceBillType: this.hform.HMainSourceBillType
+				})
+			},
 
+			// 鏂板锛氭樉绀哄崟鎹垪琛ㄥ脊绐�
+			showBillList() {
+				this.$refs.billList.showPopup()
+			},
 
-                return {
-                    Message: "",
-                    state: true
-                }
-            },
-            addNew() {
-                uni.redirectTo({
-                    url: './Sb_EquipRepairSendWorkBill?operationType=1'
-                })
-            },
-            goBack() {
-                uni.navigateBack()
-            },
-            checkBoxChangeHandler(index, e) {
-                let cr = e.detail.value
-                if (cr.length == 0) {
-                    this.HCheckFileList[index]["HDotCheckResult"] = false
-                } else {
-                    this.HCheckFileList[index]["HDotCheckResult"] = true
-                }
-            },
-            uploadFile(index) {
-                console.log('filePath: ', this.attachmentInfo[index].filePath);
-                // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
-                uni.uploadFile({
-                    url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
-                    filePath: this.attachmentInfo[index].filePath,
-                    name: 'file',
-                    formData: {
-                        HBillNo: this.hform.HBillNo,
-                        HRemark: "",
-                        HUserName: getUserInfo()["Czymc"]
-                    },
-                    success: (uploadRes) => {
-                        CommonUtils.showTips({
-                            message: "涓婁紶鎴愬姛"
-                        })
-                        this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
-                    },
-                    fail: (err) => {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: `涓婁紶澶辫触: ${err}`
-                        })
-                    }
-                })
-            },
-            delFile(index) {
-                console.log('attachmentInfo: ', this.attachmentInfo[index]);
-                uni.showModal({
-                    title: '鎻愮ず',
-                    content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
-                    success: (res) => {
-                        if (res.confirm) {
-                            this.attachmentInfo.splice(index, 1)
-                        }
-                    },
-                })
+			// 鏂板锛氳鍙栫紦瀛�
+			loadCache() {
+				const pages = getCurrentPages()
+				const currentPage = pages[pages.length - 1]
+				let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
+				if (HBillTypeCache) {
+					this.HMainSourceBillType = HBillTypeCache.HSourceBillTypeName
+					this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
+				}
+			},
 
-            },
-            handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
-                console.log('file: ', res);
-                let fileInfo = res.data[0]
-                this.attachmentInfo.push({
-                    fileName: fileInfo.name,
-                    size: fileInfo.size,
-                    status: '绛夊緟涓婁紶',
-                    filePath: fileInfo.tempFilePath
-                })
-            },
-            // 涓婁紶鏂囦欢
-            fileUpload() {
-                this.$refs.XeUpload.upload('file', {});
-            },
-            //鑾峰彇鐝鏁版嵁
-            async getShiftList() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: '/Web/GetGy_ShiftsList_Json',
-                        data: {
-                            Shifts: "",
-                        }
-                    })
+			// 缁翠慨椤圭洰
+			async getRepairList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Gy_Repair/GetRepairList',
+						data: {
+							sWhere: '',
+							user: getUserInfo()["Czymc"]
+						}
+					})
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        this.HShiftsList = data
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: Message
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: err
-                    })
-                }
-            },
-            //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
-            async getHDeptList() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: '/Gy_Department/list',
-                        data: {
-                            sWhere: ` and HUSEORGID = ${uni.getStorageSync('OrganizationID')}`,
-                            user: uni.getStorageSync('HUserName'),
-                            Organization: uni.getStorageSync('Organization')
-                        }
-                    })
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HRepairList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: `鑾峰彇妫�楠岄」鐩け璐�: ${Message}`
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: `鑾峰彇妫�楠岄」鐩け璐�: ${err}`
+					})
+				}
+			},
+			// 鍒犻櫎鏄庣粏
+			delDetail(item) {
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        this.HDeptList = data
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: Message
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: err
-                    })
-                }
-            },
-            // 鑾峰彇鑱屽憳鏁版嵁
-            async getEmpList() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: '/PublicPageMethod/UserList',
-                        data: {
-                            sWhere: " where 1=1",
-                        }
-                    })
+			},
+			// 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
+			ValidCheck() {
+				// 鏂板锛氭鏌ユ晠闅滅櫥璁板崟
+				if (this.hform.HMainSourceBillType != 1 && !this.hform.HMainSourceBillNo) {
+					return {
+						Message: "鏁呴殰鐧昏鍗曚笉寰椾负绌�!",
+						state: false
+					}
+				}
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        this.HEmpList = data
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: Message
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: err
-                    })
-                }
-            },
-            // 鑾峰彇楠岃瘉椤圭洰鏁版嵁
-            async getCheckProjList() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: '/Gy_RepairCheck/GetRepairCheckList',
-                        data: {
-                            sWhere: "",
-                            user: uni.getStorageSync('HUserName'),
-                        }
-                    })
+				if (this.hform.HMouldID == 0) {
+					return {
+						Message: "鏈綍鍏ュ櫒鍏蜂俊鎭紝璇峰厛褰曞叆鍣ㄥ叿淇℃伅!",
+						state: false
+					}
+				}
+				if (this.hform.HDeptID == 0) {
+					return {
+						Message: "閮ㄩ棬涓嶅緱涓虹┖!",
+						state: false
+					}
+				}
+				if (this.hform.HEmpID == 0) {
+					return {
+						Message: "缁翠慨浜轰笉寰椾负绌�!",
+						state: false
+					}
+				}
+				if (this.hform.HRepairID == 0) {
+					return {
+						Message: "缁翠慨椤圭洰涓嶅緱涓虹┖!",
+						state: false
+					}
+				}
+				if (this.hform.HManagerID == 0) {
+					return {
+						Message: "涓荤涓嶅緱涓虹┖!",
+						state: false
+					}
+				}
+				if (this.hform.HPlanTimes == '') {
+					return {
+						Message: "璁″垝缁翠慨宸ユ椂涓嶅緱涓虹┖!",
+						state: false
+					}
+				}
+				if (this.hform.HTimes == '') {
+					return {
+						Message: "瀹為檯缁翠慨宸ユ椂涓嶅緱涓虹┖!",
+						state: false
+					}
+				}
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        this.HRepairCheckList = data
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: Message
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: err
-                    })
-                }
-            },
-            toScanCode() {
-                MpaasScan.scanCode(cb => {
-                    this.hfrom.HBarCode = cb
-                    this.GetMessageByBarCode(cb)
-                })
-            },
-            async GetMessageByBarCode(HBarCode) {
-                try {
-                    let res = await CommonUtils.doRequest2Sync({
-                        url: "/Sc_PDA_MouldRepairCheckBill/txtHBarCode_KeyDown_List",
-                        data: {
-                            HBarCode: HBarCode,
-                        },
-                    })
+				return {
+					Message: "",
+					state: true
+				}
+			},
+			addNew() {
+				uni.redirectTo({
+					url: './Sc_MouldRepairSendWorkBill?operationType=1'
+				})
+			},
+			goBack() {
+				uni.navigateBack()
+			},
+			checkBoxChangeHandler(index, e) {
+				let cr = e.detail.value
+				if (cr.length == 0) {
+					this.HCheckFileList[index]["HDotCheckResult"] = false
+				} else {
+					this.HCheckFileList[index]["HDotCheckResult"] = true
+				}
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			async getHDeptList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Gy_Department/list',
+						data: {
+							sWhere: ` and HUSEORGID = ${uni.getStorageSync('OrganizationID')}`,
+							user: uni.getStorageSync('HUserName'),
+							Organization: uni.getStorageSync('Organization')
+						}
+					})
 
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HDeptList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			// 鑾峰彇鑱屽憳鏁版嵁
+			async getEmpList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/PublicPageMethod/UserList',
+						data: {
+							sWhere: " where 1=1",
+						}
+					})
 
-                    if (!res) {
-                        return
-                    }
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HEmpList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			// 鑾峰彇楠岃瘉椤圭洰鏁版嵁
+			async getCheckProjList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Gy_RepairCheck/GetRepairCheckList',
+						data: {
+							sWhere: "",
+							user: uni.getStorageSync('HUserName'),
+						}
+					})
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HRepairCheckList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			toScanCode() {
+				MpaasScan.scanCode(cb => {
+					this.hform.HBarCode = cb
+					this.GetMessageByBarCode(cb)
+				})
+			},
+			async GetMessageByBarCode(HBarCode) {
+				try {
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Sc_PDA_MouldRepairCheckBill/txtHBarCode_KeyDown_List",
+						data: {
+							HBarCode: HBarCode,
+						},
+					})
 
-                    if (count == 1) {
-                        console.log('data: ', data);
-                        this.hform.HMouldID = data[0].hmainid
-                        this.hform.HMouldName = data[0].妯″叿鍚嶇О
-                        this.hform.HMouldSpec = data[0].妯″叿鍝佺被
-                        this.hform.HMouldModel = data[0].妯″叿鍨嬪彿
-                        this.hform.HQty = 1
+					if (!res) {
+						return
+					}
 
-                        this.enableEdit = false
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: Message
-                        })
-                    }
+					let {
+						data,
+						count,
+						Message
+					} = res.data
 
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: err
-                    })
-                }
-            },
-            async GetItemByEquipFile() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Web/GetItemByEquipFile",
-                        data: {
-                            "EquipProjectID": this.hform.HEquipID,
-                            "Type": "DJ",
-                            "HDate": this.hform.HBeginDate
-                        }
-                    })
+					if (count == 1) {
+						console.log('data: ', data);
+						this.hform.HMouldID = data[0].hmainid
+						this.hform.HMouldName = data[0].妯″叿鍚嶇О
+						this.hform.HMouldSpec = data[0].妯″叿鍝佺被
+						this.hform.HMouldModel = data[0].妯″叿鍨嬪彿
+						this.hform.HQty = 1
 
-                    let {
-                        data,
-                        Message,
-                        count
-                    } = res.data
-                    if (count == 1) {
-                        this.hform.HEquipDotCheckRuleInterID = data[0].鐐规瑙勭▼ID
-                        this.hform.HEquipDotCheckRuleInterNo = data[0].鐐规瑙勭▼鍗曞彿
-                        this.hform.HPlanNo = data[0].鐐规璁″垝鍗�
-                        this.hform.HPlanInterID = (data[0].鐐规璁″垝ID == null ? 0 : data[0].鐐规璁″垝ID) == "" ? 0 : data[0]
-                            .鐐规璁″垝ID
-                        this.hform.HPlanEntryID = (data[0].鐐规璁″垝瀛怚D == null ? 0 : data[0].鐐规璁″垝瀛怚D) == "" ? 0 : data[
-                            0].鐐规璁″垝瀛怚D
+						this.enableEdit = false
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: Message
+						})
+					}
 
-                        this.HCheckFileList = Array.from(data).map(item => {
-                            return {
-                                "HDotCheckItemID": item.HDotCheckItemID,
-                                "HDotCheckCode": item.鐐规椤圭洰浠ｇ爜,
-                                "HDotCheckItem": item.鐐规椤圭洰,
-                                "HDotCheckPart": item.鐐规閮ㄤ綅,
-                                "HClaim": item.鍏蜂綋瑕佹眰,
-                                "HManagerID": item.璐熻矗浜篒D,
-                                "HManagerCode": item.璐熻矗浜轰唬鐮�,
-                                "HManagerName": item.璐熻矗浜哄悕绉�,
-                                "HSourceInterID": item.鐐规璁″垝ID == null ? 0 : item.鐐规璁″垝ID,
-                                "HSourceEntryID": item.鐐规璁″垝瀛怚D == null ? 0 : item.鐐规璁″垝瀛怚D,
-                                "HSourceBillNo": item.鐐规璁″垝鍗�,
-                                "HDotCheckItemClassID": 0,
-                                "HDotCheckItemClassName": "",
-                                "HDotCheckItemMethodID": 0,
-                                "HDotCheckItemMethodName": "",
-                                "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
-                            }
-                        })
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: err
+					})
+				}
+			},
+			async GetItemByEquipFile() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Web/GetItemByEquipFile",
+						data: {
+							"EquipProjectID": this.hform.HEquipID,
+							"Type": "DJ",
+							"HDate": this.hform.HBeginDate
+						}
+					})
 
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${Message}`
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
-                    })
-                }
-            },
-            radioChange({
-                detail: {
-                    value
-                }
-            }) {
-                this.hform.HCheckResult = value
-            },
-            async getMaxNum() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Web/GetMAXNum",
-                        data: {
-                            "HBillType": this.HBillType
-                        }
-                    })
+					let {
+						data,
+						Message,
+						count
+					} = res.data
+					if (count == 1) {
+						this.hform.HEquipDotCheckRuleInterID = data[0].鐐规瑙勭▼ID
+						this.hform.HEquipDotCheckRuleInterNo = data[0].鐐规瑙勭▼鍗曞彿
+						this.hform.HPlanNo = data[0].鐐规璁″垝鍗�
+						this.hform.HPlanInterID = (data[0].鐐规璁″垝ID == null ? 0 : data[0].鐐规璁″垝ID) == "" ? 0 : data[0]
+							.鐐规璁″垝ID
+						this.hform.HPlanEntryID = (data[0].鐐规璁″垝瀛怚D == null ? 0 : data[0].鐐规璁″垝瀛怚D) == "" ? 0 : data[
+							0].鐐规璁″垝瀛怚D
 
-                    let {
-                        count,
-                        data,
-                        Message
-                    } = res.data
-                    console.log('data: ', data);
-                    this.hform.HInterID = data[0]["HInterID"]
-                    this.hform.HBillNo = data[0]["HBillNo"]
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
-                    })
-                }
-            },
-            async submit() {
-                let valid = this.ValidCheck()
-                if (!valid.state) {
-                    CommonUtils.showTips({
-                        message: valid.Message
-                    })
-                    return
-                }
+						this.HCheckFileList = Array.from(data).map(item => {
+							return {
+								"HDotCheckItemID": item.HDotCheckItemID,
+								"HDotCheckCode": item.鐐规椤圭洰浠ｇ爜,
+								"HDotCheckItem": item.鐐规椤圭洰,
+								"HDotCheckPart": item.鐐规閮ㄤ綅,
+								"HClaim": item.鍏蜂綋瑕佹眰,
+								"HManagerID": item.璐熻矗浜篒D,
+								"HManagerCode": item.璐熻矗浜轰唬鐮�,
+								"HManagerName": item.璐熻矗浜哄悕绉�,
+								"HSourceInterID": item.鐐规璁″垝ID == null ? 0 : item.鐐规璁″垝ID,
+								"HSourceEntryID": item.鐐规璁″垝瀛怚D == null ? 0 : item.鐐规璁″垝瀛怚D,
+								"HSourceBillNo": item.鐐规璁″垝鍗�,
+								"HDotCheckItemClassID": 0,
+								"HDotCheckItemClassName": "",
+								"HDotCheckItemMethodID": 0,
+								"HDotCheckItemMethodName": "",
+								"HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
+							}
+						})
 
-                try {
-                    let oMain = JSON.stringify(this.hform);
-                    this.HDetailList[0].HManagerID = this.hform.HManagerID
-                    this.HDetailList[0].HRepairID = this.hform.HRepairID
-                    let sSubStr = JSON.stringify(this.HDetailList);
-                    let sMainSub = oMain + ';' + sSubStr + `;${this.operationType}` + ';' + getUserInfo()[
-                        'Czymc'];
-                    let res = await CommonUtils.doRequest2Sync({
-                        url: "/Sc_MouldRepairSendWorkBill/AddBill",
-                        data: {
-                            "sMainSub": sMainSub
-                        },
-                        method: "POST"
-                    })
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${Message}`
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
+					})
+				}
+			},
+			radioChange({
+				detail: {
+					value
+				}
+			}) {
+				this.hform.HCheckResult = value
+			},
+			async getMaxNum() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Web/GetMAXNum",
+						data: {
+							"HBillType": this.HBillType
+						}
+					})
 
-                    if (!res) {
-                        return
-                    }
+					let {
+						count,
+						data,
+						Message
+					} = res.data
+					console.log('data: ', data);
+					this.hform.HInterID = data[0]["HInterID"]
+					this.hform.HBillNo = data[0]["HBillNo"]
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+					})
+				}
+			},
+			async submit() {
+				let valid = this.ValidCheck()
+				if (!valid.state) {
+					CommonUtils.showTips({
+						message: valid.Message
+					})
+					return
+				}
 
-                    let {
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        uni.showModal({
-                            title: '鎻愮ず',
-                            content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
-                            success: (res) => {
-                                if (res.confirm) {
-                                    console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-                                    uni.redirectTo({
-                                        url: './Sb_EquipRepairSendWorkBill?operationType=1'
-                                    })
-                                } else if (res.cancel) {
-                                    console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                                    setTimeout(() => {
-                                        uni.navigateBack();
-                                    }, 50)
-                                }
-                            }
-                        });
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: "鎻愪氦鍗曟嵁澶辫触: " + Message
-                        })
-                    }
+				try {
+					let oMain = JSON.stringify(this.hform);
+					this.HDetailList[0].HManagerID = this.hform.HManagerID
+					this.HDetailList[0].HRepairID = this.hform.HRepairID
+					let sSubStr = JSON.stringify(this.HDetailList);
+					let sMainSub = oMain + ';' + sSubStr + `;${this.operationType}` + ';' + getUserInfo()[
+						'Czymc'];
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Sc_MouldRepairSendWorkBill/AddBill",
+						data: {
+							"sMainSub": sMainSub
+						},
+						method: "POST"
+					})
 
+					if (!res) {
+						return
+					}
 
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: "鎻愪氦鍗曟嵁澶辫触: " + err
-                    })
-                }
-            }
-        },
-        onLoad(e) {
-            console.log('e: ', e);
-            if (!e.operationType) {
-                this.operationType = 1
-            } else {
-                this.operationType = e.operationType
-            }
+					let {
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						uni.showModal({
+							title: '鎻愮ず',
+							content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+							success: (res) => {
+								if (res.confirm) {
+									console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+									uni.redirectTo({
+										url: './Sc_MouldRepairSendWorkBill?operationType=1'
+									})
+								} else if (res.cancel) {
+									console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+									setTimeout(() => {
+										uni.navigateBack();
+									}, 50)
+								}
+							}
+						});
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+						})
+					}
 
-            if (this.operationType == 1) {
-                // 鏂板
-                this.getMaxNum()
-            } else if (this.operationType == 2) {
-                // 澶嶅埗
-            } else if (this.operationType == 3) {
-                // 缂栬緫
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鎻愪氦鍗曟嵁澶辫触: " + err
+					})
+				}
+			}
+		},
+		onLoad(e) {
+			console.log('e: ', e);
+			if (!e.operationType) {
+				this.operationType = 1
+			} else {
+				this.operationType = e.operationType
+			}
 
-            } else if (this.operationType == 4) {
-                // 娴忚
+			if (this.operationType == 1) {
+				// 鏂板
+				this.getMaxNum()
+			} else if (this.operationType == 2) {
+				// 澶嶅埗
+			} else if (this.operationType == 3) {
+				// 缂栬緫
 
-            }
+			} else if (this.operationType == 4) {
+				// 娴忚
 
-            this.getHDeptList()
-            this.getEmpList()
-            this.getCheckProjList()
-            this.getRepairList()
-        },
-        onReady() {
-            const query = uni.createSelectorQuery().in(this)
-            query.select("#buttons")
-                .boundingClientRect()
-                .select("#tabs")
-                .boundingClientRect()
-                .exec(res => {
-                    this.btnTop = Math.floor(res[0].top)
-                    this.tabsBottom = Math.ceil(res[1].bottom)
-                })
-        }
-    }
+			}
+
+			this.getHDeptList()
+			this.getEmpList()
+			this.getCheckProjList()
+			this.getRepairList()
+			this.loadCache() // 鏂板锛氬姞杞界紦瀛�
+
+			// 鏂板锛氱洃鍚崟鎹�夋嫨瀹屾垚浜嬩欢
+			uni.$on('BillSelectComplete', (e) => {
+				console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
+				this.hform.HMainSourceInterID = e.HInterID
+				this.hform.HMainSourceBillNo = e.HBillNo
+				this.hform.HMainSourceEntryID = e.HEntryID
+				this.hform.HMouldID = e.HMouldID
+				this.hform.HMouldName = e.HMouldName
+				this.hform.HMouldSpec = e.HMouldSpec
+				this.hform.HMouldModel = e.HMouldModel
+				// 濡傛灉閫夋嫨鍗曟嵁鏃跺甫浜嗘潯鐮侊紝涔熻缃潯鐮�
+				if (e.HBarCode) {
+					this.hform.HBarCode = e.HBarCode
+				}
+				this.$refs.billList.exit()
+			})
+		},
+		onUnload() {
+			uni.$off('BillSelectComplete') // 鏂板锛氱Щ闄や簨浠剁洃鍚�
+		},
+		onReady() {
+			const query = uni.createSelectorQuery().in(this)
+			query.select("#buttons")
+				.boundingClientRect()
+				.select("#tabs")
+				.boundingClientRect()
+				.exec(res => {
+					this.btnTop = Math.floor(res[0].top)
+					this.tabsBottom = Math.ceil(res[1].bottom)
+				})
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-    @import "@/pages/MJGL/style/MJBillStyle.scss"
+	@import "@/pages/MJGL/style/MJBillStyle.scss";
+
+	.picker-overlay {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 1;
+	}
+
+	.icon-wrapper {
+		background-color: #3A78FF;
+		width: 52rpx;
+		height: 52rpx;
+		border-radius: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+
+		.uni-icons {
+			color: #fff !important;
+		}
+	}
+
+	.icon-wrapper[disabled] {
+		background-color: rgba(228, 228, 228, 1);
+		pointer-events: none;
+		touch-action: none;
+	}
+
+	.required {
+		position: relative;
+	}
+
+	.required::after {
+		content: "*";
+		position: relative;
+		color: red;
+		left: 0;
+		top: 0;
+		font-size: inherit;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/weixiujilu/mouldRepairRecordBill.vue b/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
similarity index 97%
rename from pages/weixiujilu/mouldRepairRecordBill.vue
rename to pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
index b6e167a..6d8ca18 100644
--- a/pages/weixiujilu/mouldRepairRecordBill.vue
+++ b/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
@@ -271,13 +271,13 @@
     } from "@/utils/auth.js";
     import {
         CommonUtils
-    } from '../../utils/common';
+    } from '../../../utils/common';
     import {
         getUserStockRelation
-    } from '../../utils/userRelationManager';
-    import BillListPopupMouldConkBookBillVue from '../../components/BillListPopup/BillListPopupMouldConkBookBill.vue';
-    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
-	import BillListPopupMouldVue from '../../components/BillListPopup/BillListPopup_Mould.vue';
+    } from '../../../utils/userRelationManager';
+    import BillListPopupMouldConkBookBillVue from '../../../components/BillListPopup/BillListPopupMouldConkBookBill.vue';
+    import BarCodePopupVue from "../../../components/BarCodePopup/BarCodePopup.vue";
+	import BillListPopupMouldVue from '../../../components/BillListPopup/BillListPopup_Mould.vue';
     import dayjs from 'dayjs';
     export default {
         components: {
@@ -306,9 +306,9 @@
                 barCodeFocus: false,
 
                 tabs: 0,
-                HMainSourceBillType: '鎵嬪伐褰曞叆',
-                arrayHMainSourceBillType: ['鎵嬪伐褰曞叆', '妯″叿鏁呴殰鐧昏鍗�'],
-                arrayHMainSourceBillTypeID: ['1', '3815'],
+                HMainSourceBillType: '妯″叿鏁呴殰鐧昏鍗�',
+                arrayHMainSourceBillType: ['妯″叿鏁呴殰鐧昏鍗�'],
+                arrayHMainSourceBillTypeID: ['3815'],
                 arrayRepairType: ["鍐呴儴缁翠慨", "濮斿缁翠慨"],
 
                 linterid: '',
@@ -342,7 +342,7 @@
                 hform: {
                     "HBillType": 3807,
                     "HBarCode": "",
-                    "HMainSourceBillType": "1",
+                    "HMainSourceBillType": 3815,
                     "HMainSourceBillNo": "",
                     "HMainSourceInterID": "0",
                     "HMainSourceEntryID": "0",
@@ -1081,13 +1081,13 @@
                                 if (res.confirm) {
                                     console.log('鐢ㄦ埛鐐瑰嚮纭畾');
                                     uni.redirectTo({
-                                        url: '/pages/weixiujilu/mouldRepairRecordBill?OperationType=1'
+                                        url: '/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill?OperationType=1'
                                     })
                                 } else if (res.cancel) {
                                     console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                                    // setTimeout(() => {
-                                    // 	uni.navigateBack();
-                                    // }, 50)
+                                    setTimeout(() => {
+                                    	uni.navigateBack();
+                                    }, 50)
                                 }
                             }
                         });
diff --git a/pages/weixiujilu/mouldRepairRecordBillList.vue b/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBillList.vue
similarity index 97%
rename from pages/weixiujilu/mouldRepairRecordBillList.vue
rename to pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBillList.vue
index 694bd21..fd2b172 100644
--- a/pages/weixiujilu/mouldRepairRecordBillList.vue
+++ b/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBillList.vue
@@ -195,10 +195,10 @@
 <script>
     import {
         CommonUtils
-    } from '../../utils/common'
+    } from '../../../utils/common'
     import {
         getUserInfo
-    } from '../../utils/auth'
+    } from '../../../utils/auth'
     import dayjs, {
         Dayjs
     } from 'dayjs'
@@ -247,7 +247,7 @@
             },
             cmdAdd() {
                 uni.navigateTo({
-                    url: "/pages/weixiujilu/mouldRepairRecordBill?operationType=1"
+                    url: "/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill?operationType=1"
                 })
             },
             async cmdSearch() {
@@ -360,13 +360,7 @@
                 })
 
 
-            },
-            edit(item) {
-                console.log("editItem:", item)
-                uni.navigateTo({
-                    url: `/pages/weixiujilu/mouldRepairRecordBill?operationType=2&linterid=${item.hmainid}&hsubid=${item.hsubid}`
-                })
-            }
+            },           
         },
         onLoad() {
 
diff --git a/pages/MJGL/Sc_OEEStatusReport/Sc_OEEStatusReport.vue b/pages/MJGL/Sc_OEEStatusReport/Sc_OEEStatusReport.vue
new file mode 100644
index 0000000..a1703ba
--- /dev/null
+++ b/pages/MJGL/Sc_OEEStatusReport/Sc_OEEStatusReport.vue
@@ -0,0 +1,313 @@
+<template>
+    <view>
+        <view class="tabs" id="tabs">
+            <view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">寰呯淮淇�</view>
+            <view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">宸茬淮淇�</view>
+            <!-- <view :class="tabs == 2 ? 'on':''" @tap="switchTab(2)">鍏ㄩ儴浠诲姟</view> -->
+        </view>
+
+        <!-- 璁惧缁翠慨浠诲姟鍒楄〃鍒楄〃 -->
+        <view v-show="tabs == 0">
+            <view class="list" v-for="(item,index) in reportBillsDisplay" :key="index">
+                <uni-card :title="item.鏁呴殰鐧昏鍗曞彿" :extra="`鏃ユ湡: ${dayjs(item.璁惧鏁呴殰鏃ユ湡).format('YYYY-MM-DD')}`"
+                    style="margin: 10px;">
+                    <view class="card-detail">
+                        <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
+                            :key="index">
+                            <text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
+                        </view>
+                    </view>
+                </uni-card>
+            </view>
+            <view class="over" v-if="reportBillsDisplay.length == 0">鏆傛棤鏁版嵁</view>
+        </view>
+        <!-- OEE 鎶樼嚎鍥� -->
+        <view v-show="tabs == 1" class="graph-container" style="padding: 40rpx 0; text-align: center;">
+            <view class="graph"><l-echart ref="chartRef" @finished="initChart()"></l-echart>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import {
+        getUserInfo
+    } from '../../../utils/auth';
+    import {
+        CommonUtils
+    } from '../../../utils/common';
+    import dayjs from 'dayjs';
+    import * as echarts from 'echarts'
+    export default {
+        // 璁惧鐘舵�� 妯″潡
+        name: 'Sc_OEEStatusReport',
+        data() {
+            return {
+                dayjs,
+                CommonUtils,
+                tabs: 0,
+                HEquipID: 0,
+                HEquipNumber: "",
+                reportBillsDisplay: [],
+                reportBills: [], // 寰呯淮淇�
+                HFieldList: [], // 瀛楁鍒楄〃
+            }
+        },
+        methods: {
+            switchTab(tabIndex) {
+                this.tabs = tabIndex
+                switch (tabIndex) {
+                    case 0:
+                        this.reportBillsDisplay = this.reportBills;
+                        break;
+                        // case 1:
+                        //     this.reportBillsDisplay = this.reportBillsRepaired;
+                        //     break;
+                        // case 2:
+                        //     this.reportBillsDisplay = this.reportBillsAll;
+                        //     break;
+                }
+            },
+            async getEquipFileMain(HInterID) {
+                try {
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_ListByHEquipID",
+                        data: {
+                            HEquipID: HInterID,
+                        },
+                    })
+
+
+                    if (!res) {
+                        return
+                    }
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+
+                    if (count == 1) {
+                        console.log('data: ', data);
+                        // this.hform.HQty = 1
+                        this.HEquipID = data[0]["hmainid"]
+                        this.HEquipNumber = data[0]["璁惧缂栫爜"]
+                        this.enableEdit = false
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: Message
+                        })
+                    }
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: err
+                    })
+                }
+            },
+            async getReportList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Sc_OEEReport/list',
+                        data: {
+                            sWhere: `4,'${this.HEquipNumber}','','','','${dayjs(new Date()).subtract(2, 'weeks').format("YYYY-MM-DD")}', '${dayjs(new Date()).format("YYYY-MM-DD")}'`,
+                            user: getUserInfo()["Czymc"]
+                        }
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message,
+                        list
+                    } = res.data
+                    if (count == 1) {
+                        // console.log('data: ', data);
+                        this.reportBills = data
+
+                        let fieldList = CommonUtils.fieldListFilterRole({
+                            ExcludeKeys: ['璁惧缂栫爜'],
+                            FieldList: list
+                        })
+
+                        if (fieldList.status == false) {
+                            CommonUtils.showTips({
+                                title: '娓╅Θ鎻愮ず',
+                                message: `鑾峰彇琛ㄥ崟缁撴瀯澶辫触: ${fieldList.Message}`
+                            })
+                        }
+
+                        this.HFieldList = fieldList.data
+
+                        this.switchTab(0)
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鑾峰彇璁惧OEE寮傚父: ${Message}`
+                        })
+                    }
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鑾峰彇缁翠慨鍗曞紓甯�: ${err}`
+                    })
+                }
+            },
+            async initChart() {
+                let option_ZZT1 = {}
+                var H_X1 = []; //X杞存爣棰�
+                var HOEE = []; //璁惧OEE
+                var PerformanceUtilizationRate = []; //鎬ц兘绋煎姩鐜�
+                var TimeUtilizationRate = []; //鏃堕棿绋煎姩鐜�
+                var HTitle = "璁惧OEE"; //鍥惧舰鏍囬
+                if (this.reportBills.length > 0) {
+                    for (let i = 0; i < this.reportBills.length; i++) {
+                        H_X1.push(this.reportBills[i].鏃ユ湡);
+                    }
+                    // 濉厖鏁版嵁
+                    for (let i = 0; i < this.reportBills.length; i++) {
+
+                        HOEE.push((this.reportBills[i].OEE).replace('%', ''));
+                        PerformanceUtilizationRate.push((this.reportBills[i].鎬ц兘绋煎姩鐜�).replace('%', ''));
+                        TimeUtilizationRate.push((this.reportBills[i].鏃堕棿绋煎姩鐜�).replace('%', ''));
+                    }
+                }
+                option_ZZT1 = {
+                    title: {
+                        text: HTitle,
+                        left: 'center'
+                    },
+                    tooltip: {
+                        trigger: 'axis',
+                        formatter: function(params) {
+                            let tooltipHtml = params[0].axisValue + '<br>'; // X杞存暟鍊�
+
+                            params.forEach(function(item) {
+                                let valueToShow = parseFloat(item.value); // 灏嗗瓧绗︿覆杞崲涓烘暟鍊�
+                                tooltipHtml += item.seriesName + ': ' + valueToShow.toFixed(3) +
+                                    '%' + '<br>'; // Y杞存暟鍊硷紝骞舵坊鍔犵櫨鍒嗗彿
+                            });
+
+                            return tooltipHtml;
+                        }
+                    },
+                    legend: {
+                        data: ['OEE', '鎬ц兘绋煎姩鐜�', '鏃堕棿绋煎姩鐜�'],
+                        top: 'bottom',
+                        left: 'center'
+                    },
+                    toolbox: {
+                        show: false,
+                        orient: 'vertical',
+                        left: 'right',
+                        top: 'center',
+                        feature: {
+                            mark: {
+                                show: true
+                            },
+                            dataView: {
+                                show: true,
+                                readOnly: false
+                            },
+                            magicType: {
+                                show: true,
+                                type: ['line', 'bar', 'stack']
+                            },
+                            restore: {
+                                show: true
+                            },
+                            saveAsImage: {
+                                show: true
+                            }
+                        }
+                    },
+                    xAxis: [{
+                        type: 'category',
+                        axisTick: {
+                            show: false
+                        },
+                        data: H_X1
+                    }],
+                    yAxis: [{
+                        type: 'value',
+                        axisLabel: {
+                            formatter: '{value} %'
+                        }
+                    }],
+                    series: [{
+                            name: 'OEE',
+                            type: 'line',
+                            label: {
+                                show: true,
+                                formatter: '{c}%'
+                            },
+                            itemStyle: {
+                                normal: {
+                                    lineStyle: {
+                                        color: '#00FF00' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+                                    },
+                                    color: '#00FF00' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+                                }
+                            },
+                            data: HOEE
+                        },
+                        {
+                            name: '鎬ц兘绋煎姩鐜�',
+                            type: 'line',
+                            label: {
+                                show: true,
+                                formatter: '{c}%'
+                            },
+                            itemStyle: {
+                                normal: {
+                                    lineStyle: {
+                                        color: '#FF0000' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹测��
+                                    },
+                                    color: '#FF0000' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+                                }
+                            },
+                            data: PerformanceUtilizationRate
+                        },
+                        {
+                            name: '鏃堕棿绋煎姩鐜�',
+                            type: 'line',
+                            label: {
+                                show: true,
+                                formatter: '{c}%'
+                            },
+                            itemStyle: {
+                                normal: {
+                                    lineStyle: {
+                                        color: '#00FFFF' // 璁剧疆绾挎潯棰滆壊涓洪潚鑹�
+                                    },
+                                    color: '#00FFFF' // 璁剧疆绾挎潯棰滆壊涓洪潚鑹�
+                                }
+                            },
+                            data: TimeUtilizationRate
+                        }
+                    ]
+                };
+                // chart 鍥捐〃瀹炰緥涓嶈兘瀛樺湪data閲�
+                const chart = await this.$refs.chartRef.init(echarts);
+                chart.setOption(option_ZZT1)
+            }
+        },
+        async onLoad(e) {
+            if (e.HEquipID) {
+                await this.getEquipFileMain(e.HEquipID)
+                await this.$nextTick()
+                await this.getReportList()
+                await this.initChart()
+
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    @import "@/pages/MJGL/style/MJBillStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sc_WorkDotCheck/Sc_WorkDotCheckBillList_Day.vue b/pages/MJGL/Sc_WorkDotCheck/Sc_WorkDotCheckBillList_Day.vue
new file mode 100644
index 0000000..1163308
--- /dev/null
+++ b/pages/MJGL/Sc_WorkDotCheck/Sc_WorkDotCheckBillList_Day.vue
@@ -0,0 +1,203 @@
+<template>
+    <view class="content">
+        <view id="divide" style="width: 100%;height: 0rpx;background-color: #e5e5e5;"></view>
+        <view :style="{
+            height: calcContentHeight + 'px',
+            overflowY: 'auto'
+        }">
+            <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+                <uni-card :title="item.妫�鏌ラ」鐩�" style="margin: 10px;">
+                    <view class="card-detail">
+                        <view class="detail" style="width: 25%; justify-content: left;" v-for="(field, index)  in HFieldList" :key="index">
+                            <text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
+                        </view>
+                    </view>
+                </uni-card>
+            </view>
+        </view>
+        <view class="pagination-zone" id="pagination-zone">
+            <uni-pagination show-icon :page-size="size" :total="dataLength" :current="page"
+                @change="onPaginationChangeHandler"></uni-pagination>
+        </view>
+        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+    </view>
+</template>
+
+<script>
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import BarCodePopupVue from "@/components/BarCodePopup/BarCodePopup.vue";
+    import {
+        CommonUtils
+    } from "../../../utils/common";
+    import dayjs from "dayjs";
+    export default {
+        data() {
+            return {
+                dayjs,
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                tabs: 0,
+                urls: '/Sc_WorkBeginDotCheckBill/get锘縎c_WorkDotCheckList_Day',
+                MvarReportTitle: '璁惧鏈堢偣妫�璁板綍',
+                hform: {
+                    HInterId: 0,
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    Type: "璁惧",
+                    sWhere: "",
+                },
+                sWhere: '',
+                listData: [],
+                showList: [],
+                HFieldList: [], // 瀛楁鍒楄〃
+                showDetail: -1,
+                operations: -1,
+
+                page: 1,
+                size: 20,
+                dataLength: 0,
+                divideBottom: 0,
+                paginationTop: 0,
+                showmore: false,
+            }
+        },
+        computed: {
+            calcContentHeight: {
+                get() {
+                    return this.paginationTop - this.divideBottom
+                }
+            }
+        },
+        onShow() {
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            this.changeTab(0)
+            console.log(this.userInfo, uni.getStorageSync('HUserName'))
+        },
+        components: {
+            BarCodePopupVue
+        },
+        onReady() {
+            this.getCalcHeight()
+        },
+        methods: {
+            changeShowMore() {
+                this.showmore = !this.showmore
+                this.$nextTick(() => {
+                    // 閲嶆柊璁＄畻鍐呭瑙嗗彛楂樺害
+                    this.getCalcHeight()
+                })
+            },
+            getCalcHeight() {
+                let query = uni.createSelectorQuery().in(this)
+                query
+                    .select("#divide")
+                    .boundingClientRect()
+                    .select("#pagination-zone")
+                    .boundingClientRect()
+                    .exec(res => {
+                        this.divideBottom = Math.ceil(res[0].bottom)
+                        this.paginationTop = Math.floor(res[1].top)
+                    })
+            },
+            async qrCodeDisplay(item) {
+                this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+                await this.$nextTick()
+                this.$refs.barcodePopup.open()
+            },
+            onPaginationChangeHandler({
+                current
+            }) {
+                this.page = current
+                this.showList = this.getPage(current, this.size, this.listData)
+            },
+            getPage(page, size, list) {
+                let sindex = (parseInt(page) - 1) * size
+                let eindex = parseInt(page) * size
+                let newList = list.slice(sindex, eindex)
+                return newList
+            },
+            changeTab(e) {
+                this.tabs = e
+                this.page = 1
+                this.showList = []
+
+                if (this.tabs == 0) {
+                    this.urls = '/Sc_WorkBeginDotCheckBill/get锘縎c_WorkDotCheckList_Day'
+                }
+                // if (this.tabs == 1) {
+                // 	this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+                // }
+                this.search()
+            },
+            async getList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: this.urls,
+                        data: this.hform
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message,
+                        list
+                    } = res.data
+
+                    if (count == 1) {
+                        if (data == null) {
+                            data = []
+                        }
+                        this.listData = data
+                        console.log('data: ', data);
+                        this.showList = this.getPage(this.page, this.size, data)
+                        this.dataLength = data.length
+                        this.HFieldList = CommonUtils.fieldListFilterRole({
+                            FieldList: list,
+                            ExcludeKeys: ["妫�鏌ラ」鐩�"]
+                        }).data
+                        
+                        console.log('this.HFieldList: ',this.HFieldList);
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鑾峰彇鐐规璁板綍澶辫触: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鑾峰彇鐐规璁板綍澶辫触: ${err}`
+                    })
+                }
+
+            },
+            search() {
+                this.hform.sWhere = ''
+                this.listData = []
+                this.page = 1
+                this.showList = []
+                
+                this.hform.sWhere = {
+                    Type: this.hform.Type,
+                    HInterId: this.hform.HInterId
+                }
+                
+                this.getList()
+            },
+        },
+        onLoad(e) {
+            let {operationType, HEquipID} = e
+            
+            this.hform.Type = operationType
+            this.hform.HInterId = HEquipID
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJListStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue b/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue
index 792f7d2..627130a 100644
--- a/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue
+++ b/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue
@@ -346,8 +346,8 @@
 					HBillNo: "",
 					HInterID: 0,
 					HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
-					HDeptName: "",
-					HDeptID: 0,
+					HDeptName: getUserInfo().HDeptName,
+					HDeptID: getUserInfo().HDeptID,
 					HRemark: "",
 					HBarName: "",
 					HMouldID: 0,
@@ -448,10 +448,11 @@
 			async getShiftList() {
 				try {
 					let res = await CommonUtils.doRequest2Async({
-						url: '/Web/GetGy_ShiftsList_Json',
+						url: '/Gy_ShiftsController/Get_Gy_WorkShiftList',
 						data: {
-							Shifts: "",
-						}
+							sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'')  != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}'`,
+							HMaker: getUserInfo()["Czymc"],
+						},
 					})
 
 					let {
@@ -558,16 +559,18 @@
 						count
 					} = res.data
 					if (count == 1) {
-						this.hform.HMouldDotCheckRuleID = data[0].HMouldDotCheckRuleID
-						this.hform.HMouldDotCheckRuleNo = data[0].HMouldDotCheckRuleNo
+						this.hform.HMouldDotCheckRuleNo = data[0].HBillNo
+						this.hform.HMouldDotCheckRuleID = data[0].HInterID
 						this.hform.HPlanNo = data[0].鍗曟嵁鍙�
-						this.hform.HPlanInterID = (data[0].hmainid == null ? 0 : data[0].hmainid) == "" ? 0 : data[0].hmainid
-						this.hform.HPlanEntryID = (data[0].HEntryID == null ? 0 : data[0].HEntryID) == "" ? 0 : data[0].HEntryID
+						this.hform.HPlanInterID = (data[0].hmainid == null ? 0 : data[0].hmainid) == "" ? 0 : data[0]
+							.hmainid
+						this.hform.HPlanEntryID = (data[0].HEntryID == null ? 0 : data[0].HEntryID) == "" ? 0 : data[0]
+							.HEntryID
 
 						this.HCheckFileList = Array.from(data).map(item => {
 							return {
-								"HDotCheckItemID": item.鐐规椤圭洰ID,
-								"HDotCheckItem": item.鐐规椤圭洰鍚嶇О,
+								"HDotCheckItemID": item.HDotCheckItemID,
+								"HDotCheckItem": item.鐐规椤圭洰,
 								"HDotCheckPart": item.鐐规閮ㄤ綅,
 								"HClaim": item.鍏蜂綋瑕佹眰,
 								"HManagerID": item.璐熻矗浜篒D,
@@ -575,14 +578,14 @@
 								"HSourceInterID": item.hmainid == null ? 0 : item.hmainid,
 								"HSourceEntryID": item.HEntryID == null ? 0 : item.HEntryID,
 								"HSourceBillNo": item.鍗曟嵁鍙�,
-								"HDotCheckItemClassID": item.鐐规椤圭洰鍒嗙被id || 0,
-								"HDotCheckItemClassName": item.鐐规椤圭洰鍒嗙被 || "",
+								"HDotCheckItemClassID": item.HDotCheckItemClassID || 0,
+								"HDotCheckItemClassName": item.鐐规椤圭洰鍒嗙被鍚嶇О || "",
 								"HDotCheckItemMethodID": item.鐐规鏂规硶id || 0,
 								"HDotCheckItemMethodName": item.鐐规鏂规硶 || "",
 								"HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
 							}
 						})
-
+						this.tabs = 1
 					} else {
 						CommonUtils.showTips({
 							title: '娓╅Θ鎻愮ず',
@@ -669,8 +672,10 @@
 									"HSourceInterID": (item.鐐规璁″垝ID == null ? 0 : item.鐐规璁″垝ID) || 0,
 									"HSourceEntryID": (item.鐐规璁″垝瀛怚D == null ? 0 : item.鐐规璁″垝瀛怚D) || 0,
 									"HSourceBillNo": (item.鐐规璁″垝鍗� == null ? '' : item.鐐规璁″垝鍗�) || '',
-									"HDotCheckItemClassID": (item.HDotCheckItemClassID == null ? 0 : item.HDotCheckItemClassID) || 0,
-									"HDotCheckItemClassName": (item.鐐规椤圭洰鍒嗙被鍚嶇О == null ? '' : item.鐐规椤圭洰鍒嗙被鍚嶇О) ||'',
+									"HDotCheckItemClassID": (item.HDotCheckItemClassID == null ? 0 : item
+										.HDotCheckItemClassID) || 0,
+									"HDotCheckItemClassName": (item.鐐规椤圭洰鍒嗙被鍚嶇О == null ? '' : item.鐐规椤圭洰鍒嗙被鍚嶇О) ||
+										'',
 									"HDotCheckItemMethodID": (item.鐐规鏂规硶id == null ? 0 : item.鐐规鏂规硶id) || 0,
 									"HDotCheckItemMethodName": (item.鐐规鏂规硶 == null ? '' : item.鐐规鏂规硶) || '',
 									"HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
@@ -817,11 +822,11 @@
 									"HDotCheckItemClassID": item.HDotCheckItemClassID || 0,
 									"HDotCheckItemClassName": item.鐐规椤圭洰鍒嗙被鍚嶇О || "",
 									"HDotCheckItemMethodID": item.HDotCheckItemMethodID || 0,
-									"HDotCheckItemMethodName": item.鐐规鏂规硶鍚嶇О  || "",
+									"HDotCheckItemMethodName": item.鐐规鏂规硶鍚嶇О || "",
 									"HDotCheckResult": isChecked,
-									"HRemark":item.瀛愬娉�2|| ""
+									"HRemark": item.瀛愬娉�2 || ""
 								};
-							});							
+							});
 						} else {
 							console.log('瀛愯〃鏁版嵁涓虹┖鎴栬幏鍙栧け璐�:', res.data.Message);
 							this.HCheckFileList = [];
@@ -950,5 +955,5 @@
 </script>
 
 <style lang="scss">
-    @import "@/pages/MJGL/style/MJBillStyle.scss"
+	@import "@/pages/MJGL/style/MJBillStyle.scss"
 </style>
\ No newline at end of file
diff --git a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
index 984f151..0b76675 100644
--- a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
+++ b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
@@ -1,128 +1,128 @@
 <template>
-    <view>
-        <view class="form">
-            <view class="form-item">
-                <view class="title">鏉＄爜</view>
-                <view class="right" style="width: 350rpx;">
-                    <input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" @confirm="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" v-show="showHSourceBillNo">
-                    <uni-combox :candidates="['渚涘簲鍟�','瀹㈡埛','閮ㄩ棬']" placeholder="璇烽�夋嫨绫诲瀷" v-model="hform.TypeName"
-                        @input="HSelectTypeChange"></uni-combox>
-                </view>
-                <view class="right" v-show="!showHSourceBillNo">
-                    <input name="TypeName" disabled v-model="hform.TypeName" placeholder="" />
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">寰�鏉ュ崟浣�:</view>
-                <view class="right" v-show="showHSourceBillNo">
-                    <uni-combox :candidates="arrayHSelectType" placeholder="璇烽�夋嫨" v-model="hform.HSupName"
-                        @input="HSupNameChange" ></uni-combox>
-                </view>
-                <view class="right" v-show="!showHSourceBillNo">
-                    <input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
-                </view>
-            </view>
-            <view class="tabs">
-                <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">琛ㄥご淇℃伅</view>
-                <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">妯″叿淇℃伅</view>
-            </view>
-            <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" 
-                            @change="HMainSourceBillTypeChange">
-                            <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 :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜"
+						@confirm="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" v-show="showHSourceBillNo">
+					<uni-combox :candidates="['渚涘簲鍟�','瀹㈡埛','閮ㄩ棬']" placeholder="璇烽�夋嫨绫诲瀷" v-model="hform.TypeName"
+						@input="HSelectTypeChange"></uni-combox>
+				</view>
+				<view class="right" v-show="!showHSourceBillNo">
+					<input name="TypeName" disabled v-model="hform.TypeName" placeholder="" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">寰�鏉ュ崟浣�:</view>
+				<view class="right" v-show="showHSourceBillNo">
+					<uni-combox :candidates="arrayHSelectType" placeholder="璇烽�夋嫨" v-model="hform.HSupName"
+						@input="HSupNameChange"></uni-combox>
+				</view>
+				<view class="right" v-show="!showHSourceBillNo">
+					<input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
+				</view>
+			</view>
+			<view class="tabs">
+				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">琛ㄥご淇℃伅</view>
+				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">妯″叿淇℃伅</view>
+			</view>
+			<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" @change="HMainSourceBillTypeChange">
+							<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="璇疯緭鍏ユ簮鍗曞崟鍙�" />
-                
-                    </view>
-                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
-                        <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
-                    </view>
-                
-                    <view class="righton" v-show="!showHSourceBillNo">
-                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
-                    </view>
-                    <!-- <view class="right" v-show="showHSourceBillNo">
+						<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" @click="showBillList"></uni-icons>
+					</view>
+
+					<view class="righton" v-show="!showHSourceBillNo">
+						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+					</view>
+					<!-- <view class="right" v-show="showHSourceBillNo">
                         <uni-combox ref="uniComboxSourceBill" :isFocus="HSourceBillNoFocus"
                             :confirm-call="onSourceBillBlurHandler" v-if="reHSourceBillNo"
                             :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" v-model="hform.HSourceBillNo"
@@ -131,1177 +131,1163 @@
                     <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)">
-                                <!-- 鍣ㄥ叿浠ｇ爜浣滀负鍙偣鍑婚摼鎺� -->
-                                <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-c" size="mini" @tap="goBack">閫�鍑�</button>
-                <button v-if="btnType == 1 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-                <!-- <button v-if="btnType != 1 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button> -->
-                <button v-if="btnType != 1 " class="btn-a" size="mini" @tap="submit">鎻愪氦</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';
-    export default {
-        data() {
-            return {
-                HSourceBillNoFocus: false,
-                barCodeFocus: true,//鏉＄爜鍏夋爣
-                userInfo: getUserInfo(),
-                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-                tabs: 0,
-                btnType:1,//1鏂板锛�3淇敼
-                linterid:'',
-                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_3802') ? uni.getStorageSync('billTypeName_3802'):'棰嗙敤鐢宠鍗�',
-                arrayHMainSourceBillType: ['棰嗙敤鐢宠鍗�', '鎵嬪伐褰曞叆'],
-                arrayHMainSourceBillValue: ['3849', '-1'],
-                
-                hform: {
-                    HBarCode: '',
-                    HInterID: '',
-                    HBillType: 3802,
-                    HWHName: getUserInfo().HWhName,
-                    HWHID: getUserInfo().HWhID,
-                    HStockPlaceName: getUserInfo().HSPName,
-                    HStockPlaceID: getUserInfo().HSPID,
-                    HKeeperName: getUserInfo().HKeeperName,
-                    HKeeperID: getUserInfo().HKeeperID,//鍙戞枡浜�
-                    HSecManagerName: getUserInfo().HEmpName,
-                    HSecManagerID: getUserInfo().HEmpID,//棰嗘枡浜�
-                    HDeptName: getUserInfo().HDept,
-                    HDeptID: getUserInfo().HDeptID,
-                    //婧愬崟淇℃伅
-                    HMainSourceBillType: uni.getStorageSync('billType_3802') ? uni.getStorageSync('billType_3802'):3849,
-                    HSourceBillNo: '', //CGDD000200
-                    //寰�鏉ョ被鍨�
-                    TypeName:uni.getStorageSync('typeName_3802'),
-                    HSupName: '', // 寰�鏉ュ崟浣嶉�変腑鐨勫��
-                    HSupID: '' ,// 寰�鏉ュ崟浣嶅搴旂殑ID
-                    HSupTypeID:uni.getStorageSync('typeID_3802')?uni.getStorageSync('typeID_3802'):0,
-                    HDate: getDateTime.dateTimeStr('y-m-d'),
-                    HMaker: uni.getStorageSync('HUserName'),
-                    
-                    HRedBlueFlag:'false',
-                    HStockOrgName: uni.getStorageSync('Organization'),
-                    HStockOrgID: uni.getStorageSync('OrganizationID'),
-                    HStockOutOrgID:uni.getStorageSync('OrganizationID'),
-                    HBarCode_B:'',
-                    HMouldName_B:'',
-                    HMouldID_B:'',
-                    HMouldCount_B:'',
-                }
-            }
-        },
-        components: {
-            BillListPopupVue,
-            BillListPopupMouldVue
-        },
-        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);
-                
-                this.hform.HSupID =  HSupInfo.HItemID
-                this.hform.HSupName = HSupInfo['閮ㄩ棬鍚嶇О'] || 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 = 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.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'
-                            })
-                        }
-                    })
-            },
-            async 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 = this.hform.HSourceBillNo
-                var sSourceBillType =this.hform.HMainSourceBillType
-                if(sSourceBillType != -1&&sSourceBillNo==""){
-                    
-                    uni.showToast({
-                        title: "璇峰厛閫夋嫨婧愬崟",
-                        icon: 'none'
-                    })
-                    return
-                }
-                if (HDeleteFlag == '*') {
-                    if (sBarCode == "") {
-                        uni.showToast({
-                            title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
-                            icon: 'none'
-                        });
-                    } else {
-                        try {
-                            let res = await CommonUtils.doRequest2Sync({
-                                url: '/MouldController/set_DelMouldStockBillMain_Temp_Json',
-                                data: {
-                                    HInterID: this.hform.HInterID,
-                                    HBillType: this.hform.HBillType,
-                                    HBarCode: sBarCode
-                                },
-                            })
-                        
-                            if (!res) {
-                                return
-                            }
-                        
-                            console.log('鍒犻櫎鏉＄爜', res.data);
-                            this.hform.HBarCode = ''; 
-                            if (res.data.count == 1) {
-                                this.hform.HQty = ''
-                            } else {
-                                uni.showToast({
-                                    title: res.data.Message,
-                                    icon: 'none'
-                                })
-                            }
-                            
-                        
-                        } catch (err) {
-                            console.log(res);
-                            uni.showToast({
-                                title: '鎺ュ彛璇锋眰澶辫触',
-                                icon: 'none'
-                            })
-                        }
-                    }
-                }else
-                {
-                    var sBarCode = this.hform.HBarCode
-                    try {
-                        let res = await CommonUtils.doRequest2Sync({
-                            url: '/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,
-                            },
-                        })
-                    
-                        if (!res) {
-                            return
-                        }
-                    
-                        console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
-                        this.hform.HBarCode=''
-                        if(res.data.count==1){
-                            this.tabs = 1
-                            this.DisBillEntryList()
-                            this.showHMainSourceBillType = false
-                            this.showHSourceBillNo = false
-                        }
-                        else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                        
-                    
-                    } catch (err) {
-                        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.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"]
-                            }
-                        } else {
-                            uni.showToast({
-                                title: '浠撲綅鏁版嵁璇锋眰澶辫触',
-                                icon: 'none'
-                            })
-                        }
-                    },
-                )
-            },
-            /* #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'
-                        })
-                    },
-                });
-            },
-            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'
-                            })
-                        }
-                    }
-                )
-            },
-            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].閮ㄩ棬鍚嶇О
-                    }
-                }
-            },
-            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_3802",e);
-                if(e=='閮ㄩ棬')
-                {
-                    this.hform.HSupTypeID=3;
-                    uni.setStorageSync("typeID_3802",3);
-                    this.arrayHSelectType = this.arrayHDeptName;
-                    this.HSelectTypeList = this.HDeptNameList;
-                }
-                else if(e === '渚涘簲鍟�') {
-                    this.hform.HSupTypeID=1;
-                    uni.setStorageSync("typeID_3802",1);
-                    this.arrayHSelectType = this.arrayHSupplierName;
-                    this.HSelectTypeList = this.HSuplierList;
-                } else if(e === '瀹㈡埛') {
-                // 瀹㈡埛鏁版嵁 - 杩欓噷鐣欑┖锛屽悗缁坊鍔犺幏鍙栧鎴锋暟鎹殑閫昏緫
-                    this.hform.HSupTypeID=2;
-                    uni.setStorageSync("typeID_3802",2);
-                    this.arrayHSelectType =this.arrayHCusName;
-                    this.HSelectTypeList = this.HCusNameList;
-                } else {
-                    uni.setStorageSync("typeID_3802",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('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                        }
-                    }
-                });
-            },
-            ifEdit(){
-                this.isEdit = true
-                this.hform.eventType = 'Modify'
-            },
-            //缂栬緫鍥炴樉
-            getEditData(linterid,HBillNo){                
-                //涓昏〃
-                var sWhere = " and hmainid='" + linterid + "'";
-                uni.request({
-                    url: this.serverUrl + '/Sc_MouldProdOutBill/list_byPage', 
-                    data: { sWhere: this.sWhere,
-                        user: uni.getStorageSync('HUserName'),
-                        Organization: uni.getStorageSync('Organization'),
-                        page:1,
-                        size:100 },
-                    success: (res) => {
-                        console.log(1,res.data.data[0]);
-                        if(res.data.code == 1){
-                            var data = res.data.data[0]                            
-                            this.btnType=3
-                            this.hform.HInterID= data.hmainid
-                            this.hform.HBillNo= data.鍗曟嵁鍙�
-                            // this.hform.HBarCode= data.鏉″舰鐮� 瑙嗗浘涓病鏈夎瀛楁
-                            this.hform.HDeptID= data.HDeptID
-                            this.hform.HDeptName= data.閮ㄩ棬
-                            this.hform.HSecManagerName= data.棰嗘枡浜�
-                            this.hform.HSecManagerID= data.hsecmanagerid
-                            this.hform.HKeeperID= data.hkeeperid
-                            this.hform.HKeeperName= data.鍙戞枡浜�
-                            // this.hform.HRemark= data.琛ㄥご澶囨敞                        
-                            this.hform.HDate = data.鏃ユ湡.substr(0,10)
-                            
-                            this.hform.HWHID=data.HWHID,
-                            this.hform.HWHName=data.浠撳簱,
-                            this.hform.HStockPlaceID=data.HSPID,
-                            this.hform.HStockPlaceName=data.浠撲綅,
-                            
-                            this.hform.HSupName=data.寰�鏉ュ崟浣�,
-                            this.hform.HSupID=data.HSupID,
-                            this.hform.TypeName=data.寰�鏉ョ被鍨嬪悕绉�,                
-                            this.hform.HSupTypeID=data.寰�鏉ョ被鍨�,                    
-                                                        
-                            this.hform.HMouldID_B=data.hmaterid,
-                            // this.hform.HMouldID_B=data.妯″叿浠ｇ爜,
-                            this.hform.HMouldName_B=data.妯″叿鍚嶇О,
-                            // this.hform.HMouldModel=data.妯″叿瑙勬牸,
-                            this.hform.HMouldCount_B=1,
-                            this.hform.HRedBlueFlag=data.绾㈣摑鍗曟爣璁�=='钃濆瓧'?false:true,
-                            
-                            
-                            this.hform.HStockOrgID=data.HStockOrgID,
-                            this.hform.HStockOrgName=data.搴撳瓨缁勭粐,
-                            // this.hform.HICMOEntryID=data.HICMOEntryID,
-                            // this.hform.HProcExchBillNo=data.HProcExchBillNo,
-                            // this.hform.HProcExchInterID=data.HProcExchInterID,
-                            // this.hform.HProcExchEntryID=data.HProcExchEntryID,
-                            // this.hform.HOrgID=data.HOrgID,
-                                                                                
-                            this.hform.HMaker= data.鍒跺崟浜�
-                            //this.hform.HMakeDate= data.鍒跺崟鏃ユ湡
-                            //this.hform.HUpDater= data.淇敼浜�
-                            //this.hform.HUpDateDate= data.淇敼鏃ユ湡
-                            // this.hform.HChecker= data.瀹℃牳浜�
-                            // this.hform.HCheckDate= data.瀹℃牳鏃ユ湡                            
-                            // this.hform.HDeleteMan= data.浣滃簾浜�
-                            // this.hform.HDeleteDate= data.浣滃簾鏃ユ湡
-                        }else{
-                            uni.showToast({
-                                title:res.data.Message,
-                                icon:'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title:'鎺ュ彛璇锋眰澶辫触',
-                            icon:'none'
-                        })
-                    },
-                });                
-            },
-            async submit() {
-                //浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
-                if (!this.hform.HWHName) {
-                    this.hform.HWHID = 0
-                }
-                if (!this.hform.HStockPlaceName) {
-                    this.hform.HStockPlaceID = 0
-                }
-                if (!this.hform.HKeeperName) {
-                    this.hform.HKeeperID = 0
-                }
-                
-                if (!this.hform.HSecManagerName) {
-                    this.hform.HSecManagerID = 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)
-                        try {
-                            let res = await CommonUtils.doRequest2Sync({
-                                url: '/MouldController/set_SaveMouldProdOutBill_Json',
-                                method: 'POST',
-                                data: {
-                                   oMain: sMainStr
-                                },
-                            })
-                        
-                            if (!res) {
-                                return
-                            }
-                        
-                            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/mujulingliaochukudan/MouldProdOutBill'
-                                            })
-                                        } 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()
-                                    }
-                                })
-                            }
-                        } catch (err) {
-                            console.warn(err);
-                            uni.showToast({
-                                title: '鎺ュ彛璇锋眰澶辫触:' + err,
-                                icon: 'none'
-                            })
-                        }
-                    }
-                }
-            },
-            showBillList() {
-                this.$refs.billList.showPopup()
-            },
-            //閫夋嫨婧愬崟绫诲瀷
-            HMainSourceBillTypeChange(e) {
-                this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
-            
-                let index = this.arrayHMainSourceBillType.findIndex(e => e == this.HMainSourceBillType)
-                if (index != -1) {
-                    this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[index]
-                    // this.getHYDList()
-                }
-                console.log(this.hform.HMainSourceBillType)
-                uni.setStorageSync("billType_3802",this.hform.HMainSourceBillType);
-                uni.setStorageSync("billTypeName_3802",this.HMainSourceBillType);
-            },
-            //閫変腑婧愬崟
-            getHBarCodeData(HBarCode) {
-                uni.request({
-                    url: this.serverUrl + '/MouldController/Get_SourceBarCode_ProdOut_Json',
-                    data: {
-                        HInterID: this.hform.HInterID,
-                        HBillNo: this.hform.HBillNo,
-                        HBillType: this.hform.HBillType,
-                        HSourceBillNo: HBarCode,
-                        HSourceBillType: this.hform.HMainSourceBillType,
-                        HMaker: this.hform.HMaker,
-                        HStockOrgID: this.hform.HStockOrgID
-                    },
-                    success: (res) => {
-                        if (res.data.count == 1) {
-                            var data = res.data.data[0]
-                            console.log(2, data);
-                            
-                            this.hform.HSourceBillNo = data.HSourceBillNo
-                            this.showHMainSourceBillType = false
-                            //榛樿闈炲婧愬崟
-                            this.showHSourceBillNo = false
-                            //璁剧疆寰�鏉ュ崟浣�
-                            this.hform.HSupTypeID = data.HCorrespondentTypeID
-                            this.hform.HSupID = data.HCorrespondentID
-                            this.hform.HSupName = data.HCorrespondentName
-                            if(data.HCorrespondentTypeID==1){
-                                this.hform.TypeName = "渚涘簲鍟�"
-                            }else if(data.HCorrespondentTypeID==2){
-                                this.hform.TypeName = "瀹㈡埛"
-                            }else{
-                                this.hform.TypeName = "閮ㄩ棬"
-                            }
-                            
-                            
-                            this.tabs = 1
-                            CommonUtils.playSound(1)
-                            //鍏夋爣瀵瑰噯鏉＄爜
-                            this.refreshBarCodeState()
-                            this.DisBillEntryList()
-                        } else {
-                            console.log('res.data.Message: ', res.data.Message);
-                            CommonUtils.playSound(0)
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        CommonUtils.playSound(0)
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            async refreshBarCodeState() {
-                this.barCodeFocus = false
-                await this.$nextTick(() => {
-                    this.barCodeFocus = true
-                    this.hform.HBarCode = ""
-                })
-            },
-            
-            delMater(item) {   
-                uni.showModal({
-                    title: '鎻愮ず',
-                    content: '纭瑕佸垹闄� "' + item.鍣ㄥ叿鍙� + '" 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
-                    success: (res) => {
-                        if (res.confirm) {
-                            uni.request({
-                                url: this.serverUrl +
-                                    '/MouldController/set_DelMouldStockBillMain_Temp_Json',
-                                data: {
-                                    HInterID: this.hform.HInterID,
-                                    HBarCode: item.HBarCode,
-                                    HBillType: this.hform.HBillType
-                                },
-                                success: (res) => {
-                                    if (res.data.count == 1) {
-                                        this.DisBillEntryList()
-                                    } else {
-                                        uni.showToast({
-                                            title: res.data.Message,
-                                            icon: 'none'
-                                        })
-                                    }
-                                },
-                                fail: (res) => {
-                                    console.log(res);
-                                    uni.showToast({
-                                        title: '鎺ュ彛璇锋眰澶辫触',
-                                        icon: 'none'
-                                    })
-                                }
-                            });
-                        }
-                    }
-                });
-            },
-            onLoad(e) {
-                console.log(e, this.userInfo)
-                console.log(getUserInfo().HEmpName)
-                if(e.linterid){
-                    this.btnType = 3
-                    this.linterid = e.linterid
-                    this.HBillNo = e.HBillNo
-                    this.getEditData(e.linterid, e.HBillNo)
-                }else{
-                    this.getNewData()
-                }
-            
-                this.getHBaseList()
-                this.getHCusList()
-                this.getHEmpList()
-                this.getHDeptList()
-                this.getHSupList()
+				</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)">
+						<!-- 鍣ㄥ叿浠ｇ爜浣滀负鍙偣鍑婚摼鎺� -->
+						<view class="card-header">
+							<text class="link-text">鍣ㄥ叿鍙凤細{{item.鍣ㄥ叿鍙穧}</text>
+						</view>
 
-                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()
-                  })
-                  
-                }, 300);
-                uni.$on('BillSelectComplete', (e) => {
-                    console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
-                    this.getHBarCodeData(e.HBillNo)
-                    this.$refs.billList.exit()
-                })
-                //this.getHEmpList()
-            },
-            //閲嶈閫夋嫨婧愬崟蹇呴』娣诲姞杩欎釜鍚﹀垯鍑虹幇涓ラ噸bug
-            onUnload() {
-                uni.$off('BillSelectComplete')
-            },
-        }
-    }
+						<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-c" size="mini" @tap="goBack">閫�鍑�</button>
+				<button v-if="btnType == 1 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+				<!-- <button v-if="btnType != 1 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button> -->
+				<button v-if="btnType != 1 " class="btn-a" size="mini" @tap="submit">鎻愪氦</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';
+	export default {
+		data() {
+			return {
+				HSourceBillNoFocus: false,
+				barCodeFocus: true, //鏉＄爜鍏夋爣
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				tabs: 0,
+				btnType: 1, //1鏂板锛�3淇敼
+				linterid: '',
+				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_3802') ? uni.getStorageSync('billTypeName_3802') :
+					'棰嗙敤鐢宠鍗�',
+				arrayHMainSourceBillType: ['棰嗙敤鐢宠鍗�', '鎵嬪伐褰曞叆'],
+				arrayHMainSourceBillValue: ['3849', '-1'],
+
+				hform: {
+					HBarCode: '',
+					HInterID: '',
+					HBillType: 3802,
+					HWHName: getUserInfo().HWhName,
+					HWHID: getUserInfo().HWhID,
+					HStockPlaceName: getUserInfo().HSPName,
+					HStockPlaceID: getUserInfo().HSPID,
+					HKeeperName: getUserInfo().HEmpName,
+					HKeeperID: getUserInfo().HEmpID, //鍙戞枡浜�
+					HSecManagerName: getUserInfo().HEmpName,
+					HSecManagerID: getUserInfo().HEmpID, //棰嗘枡浜�
+					HDeptName: getUserInfo().HDeptName,
+					HDeptID: getUserInfo().HDeptID,
+					//婧愬崟淇℃伅
+					HMainSourceBillType: uni.getStorageSync('billType_3802') ? uni.getStorageSync('billType_3802') : 3849,
+					HSourceBillNo: '', //CGDD000200
+					//寰�鏉ョ被鍨�
+					TypeName: uni.getStorageSync('typeName_3802'),
+					HSupName: '', // 寰�鏉ュ崟浣嶉�変腑鐨勫��
+					HSupID: '', // 寰�鏉ュ崟浣嶅搴旂殑ID
+					HSupTypeID: uni.getStorageSync('typeID_3802') ? uni.getStorageSync('typeID_3802') : 0,
+					HDate: getDateTime.dateTimeStr('y-m-d'),
+					HMaker: uni.getStorageSync('HUserName'),
+
+					HRedBlueFlag: 'false',
+					HStockOrgName: uni.getStorageSync('Organization'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+					HStockOutOrgID: uni.getStorageSync('OrganizationID'),
+					HBarCode_B: '',
+					HMouldName_B: '',
+					HMouldID_B: '',
+					HMouldCount_B: '',
+				}
+			}
+		},
+		components: {
+			BillListPopupVue,
+			BillListPopupMouldVue
+		},
+		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);
+
+				this.hform.HSupID = HSupInfo.HItemID
+				this.hform.HSupName = HSupInfo['閮ㄩ棬鍚嶇О'] || 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 = 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.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'
+							})
+						}
+					})
+			},
+			async 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 = this.hform.HSourceBillNo
+				var sSourceBillType = this.hform.HMainSourceBillType
+				if (sSourceBillType != -1 && sSourceBillNo == "") {
+
+					uni.showToast({
+						title: "璇峰厛閫夋嫨婧愬崟",
+						icon: 'none'
+					})
+					return
+				}
+				if (HDeleteFlag == '*') {
+					if (sBarCode == "") {
+						uni.showToast({
+							title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
+							icon: 'none'
+						});
+					} else {
+						try {
+							let res = await CommonUtils.doRequest2Sync({
+								url: '/MouldController/set_DelMouldStockBillMain_Temp_Json',
+								data: {
+									HInterID: this.hform.HInterID,
+									HBillType: this.hform.HBillType,
+									HBarCode: sBarCode
+								},
+							})
+
+							if (!res) {
+								return
+							}
+
+							console.log('鍒犻櫎鏉＄爜', res.data);
+							this.hform.HBarCode = '';
+							if (res.data.count == 1) {
+								this.hform.HQty = ''
+							} else {
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+
+
+						} catch (err) {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					}
+				} else {
+					var sBarCode = this.hform.HBarCode
+					try {
+						let res = await CommonUtils.doRequest2Sync({
+							url: '/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,
+							},
+						})
+
+						if (!res) {
+							return
+						}
+
+						console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
+						this.hform.HBarCode = ''
+						if (res.data.count == 1) {
+							this.tabs = 1
+							this.DisBillEntryList()
+							this.showHMainSourceBillType = false
+							this.showHSourceBillNo = false
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+
+
+					} catch (err) {
+						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.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"]
+							}
+						}
+					},
+				)
+				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'
+						})
+					},
+				});
+			},
+			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'
+							})
+						}
+					}
+				)
+			},
+			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].閮ㄩ棬鍚嶇О
+					}
+				}
+			},
+			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_3802", e);
+				if (e == '閮ㄩ棬') {
+					this.hform.HSupTypeID = 3;
+					uni.setStorageSync("typeID_3802", 3);
+					this.arrayHSelectType = this.arrayHDeptName;
+					this.HSelectTypeList = this.HDeptNameList;
+				} else if (e === '渚涘簲鍟�') {
+					this.hform.HSupTypeID = 1;
+					uni.setStorageSync("typeID_3802", 1);
+					this.arrayHSelectType = this.arrayHSupplierName;
+					this.HSelectTypeList = this.HSuplierList;
+				} else if (e === '瀹㈡埛') {
+					// 瀹㈡埛鏁版嵁 - 杩欓噷鐣欑┖锛屽悗缁坊鍔犺幏鍙栧鎴锋暟鎹殑閫昏緫
+					this.hform.HSupTypeID = 2;
+					uni.setStorageSync("typeID_3802", 2);
+					this.arrayHSelectType = this.arrayHCusName;
+					this.HSelectTypeList = this.HCusNameList;
+				} else {
+					uni.setStorageSync("typeID_3802", 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('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			},
+			ifEdit() {
+				this.isEdit = true
+				this.hform.eventType = 'Modify'
+			},
+			//缂栬緫鍥炴樉
+			getEditData(linterid, HBillNo) {
+				//涓昏〃
+				var sWhere = " and hmainid='" + linterid + "'";
+				uni.request({
+					url: this.serverUrl + '/Sc_MouldProdOutBill/list_byPage',
+					data: {
+						sWhere: this.sWhere,
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization'),
+						page: 1,
+						size: 100
+					},
+					success: (res) => {
+						console.log(1, res.data.data[0]);
+						if (res.data.code == 1) {
+							var data = res.data.data[0]
+							this.btnType = 3
+							this.hform.HInterID = data.hmainid
+							this.hform.HBillNo = data.鍗曟嵁鍙�
+							// this.hform.HBarCode= data.鏉″舰鐮� 瑙嗗浘涓病鏈夎瀛楁
+							this.hform.HDeptID = data.HDeptID
+							this.hform.HDeptName = data.閮ㄩ棬
+							this.hform.HSecManagerName = data.棰嗘枡浜�
+							this.hform.HSecManagerID = data.hsecmanagerid
+							this.hform.HKeeperID = data.hkeeperid
+							this.hform.HKeeperName = data.鍙戞枡浜�
+							// this.hform.HRemark= data.琛ㄥご澶囨敞                        
+							this.hform.HDate = data.鏃ユ湡.substr(0, 10)
+
+							this.hform.HWHID = data.HWHID,
+								this.hform.HWHName = data.浠撳簱,
+								this.hform.HStockPlaceID = data.HSPID,
+								this.hform.HStockPlaceName = data.浠撲綅,
+
+								this.hform.HSupName = data.寰�鏉ュ崟浣�,
+								this.hform.HSupID = data.HSupID,
+								this.hform.TypeName = data.寰�鏉ョ被鍨嬪悕绉�,
+								this.hform.HSupTypeID = data.寰�鏉ョ被鍨�,
+
+								this.hform.HMouldID_B = data.hmaterid,
+								// this.hform.HMouldID_B=data.妯″叿浠ｇ爜,
+								this.hform.HMouldName_B = data.妯″叿鍚嶇О,
+								// this.hform.HMouldModel=data.妯″叿瑙勬牸,
+								this.hform.HMouldCount_B = 1,
+								this.hform.HRedBlueFlag = data.绾㈣摑鍗曟爣璁� == '钃濆瓧' ? false : true,
+
+
+								this.hform.HStockOrgID = data.HStockOrgID,
+								this.hform.HStockOrgName = data.搴撳瓨缁勭粐,
+								// this.hform.HICMOEntryID=data.HICMOEntryID,
+								// this.hform.HProcExchBillNo=data.HProcExchBillNo,
+								// this.hform.HProcExchInterID=data.HProcExchInterID,
+								// this.hform.HProcExchEntryID=data.HProcExchEntryID,
+								// this.hform.HOrgID=data.HOrgID,
+
+								this.hform.HMaker = data.鍒跺崟浜�
+							//this.hform.HMakeDate= data.鍒跺崟鏃ユ湡
+							//this.hform.HUpDater= data.淇敼浜�
+							//this.hform.HUpDateDate= data.淇敼鏃ユ湡
+							// this.hform.HChecker= data.瀹℃牳浜�
+							// this.hform.HCheckDate= data.瀹℃牳鏃ユ湡                            
+							// this.hform.HDeleteMan= data.浣滃簾浜�
+							// this.hform.HDeleteDate= data.浣滃簾鏃ユ湡
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			async submit() {
+				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				if (!this.hform.HKeeperName) {
+					this.hform.HKeeperID = 0
+				}
+
+				if (!this.hform.HSecManagerName) {
+					this.hform.HSecManagerID = 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)
+						try {
+							let res = await CommonUtils.doRequest2Sync({
+								url: '/MouldController/set_SaveMouldProdOutBill_Json',
+								method: 'POST',
+								data: {
+									oMain: sMainStr
+								},
+							})
+
+							if (!res) {
+								return
+							}
+
+							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/mujulingliaochukudan/MouldProdOutBill'
+											})
+										} else if (res.cancel) {
+											console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+											setTimeout(() => {
+												uni.navigateBack();
+											}, 50)
+										}
+									}
+								});
+							} else {
+								uni.showModal({
+									content: res.data.Message,
+									showCancel: false,
+									complete() {
+										uni.hideLoading()
+									}
+								})
+							}
+						} catch (err) {
+							console.warn(err);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触:' + err,
+								icon: 'none'
+							})
+						}
+					}
+				}
+			},
+			showBillList() {
+				this.$refs.billList.showPopup()
+			},
+			//閫夋嫨婧愬崟绫诲瀷
+			HMainSourceBillTypeChange(e) {
+				this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+
+				let index = this.arrayHMainSourceBillType.findIndex(e => e == this.HMainSourceBillType)
+				if (index != -1) {
+					this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[index]
+					// this.getHYDList()
+				}
+				console.log(this.hform.HMainSourceBillType)
+				uni.setStorageSync("billType_3802", this.hform.HMainSourceBillType);
+				uni.setStorageSync("billTypeName_3802", this.HMainSourceBillType);
+			},
+			//閫変腑婧愬崟
+			getHBarCodeData(HBarCode) {
+				uni.request({
+					url: this.serverUrl + '/MouldController/Get_SourceBarCode_ProdOut_Json',
+					data: {
+						HInterID: this.hform.HInterID,
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.hform.HBillType,
+						HSourceBillNo: HBarCode,
+						HSourceBillType: this.hform.HMainSourceBillType,
+						HMaker: this.hform.HMaker,
+						HStockOrgID: this.hform.HStockOrgID
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							var data = res.data.data[0]
+							console.log(2, data);
+
+							this.hform.HSourceBillNo = data.HSourceBillNo
+							this.showHMainSourceBillType = false
+							//榛樿闈炲婧愬崟
+							this.showHSourceBillNo = false
+							//璁剧疆寰�鏉ュ崟浣�
+							this.hform.HSupTypeID = data.HCorrespondentTypeID
+							this.hform.HSupID = data.HCorrespondentID
+							this.hform.HSupName = data.HCorrespondentName
+							if (data.HCorrespondentTypeID == 1) {
+								this.hform.TypeName = "渚涘簲鍟�"
+							} else if (data.HCorrespondentTypeID == 2) {
+								this.hform.TypeName = "瀹㈡埛"
+							} else {
+								this.hform.TypeName = "閮ㄩ棬"
+							}
+
+
+							this.tabs = 1
+							CommonUtils.playSound(1)
+							//鍏夋爣瀵瑰噯鏉＄爜
+							this.refreshBarCodeState()
+							this.DisBillEntryList()
+						} else {
+							console.log('res.data.Message: ', res.data.Message);
+							CommonUtils.playSound(0)
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						CommonUtils.playSound(0)
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			async refreshBarCodeState() {
+				this.barCodeFocus = false
+				await this.$nextTick(() => {
+					this.barCodeFocus = true
+					this.hform.HBarCode = ""
+				})
+			},
+
+			delMater(item) {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕佸垹闄� "' + item.鍣ㄥ叿鍙� + '" 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+					success: (res) => {
+						if (res.confirm) {
+							uni.request({
+								url: this.serverUrl +
+									'/MouldController/set_DelMouldStockBillMain_Temp_Json',
+								data: {
+									HInterID: this.hform.HInterID,
+									HBarCode: item.HBarCode,
+									HBillType: this.hform.HBillType
+								},
+								success: (res) => {
+									if (res.data.count == 1) {
+										this.DisBillEntryList()
+									} else {
+										uni.showToast({
+											title: res.data.Message,
+											icon: 'none'
+										})
+									}
+								},
+								fail: (res) => {
+									console.log(res);
+									uni.showToast({
+										title: '鎺ュ彛璇锋眰澶辫触',
+										icon: 'none'
+									})
+								}
+							});
+						}
+					}
+				});
+			},
+			onLoad(e) {
+				console.log(e, this.userInfo)
+				console.log(getUserInfo().HEmpName)
+				if (e.linterid) {
+					this.btnType = 3
+					this.linterid = e.linterid
+					this.HBillNo = e.HBillNo
+					this.getEditData(e.linterid, e.HBillNo)
+				} else {
+					this.getNewData()
+				}
+				if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
+					this.HSourceBillType = "鎵嬪伐褰曞叆"; // 鏄剧ず鍚嶇О
+					this.hform.HSourceBillType = "-1"; // 瀵瑰簲鐨勫��
+				}
+				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 === '瀹㈡埛') {
+
+					}
+					this.$nextTick(() => {
+						this.loadCache()
+					})
+
+				}, 300);
+				uni.$on('BillSelectComplete', (e) => {
+					console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
+					this.getHBarCodeData(e.HBillNo)
+					this.$refs.billList.exit()
+				})
+				//this.getHEmpList()
+			},
+			//閲嶈閫夋嫨婧愬崟蹇呴』娣诲姞杩欎釜鍚﹀垯鍑虹幇涓ラ噸bug
+			onUnload() {
+				uni.$off('BillSelectComplete')
+			},
+		}
+	}
 </script>
 <style lang="scss" scoped>
-    .form {
-        width: 668rpx;
-        margin: 20rpx auto;
-        padding-bottom: 240rpx;
-    }
- 
-    .tab_area {
-        width: 100%;
-        height: 50rpx;
-    }
- 
-    .other {
-        margin-top: 8rpx;
-        text-align: center;
-        font-size: 28rpx;
-        padding: 4rpx 18rpx;
-        color: #1890FF;
-    }
- 
-    .tabs {
-        width: 100%;
-        display: flex;
-        border-bottom: 1px solid #ddd;
-        margin: 20rpx 0;
- 
-        view {
-            width: 25%;
-            font-size: 30rpx;
-            color: #555;
-            text-align: center;
-            padding: 16rpx 0;
-        }
- 
-        .on {
-            color: #3a78ff;
-            font-weight: bold;
-            border-bottom: 3px solid #3a78ff;
-        }
-    }
- 
-    .form-item {
-        display: flex;
-        align-items: center;
-        font-size: 30rpx;
-        padding: 6rpx 0;
-        gap: 12rpx;
- 
-        .title {
-            width: 208rpx;
-            flex-shrink: 0;
- 
-            text {
-                color: red;
-                font-weight: bold;
-            }
-        }
- 
-        .right {
-            // width: 450rpx;
-            flex: 1;
-            border-radius: 22rpx;
-            border: 1px solid #acacac;
-            position: relative;
-            display: flex;
- 
-            picker {
-                width: 100%;
-            }
- 
-            .uni-combox {
-                width: 100%;
-            }
-        }
- 
-        .righton {
-            // width: 450rpx;
-            flex: 1;
-            border-radius: 22rpx;
-            border: 1px solid #e4e4e4;
-            background-color: #e4e4e4;
-            position: relative;
-            display: flex;
-        }
- 
-        input {
-            width: 100%;
-            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;
- 
-            .uni-icons {
-                color: #fff !important;
-            }
-        }
- 
-        .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;
- 
-        button {
-            border-radius: 50rpx;
-            width: 180rpx;
-            height: 66rpx;
-            line-height: 66rpx;
-            font-size: 28rpx;
-        }
- 
-        .btn-a {
-            background-color: #3A78FF;
-            color: #fff;
-        }
- 
-        .btn-b {
-            background-color: #41a863;
-            color: #fff;
-        }
- 
-        .btn-c {
-            background-color: #acacac;
-            color: #fff;
-            // position: absolute;
-            // right: 120rpx;
-        }
- 
-        .btn-d {
-            background-color: #ff8901;
-            color: #fff;
-        }
-    }
- 
-    .list {
-        width: 100%;
- 
-        .card-detail {
-            width: 100%;
-            display: flex;
-            flex-wrap: wrap;
-            justify-content: space-between;
-            line-height: 120%;
- 
-            .detail {
-                // width: 50%;
-                font-size: 26rpx;
-                margin-bottom: 12rpx;
-                color: #555;
-                margin-right: 20rpx;
- 
-                text {
-                    color: #999;
-                    font-size: 26rpx;
-                }
-            }
-        }
- 
-        .more {
-            color: #888;
-            font-size: 24rpx;
-            display: flex;
-            border-top: 1px solid #eee;
-            padding-top: 20rpx;
- 
-            .part {
-                width: 50%;
-                text-align: center;
-            }
-        }
-    }
+	.form {
+		width: 668rpx;
+		margin: 20rpx auto;
+		padding-bottom: 240rpx;
+	}
+
+	.tab_area {
+		width: 100%;
+		height: 50rpx;
+	}
+
+	.other {
+		margin-top: 8rpx;
+		text-align: center;
+		font-size: 28rpx;
+		padding: 4rpx 18rpx;
+		color: #1890FF;
+	}
+
+	.tabs {
+		width: 100%;
+		display: flex;
+		border-bottom: 1px solid #ddd;
+		margin: 20rpx 0;
+
+		view {
+			width: 25%;
+			font-size: 30rpx;
+			color: #555;
+			text-align: center;
+			padding: 16rpx 0;
+		}
+
+		.on {
+			color: #3a78ff;
+			font-weight: bold;
+			border-bottom: 3px solid #3a78ff;
+		}
+	}
+
+	.form-item {
+		display: flex;
+		align-items: center;
+		font-size: 30rpx;
+		padding: 6rpx 0;
+		gap: 12rpx;
+
+		.title {
+			width: 208rpx;
+			flex-shrink: 0;
+
+			text {
+				color: red;
+				font-weight: bold;
+			}
+		}
+
+		.right {
+			// width: 450rpx;
+			flex: 1;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+			position: relative;
+			display: flex;
+
+			picker {
+				width: 100%;
+			}
+
+			.uni-combox {
+				width: 100%;
+			}
+		}
+
+		.righton {
+			// width: 450rpx;
+			flex: 1;
+			border-radius: 22rpx;
+			border: 1px solid #e4e4e4;
+			background-color: #e4e4e4;
+			position: relative;
+			display: flex;
+		}
+
+		input {
+			width: 100%;
+			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;
+
+			.uni-icons {
+				color: #fff !important;
+			}
+		}
+
+		.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;
+
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
+
+		.btn-a {
+			background-color: #3A78FF;
+			color: #fff;
+		}
+
+		.btn-b {
+			background-color: #41a863;
+			color: #fff;
+		}
+
+		.btn-c {
+			background-color: #acacac;
+			color: #fff;
+			// position: absolute;
+			// right: 120rpx;
+		}
+
+		.btn-d {
+			background-color: #ff8901;
+			color: #fff;
+		}
+	}
+
+	.list {
+		width: 100%;
+
+		.card-detail {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			line-height: 120%;
+
+			.detail {
+				// width: 50%;
+				font-size: 26rpx;
+				margin-bottom: 12rpx;
+				color: #555;
+				margin-right: 20rpx;
+
+				text {
+					color: #999;
+					font-size: 26rpx;
+				}
+			}
+		}
+
+		.more {
+			color: #888;
+			font-size: 24rpx;
+			display: flex;
+			border-top: 1px solid #eee;
+			padding-top: 20rpx;
+
+			.part {
+				width: 50%;
+				text-align: center;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue b/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
index 5011e03..2dec658 100644
--- a/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
+++ b/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
@@ -38,16 +38,16 @@
                 </view>
             </view>
             <view class="form-item">
-                <view class="title">鍙戞枡:</view>
+                <view class="title">鍙戝嚭浜�:</view>
                 <view class="right">
-                    <uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戞枡浜�" v-model="hform.HKeeperName"
+                    <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">棰嗙敤浜�:</view>
                 <view class="right">
-                    <uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)棰嗘枡浜�" v-model="hform.HSecManagerName"
+                    <uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)棰嗙敤浜�" v-model="hform.HSecManagerName"
                         @input="HCollectUserChange"></uni-combox>
                 </view>
             </view>
@@ -136,33 +136,6 @@
                         <input name="HInterID" disabled v-model="hform.HInterID" />
                     </view>
                 </view>
-                <!-- <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="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">
@@ -183,30 +156,6 @@
                     </uni-card>
                 </view>
                 <view class="over" v-if="HMouldList.length == 0">鏆傛棤鏁版嵁</view>
-                <!-- <view class="form-item">
-                    <view class="title">鍣ㄥ叿鏉＄爜:</view>
-                    <view class="righton">
-                        <input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍣ㄥ叿鍚嶇О:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HMouldName_B" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍣ㄥ叿鍙�:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HMouldID_B" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鏁伴噺:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HMouldCount_B" />
-                    </view>
-                </view> -->
             </view>
             <view class="bottom-btn">
                 <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
@@ -278,7 +227,7 @@
                     HStockPlaceName: getUserInfo().HSPName,
                     HStockPlaceID: getUserInfo().HSPID,
                     
-                    HDeptName: getUserInfo().HDept,
+                    HDeptName: getUserInfo().HDeptName,
                     HDeptID: getUserInfo().HDeptID,
                     HSecManagerID: getUserInfo().HEmpID,
                     HSecManagerName:  getUserInfo().HEmpName,
@@ -558,12 +507,7 @@
                             for (var i = 0; i < data.length; i++) {
                                 this.arrayHStockPlaceName[i] = data[i]["HWhName"]
                             }
-                        } else {
-                            uni.showToast({
-                                title: '浠撲綅鏁版嵁璇锋眰澶辫触',
-                                icon: 'none'
-                            })
-                        }
+                        } 
                     },
                 )
             },
diff --git a/pages/MJGL/shangmudan/MouldUpperBill.vue b/pages/MJGL/shangmudan/MouldUpperBill.vue
index b8da547..ee9a34a 100644
--- a/pages/MJGL/shangmudan/MouldUpperBill.vue
+++ b/pages/MJGL/shangmudan/MouldUpperBill.vue
@@ -248,8 +248,8 @@
 					HDeptID: uni.getStorageSync('HDeptID'),
 					HEmpName: uni.getStorageSync('HEmpName'),
 					HEmpID: uni.getStorageSync('HEmpID'),
-					HMangerName: uni.getStorageSync('HEmpName'),
-					HMangerID: uni.getStorageSync('HEmpID'),
+					HMangerName: uni.getStorageSync('HMangerName'),
+					HMangerID: uni.getStorageSync('HMangerID'),
 
 
 					HSourceName: '',
@@ -445,12 +445,9 @@
 						HBillType: HBillType
 					},
 					success: (res) => {
-						console.log(2, res.data);
 						if (res.data.code == 1) {
 							var data = res.data.data[0];
-							console.log(3, data);
 							var num = data.Num;
-							console.log(4, num);
 							switch (num) {
 								case 1:
 									this.hform.HSourceID = data.HItemID;
@@ -479,84 +476,28 @@
 										});
 										return;
 									}
+									// 鏍规嵁缁勭粐鏉′欢鍐冲畾鏄惁杩涜鏍￠獙
+									const isSpecialOrg = uni.getStorageSync('OrganizationID') == "100007" &&
+										uni.getStorageSync('Organization') == "浜嬩笟涓�澶�";
 
-									// 鍏堣皟鐢ㄦā鍏锋。妗堟鏌ワ紝鏍￠獙閫氳繃鍚庢墠娣诲姞鏁版嵁
-									this.getMould_FC().then(isValid => {
-										if (isValid) {
-											this.tabs = 1;
-											// 妫�鏌ユā鍏锋槸鍚﹀凡瀛樺湪浜庤〃鏍间腑
-											const existingIndex = this.listData.findIndex(item =>
-												item.HMouldID === data.hmainid
-											);
-											if (uni.getStorageSync('OrganizationID') == "100007" && uni
-												.getStorageSync('Organization') == "浜嬩笟涓�澶�") {
-												if (existingIndex === -1) {
-													// 濡傛灉涓嶅瓨鍦紝娣诲姞鍒拌〃鏍�
-													uni.showToast({
-														title: '褰撳墠妫�鍏蜂笉鍦ㄥ綋鍓嶇墿鏂欑殑妫�鍏锋竻鍗曚腑',
-														icon: 'none',
-														duration: 1500
-													});
-													this.refreshBarCodeState();
-												} else {
-													// 濡傛灉宸插瓨鍦紝妫�鏌ュ櫒鍏锋暟閲�
-													if (this.listData[existingIndex].鍣ㄥ叿鏁伴噺 === 0) {
-														// 鍣ㄥ叿鏁伴噺涓�0锛屾洿鏂版潯鐮佸苟灏嗘暟閲忓彉涓�1
-														this.listData[existingIndex].鍣ㄥ叿鏉＄爜 = this.hform
-															.HBarCode;
-														this.listData[existingIndex].鍣ㄥ叿鏁伴噺 = 1;
-														uni.showToast({
-															title: '鎵弿鎴愬姛',
-															icon: 'success',
-															duration: 1500
-														});
-														this.refreshBarCodeState();
-													} else {
-														// 鍣ㄥ叿鏁伴噺宸蹭负1锛屾彁绀轰笉鍏佽閲嶅鎵弿
-														uni.showToast({
-															title: '璇ユā鍏峰凡鎵弿锛屼笉鍏佽閲嶅鎵弿',
-															icon: 'none',
-															duration: 1500
-														});
-														this.refreshBarCodeState();
-													}
-												}
+									if (isSpecialOrg) {
+										// 鐗规畩缁勭粐锛氶渶瑕佽皟鐢ㄦā鍏锋。妗堟鏌�
+										this.getMould_FC().then(isValid => {
+											if (isValid) {
+												this.handleMouldData(data);
 											} else {
-												if (existingIndex === -1) {
-													// 濡傛灉涓嶅瓨鍦紝娣诲姞鍒拌〃鏍�
-													const newRow = {
-														index: this.listData.length + 1,
-														HMouldID: data.hmainid,
-														鍣ㄥ叿缂栫爜: data.妯″叿缂栧彿,
-														鍣ㄥ叿鍚嶇О: data.妯″叿鍚嶇О,
-														鍣ㄥ叿鍨嬪彿: data.妯″叿鍨嬪彿,
-														鍣ㄥ叿鏉＄爜: this.hform.HBarCode,
-														鍣ㄥ叿鏁伴噺: 1,
-														checked: false // 榛樿涓嶉�変腑
-													};
-													this.listData.push(newRow);
-													this.refreshBarCodeState();
-												} else {
-													// 濡傛灉宸插瓨鍦紝鎻愮ず鐢ㄦ埛
-													uni.showToast({
-														title: '璇ユā鍏峰凡鎵弿',
-														icon: 'none',
-														duration: 1500
-													});
-													this.refreshBarCodeState();
-												}
+												// 鏍￠獙涓嶉�氳繃锛屾竻绌烘潯鐮佷絾涓嶆坊鍔犳暟鎹�
+												this.refreshBarCodeState();
 											}
-
-										} else {
-											// 鏍￠獙涓嶉�氳繃锛屾竻绌烘潯鐮佷絾涓嶆坊鍔犳暟鎹�
+										}).catch(error => {
+											console.log('鏍￠獙澶辫触:', error);
 											this.refreshBarCodeState();
-										}
-									}).catch(error => {
-										console.log('鏍￠獙澶辫触:', error);
-										this.refreshBarCodeState();
-									});
+										});
+									} else {
+										// 鍏朵粬缁勭粐锛氱洿鎺ュ鐞嗘ā鍏锋暟鎹�
+										this.handleMouldData(data);
+									}
 									break;
-
 								case 4:
 									this.hform.HProcExchBillNo = data.鍗曟嵁鍙�;
 									this.hform.HProcExchInterID = data.hmainid;
@@ -596,6 +537,80 @@
 					},
 				});
 			},
+			handleMouldData(data) {
+				this.tabs = 1;
+				// 妫�鏌ユā鍏锋槸鍚﹀凡瀛樺湪浜庤〃鏍间腑
+				const existingIndex = this.listData.findIndex(item =>
+					item.HMouldID === data.hmainid
+				);
+
+				const isSpecialOrg = uni.getStorageSync('OrganizationID') == "100007" &&
+					uni.getStorageSync('Organization') == "浜嬩笟涓�澶�";
+
+				if (isSpecialOrg) {
+					// 鐗规畩缁勭粐锛氭鏌ョ墿鏂欏櫒鍏锋竻鍗�
+					if (existingIndex === -1) {
+						// 濡傛灉涓嶅瓨鍦紝璇存槑涓嶅湪褰撳墠鐗╂枡鐨勬鍏锋竻鍗曚腑
+						uni.showToast({
+							title: '褰撳墠妫�鍏蜂笉鍦ㄥ綋鍓嶇墿鏂欑殑妫�鍏锋竻鍗曚腑',
+							icon: 'none',
+							duration: 1500
+						});
+						this.refreshBarCodeState();
+					} else {
+						// 濡傛灉宸插瓨鍦紝妫�鏌ュ櫒鍏锋暟閲�
+						if (this.listData[existingIndex].鍣ㄥ叿鏁伴噺 === 0) {
+							// 鍣ㄥ叿鏁伴噺涓�0锛屾洿鏂版潯鐮佸苟灏嗘暟閲忓彉涓�1
+							this.listData[existingIndex].鍣ㄥ叿鏉＄爜 = this.hform.HBarCode;
+							this.listData[existingIndex].鍣ㄥ叿鏁伴噺 = 1;
+							uni.showToast({
+								title: '鎵弿鎴愬姛',
+								icon: 'success',
+								duration: 1500
+							});
+							this.refreshBarCodeState();
+						} else {
+							// 鍣ㄥ叿鏁伴噺宸蹭负1锛屾彁绀轰笉鍏佽閲嶅鎵弿
+							uni.showToast({
+								title: '璇ユā鍏峰凡鎵弿锛屼笉鍏佽閲嶅鎵弿',
+								icon: 'none',
+								duration: 1500
+							});
+							this.refreshBarCodeState();
+						}
+					}
+				} else {
+					// 鍏朵粬缁勭粐锛氱洿鎺ュ鐞�
+					if (existingIndex === -1) {
+						// 濡傛灉涓嶅瓨鍦紝娣诲姞鍒拌〃鏍�
+						const newRow = {
+							index: this.listData.length + 1,
+							HMouldID: data.hmainid,
+							鍣ㄥ叿缂栫爜: data.妯″叿缂栧彿,
+							鍣ㄥ叿鍚嶇О: data.妯″叿鍚嶇О,
+							鍣ㄥ叿鍨嬪彿: data.妯″叿鍨嬪彿,
+							鍣ㄥ叿鏉＄爜: this.hform.HBarCode,
+							鍣ㄥ叿鏁伴噺: 1,
+							checked: false // 榛樿涓嶉�変腑
+						};
+						this.listData.push(newRow);
+						uni.showToast({
+							title: '鎵弿鎴愬姛',
+							icon: 'success',
+							duration: 1500
+						});
+						this.refreshBarCodeState();
+					} else {
+						// 濡傛灉宸插瓨鍦紝鎻愮ず鐢ㄦ埛
+						uni.showToast({
+							title: '璇ユā鍏峰凡鎵弿',
+							icon: 'none',
+							duration: 1500
+						});
+						this.refreshBarCodeState();
+					}
+				}
+			},
 			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
 			getHDeptList() {
 				uni.request({
diff --git a/pages/MJGL/xiamodan/MouldLowerBill.vue b/pages/MJGL/xiamodan/MouldLowerBill.vue
index c76c99e..bce3b15 100644
--- a/pages/MJGL/xiamodan/MouldLowerBill.vue
+++ b/pages/MJGL/xiamodan/MouldLowerBill.vue
@@ -4,7 +4,7 @@
 			<view class="form-item">
 				<view class="title"><text>*</text>鏉″舰鐮�:</view>
 				<view class="right" style="width: 380rpx;">
-					<input v-model="hform.HBarCode" disabled  placeholder="璇锋壂鎻忔潯鐮�" @blur="getHBarCodeData(hform.HBarCode)"/>
+					<input v-model="hform.HBarCode" placeholder="璇锋壂鎻忔潯鐮�" @blur="getHBarCodeData(hform.HBarCode)"/>
 				</view>
 				<uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode"></uni-icons>
 			</view>
@@ -189,12 +189,12 @@
 					HBillNo:'',
 					HDate:getDateTime.dateTimeStr('y-m-d'),
 					HBarCode:'',
-					HDeptName:'',
-					HDeptID:'',
-					HEmpName:'',
-					HEmpID:'',
-					HMangerName:'',
-					HMangerID:'',
+					HDeptName: uni.getStorageSync('HDeptName'),
+					HDeptID: uni.getStorageSync('HDeptID'),
+					HEmpName: uni.getStorageSync('HEmpName'),
+					HEmpID: uni.getStorageSync('HEmpID'),
+					HMangerName: uni.getStorageSync('HMangerName'),
+					HMangerID: uni.getStorageSync('HMangerID'),
 					
 					
 					HSourceName:'',
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue
index 48535d4..553f399 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue
@@ -753,9 +753,10 @@
 			getShiftsList() {
 				return new Promise((resolve, reject) => {
 					uni.request({
-						url: this.serverUrl + '/Web/GetGy_ShiftsList_Json',
+						url:  this.serverUrl + '/Gy_ShiftsController/Get_Gy_WorkShiftList',
 						data: {
-							Shifts: ""
+							sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'')  != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}'`,
+							HMaker: getUserInfo()["Czymc"],
 						},
 						success: (res) => {
 							if (res.data.count == 1) {
diff --git a/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue b/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue
index 6d8455a..4038f1b 100644
--- a/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue
@@ -274,6 +274,13 @@
 		onPullDownRefresh() {
 			this.onSearchClickHandler()
 		},
+		onShow() {
+			// 姣忔椤甸潰鏄剧ず鏃舵鏌ユ槸鍚﹂渶瑕佸埛鏂�
+			if (this.needRefresh) {
+				this.onSearchClickHandler()
+				this.needRefresh = false
+			}
+		},
 		async onReady() {
 			// #ifndef MP-WEIXIN
 			let query = uni.createSelectorQuery().in(this)
@@ -448,6 +455,7 @@
 				}
 
 				console.log('涓嬫帹绛惧埌鍗�:', item)
+				this.needRefresh = true // 璁剧疆鍒锋柊鏍囪
 				uni.navigateTo({
 					url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill?OperationType=2&linterid=' +
 						item.HInterID + '&HEntryID=' + (item.HEntryID || 0) + '&HSouceBillType=4502',
@@ -469,6 +477,7 @@
 				}
 
 				console.log('涓嬫帹澶勭悊鍗�:', item)
+				this.needRefresh = true // 璁剧疆鍒锋柊鏍囪
 				uni.navigateTo({
 					url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill?OperationType=2&linterid=' +
 						item.HInterID + '&HEntryID=' + (item.HEntryID || 0) + '&HSouceBillType=4502',
@@ -488,8 +497,16 @@
 					})
 					return
 				}
-
+				const currentUser = getUserInfo()["Czymc"];
+				if (item.鍙戦�佷汉 !== currentUser) {
+					uni.showToast({
+						title: '褰撳墠鍗曟嵁鍙戦�佷汉涓庣櫥褰曠敤鎴蜂笉涓�鑷达紝涓嶅厑璁镐笅鎺ㄩ獙鏀跺崟',
+						icon: 'none'
+					})
+					return
+				}
 				console.log('涓嬫帹楠屾敹鍗�:', item)
+				this.needRefresh = true // 璁剧疆鍒锋柊鏍囪
 				uni.navigateTo({
 					url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill?OperationType=2&linterid=' +
 						item.HInterID + '&HEntryID=' + (item.HEntryID || 0) + '&HSouceBillType=4502',
diff --git a/pages/ZLGL/OA_WorkLink/OA_WorkLinkBill.vue b/pages/ZLGL/OA_WorkLink/OA_WorkLinkBill.vue
index 1678a02..f48127b 100644
--- a/pages/ZLGL/OA_WorkLink/OA_WorkLinkBill.vue
+++ b/pages/ZLGL/OA_WorkLink/OA_WorkLinkBill.vue
@@ -4,7 +4,7 @@
             <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
             <!-- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鏄庣粏淇℃伅</view> -->
             <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
-            <!-- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view> -->
+            <view v-if="operationType==5" :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鍥炲娑堟伅</view>
         </view>
         <!-- 鍩烘湰淇℃伅 -->
         <template v-if="tabs == 0">
@@ -14,50 +14,62 @@
             }">
                 <view class="form-item">
                     <view class="title">涓婚:</view>
-                    <view class="right">
+                    <view class="right" v-if="operationType!=5">
                         <input type="text" v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�..." />
+                    </view>
+                    <view class="righton" v-else>
+                        <input type="text" disabled v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�..." />
                     </view>
                 </view>
                 <view class="form-item">
                     <view class="title">鍙戦�佷汉:</view>
-                    <zxz-uni-data-select class="right" :localdata="HEmpList" dataKey="HName" dataValue="HName"
-                        v-model="hform.HSendMan" :filterable="true">
+                    <zxz-uni-data-select v-if="operationType!=5" class="right" :localdata="HEmpList" dataKey="HName"
+                        dataValue="HName" v-model="hform.HSendMan" :filterable="true">
                     </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                    <view class="righton" v-else>
+                        <input disabled v-model="hform.HSendMan" />
+                    </view>
                 </view>
                 <view class="form-item">
                     <view class="title">鎺ユ敹浜�:</view>
-                    <zxz-uni-data-select class="right" :localdata="HEmpList" dataKey="HName" dataValue="HName"
-                        v-model="hform.HReceiveMan" :filterable="true">
+                    <zxz-uni-data-select v-if="operationType!=5" class="right" :localdata="HEmpList" dataKey="HName"
+                        dataValue="HName" v-model="hform.HReceiveMan" :filterable="true">
                     </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                    <view class="righton" v-else>
+                        <input disabled v-model="hform.HReceiveMan" />
+                    </view>
                 </view>
                 <view class="form-item">
                     <view class="title">绱ф�ョ被鍨�:</view>
-                    <zxz-uni-data-select class="right" :localdata="[
+                    <zxz-uni-data-select v-if="operationType!=5" class="right" :localdata="[
                         {value: '鏅��'},
                         {value: '绱ф��'}
                         ]" dataKey="value" dataValue="value" v-model="hform.HLevel">
                     </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                    <view class="righton" v-else>
+                        <input disabled v-model="hform.HLevel" />
+                    </view>
                 </view>
                 <view class="form-item">
                     <view class="title">鍙戦�佺被鍨�:</view>
-                    <zxz-uni-data-select class="right" :localdata="[
+                    <zxz-uni-data-select v-if="operationType!=5" class="right" :localdata="[
                         {value: '鍏叡'},
                         {value: '涓汉'}
                     ]" dataKey="value" dataValue="value" v-model="hform.HSendType">
                     </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                    <view class="righton" v-else>
+                        <input disabled v-model="hform.HSendType" />
+                    </view>
                 </view>
                 <view class="form-item">
                     <view class="title">鎶勯�佷汉:</view>
-                    <zxz-uni-data-select class="right" :localdata="HEmpList" dataKey="HName" dataValue="HName"
-                        :filterable="true" 
-                        :multiple="true" placeholder="璇烽�夋嫨鎶勯�佷汉..."
-                         @input="HCopyManChange">
+                    <zxz-uni-data-select v-if="operationType!=5" class="right" :localdata="HEmpList" dataKey="HName"
+                        dataValue="HName" :filterable="true" :multiple="true" placeholder="璇烽�夋嫨鎶勯�佷汉..."
+                        @input="HCopyManChange">
                     </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                    <view class="righton" v-else>
+                        <input disabled v-model="hform.HCopyMan" />
+                    </view>
                 </view>
                 <view class="form-item">
                     <view class="title">鍗曟嵁鍙�:</view>
@@ -73,33 +85,42 @@
                 </view>
                 <view class="form-item">
                     <view class="title">鎺ㄨ崘瀹屾垚鏃ユ湡:</view>
-                    <view class="right">
+                    <view class="right" v-if="operationType!=5">
                         <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HCommDate">
                             <input :value="hform.HCommDate" />
                         </uni-datetime-picker>
                     </view>
+                    <view class="righton" v-else>
+                        <input disabled :value="hform.HCommDate" />
+                    </view>
                 </view>
                 <view class="form-item">
                     <view class="title">鍙戦�侀儴闂�:</view>
-                    <zxz-uni-data-select class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О" dataValue="HItemID"
-                        v-model="hform.HDeptID" :filterable="true">
-
+                    <zxz-uni-data-select v-if="operationType!=5" class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
+                        dataValue="HItemID" v-model="hform.HDeptID" :filterable="true">
                     </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                    <view v-else class="righton">
+                        <input disabled v-model="hform.HDeptName" />
+                    </view>
                 </view>
                 <view class="form-item">
                     <view class="title">璇︾粏鍐呭:</view>
-                    <view class="right">
+                    <view class="right" v-if="operationType!=5">
                         <textarea v-model="hform.HDescription" placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" />
+                    </view>
+                    <view class="righton" v-else>
+                        <textarea disabled v-model="hform.HDescription" placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" />
                     </view>
                 </view>
                 <view class="form-item">
                     <view class="title">澶囨敞:</view>
-                    <view class="right">
+                    <view class="right" v-if="operationType!=5">
                         <textarea v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
                     </view>
+                    <view class="righton" v-else>
+                        <textarea disabled v-model="hform.HRemark" placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" />
+                    </view>
                 </view>
-
             </view>
         </template>
         <!-- 鍏朵粬淇℃伅 -->
@@ -157,10 +178,87 @@
                     </view>
                 </view>
             </view>
+        </template>
+        <!-- 鍥炲娑堟伅 -->
+        <template v-if="tabs == 3 && operationType == 5">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form-item">
+                    <view class="title" style="width: 4em;">鍥炲:</view>
+                    <view class="right">
+                        <textarea v-model="replyContent" placeholder="璇疯緭鍏ュ洖澶�" />
+                    </view>
+                </view>
 
+                <!-- 鍥炲娑堟伅鍒楄〃 -->
+                <view class="list" v-for="(item,index) in HReplyList" :key="index">
+                    <uni-card style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+                        <view class="card-detail">
+                            <template
+                                v-for="(HBillField, index) in CommonUtils.emptyValueFilter(item,HFieldList).slice(0,10)">
+                                <view class="detail" v-if="HBillField.ColmType == 'DateTime'">
+                                    <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] ? dayjs(item[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }}
+                                </view>
+                                <view class="detail" v-else>
+                                    <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] }}
+                                </view>
+                            </template>
+                        </view>
+                        <view class="card-detail" v-if="showDetail == index">
+                            <view class="card-detail">
+                                <template
+                                    v-for="(HBillField, index) in CommonUtils.emptyValueFilter(item,HFieldList).slice(10,-1)">
+                                    <view class="detail" v-if="HBillField.ColmType == 'DateTime'">
+                                        <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] ? dayjs(item[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }}
+                                    </view>
+                                    <view class="detail" v-else>
+                                        <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] }}
+                                    </view>
+                                </template>
+
+                            </view>
+                        </view>
+
+                        <view class="more" v-if="showDetail == index && operations != index">
+                            <view class="part" style="border-right: 1px solid #eee;">
+                                <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+                            </view>
+                            <view class="part" @tap.stop="operations = operations==index?-1:index">
+                                <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                    size="14"></uni-icons>鎿嶄綔
+                            </view>
+                        </view>
+                        <view class="more" v-if="showDetail != index && operations != index">
+                            <view class="part" style="border-right: 1px solid #eee;">
+                                <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;"
+                                    size="14"></uni-icons>鏇村淇℃伅
+                            </view>
+                            <view class="part" @tap.stop="operations = operations==index?-1:index">
+                                <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                    size="14"></uni-icons>鎿嶄綔
+                            </view>
+                        </view>
+                        <view class="op" v-if="operations == index">
+                            <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+                            <!-- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button> -->
+                            <button class="op3" size="mini" plain @tap.stop="VerPass(item)">楠岃瘉閫氳繃</button>
+                            <button class="op1" size="mini" plain @tap.stop="Closed(item)">缁撴</button>
+                            <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+                        </view>
+                    </uni-card>
+                </view>
+                <view class="over" v-if="HReplyList.length == 0">鏆傛棤鏁版嵁</view>
+            </view>
         </template>
         <!-- 鎿嶄綔鎸夐挳 -->
-        <view class="buttons" id="buttons">
+        <view class="buttons" id="buttons" v-if="operationType == 5">
+            <button class="btn-a" size="mini" @tap="replySubmit">鍥炲</button>
+            <view style="flex: 1;"></view>
+            <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+        </view>
+        <view class="buttons" id="buttons" v-else>
             <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
             <view style="flex: 1;"></view>
             <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
@@ -187,6 +285,8 @@
         name: 'OA_WorkLinkBill',
         data() {
             return {
+                CommonUtils,
+                dayjs,
                 tabs: 0,
                 HMainSourceBillType: "",
                 btnTop: 0,
@@ -197,6 +297,8 @@
                 refSav: 'Add', // 鎵ц鎻愪氦鐨勬搷浣滅被鍨嬶紝涓巓perationType绫讳技
                 enableEdit: true,
                 uploadOptions: {},
+                showDetail: -1,
+                operations: -1,
 
                 HEmpList: [],
                 HDeptList: [],
@@ -204,6 +306,9 @@
                 HCheckFileList: [],
                 attachmentInfo: [],
 
+                replyContent: "",
+                HReplyList: [],
+                HFieldList: [],
                 hform: {
                     HBarCode: "",
                     HBillNo: "",
@@ -424,7 +529,228 @@
                         message: "鎻愪氦鍗曟嵁澶辫触: " + err
                     })
                 }
-            }
+            },
+            async replySubmit() {
+                let valid = this.ValidCheck()
+                if (!valid.state) {
+                    return CommonUtils.showTips({
+                        message: valid.Message
+                    })
+                }
+
+                try {
+                    let oMain = this.hform;
+                    oMain["HDescriptionMain"] = oMain.HDescription
+                    oMain["HDescription"] = this.replyContent
+                    oMain = JSON.stringify(oMain)
+                    let sMainSub = oMain + ';' + getUserInfo()['Czymc'] + ';Update';
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: "/Sc_MESTransFerWorkBill/ReplyOA_WorkLinkBill",
+                        data: {
+                            "msg": sMainSub
+                        },
+                        method: "POST"
+                    })
+
+                    if (!res) {
+                        return
+                    }
+
+                    let {
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        uni.showModal({
+                            title: '鎻愮ず',
+                            content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+                            success: (res) => {
+                                if (res.confirm) {
+                                    console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                                    uni.redirectTo({
+                                        url: './OA_WorkLinkBill?operationType=1'
+                                    })
+                                } else if (res.cancel) {
+                                    console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                                    setTimeout(() => {
+                                        uni.navigateBack();
+                                    }, 50)
+                                }
+                            }
+                        });
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+                        })
+                    }
+
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "鎻愪氦鍗曟嵁澶辫触: " + err
+                    })
+                }
+            },
+            async VerPass(item) {
+                console.log('VerPass item: ', item);
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Sc_MESTransFerWorkBill/UpdateOA_WorkLinkBillSubStatus",
+                        data: {
+                            HInterID: item.HInterID,
+                            HEntryID: item.HEntryID,
+                            Type: 10
+                        }
+                    })
+
+                    if (res.data.count == 1) {
+                        this.GetOA_WorkLinkBillSub(this.hform.HInterID)
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `楠岃瘉鍥炲澶辫触: ${res.data.Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `楠岃瘉鍥炲澶辫触: ${err}`
+                    })
+                }
+            },
+            async Closed(item) {
+                console.log('Closed item: ', item);
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Sc_MESTransFerWorkBill/UpdateOA_WorkLinkBillSubStatus",
+                        data: {
+                            HInterID: item.HInterID,
+                            HEntryID: item.HEntryID,
+                            Type: 9
+                        }
+                    })
+
+                    if (res.data.count == 1) {
+                        this.GetOA_WorkLinkBillSub(this.hform.HInterID)
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `缁撴澶辫触: ${res.data.Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `缁撴澶辫触: ${err}`
+                    })
+                }
+            },
+            // 鑾峰彇宸ヤ綔鑱旂郴鍗�
+            async getWorkLinkBill(HInterID, HEntryID) {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Sc_MESTransFerWorkBill/GetOA_WorkLinkBillListCheckDetai",
+                        data: {
+                            HID: HInterID
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+
+                    if (count == 1) {
+                        // console.log('data[0]: ',data[0]);
+                        Object.assign(this.hform, data[0])
+                        this.hform.HInterID = HInterID
+                        this.hform.HEntryID = HEntryID
+                        this.tabs = 3
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鑾峰彇宸ヤ綔鑱旂郴鍗曞け璐�: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鑾峰彇宸ヤ綔鑱旂郴鍗曞け璐�: ${err}`
+                    })
+                }
+            },
+            // 鑾峰彇鍥炲鍗曟嵁鍒楄〃
+            async GetOA_WorkLinkBillSub(HInterID) {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Sc_MESTransFerWorkBill/GetOA_WorkLinkBillSub",
+                        data: {
+                            HInterID: HInterID,
+                            user: getUserInfo()["Czymc"]
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message,
+                        list
+                    } = res.data
+
+                    if (count == 1) {
+                        // console.log('data[0]: ',data[0]);
+                        this.HReplyList = data
+                        this.HFieldList = CommonUtils.fieldListFilterRole({
+                            FieldList: list,
+                            ExcludeKeys: []
+                        }).data
+
+                        console.log('this.HFieldList: ', this.HFieldList);
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鑾峰彇鍥炲淇℃伅澶辫触: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鑾峰彇鍥炲淇℃伅澶辫触: ${err}`
+                    })
+                }
+            },
+            async updateWorkLink(HInterID, HEntryID) {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Sc_MESTransFerWorkBill/UpdateOA_WorkLinkBillFlagMessage",
+                        data: {
+                            HInterID,
+                            HEntryID
+                        }
+                    })
+            
+                    let {
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        // this.switchTab(this.tabs)
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鏇存柊宸ヤ綔鑱旂郴鍗曞け璐�: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鏇存柊宸ヤ綔鑱旂郴鍗曞け璐�: ${err}`
+                    })
+                }
+            },
         },
         async onLoad(e) {
             console.log('e: ', e);
@@ -445,15 +771,20 @@
             } else if (this.operationType == 4) {
                 // 娴忚
 
+            } else if (this.operationType == 5) {
+                // 鍥炲
+                let HInterID = e.HInterID
+                let HEntryID = e.HEntryID
+                uni.setNavigationBarTitle({
+                    title: "宸ヤ綔鑱旂郴鍗曞洖澶�"
+                })
+                this.getWorkLinkBill(HInterID, HEntryID)
+                this.GetOA_WorkLinkBillSub(HInterID)
+                this.updateWorkLink(HInterID, HEntryID)
             }
-            
+
             this.getHDeptList()
-            try {
-                this.HEmpList = await getEmpList()
-            } catch (err) {
-
-            }
-
+            this.HEmpList = await getEmpList()
         },
         onReady() {
             const query = uni.createSelectorQuery().in(this)
@@ -470,5 +801,57 @@
 </script>
 
 <style lang="scss" scoped>
-    @import "@/pages/ZLGL/style/MJBillStyle.scss"
+    @import "@/pages/ZLGL/style/MJBillStyle.scss";
+
+    .more {
+        color: #888;
+        font-size: 26rpx;
+        display: flex;
+        border-top: 1px solid #eee;
+        padding-top: 20rpx;
+
+        .part {
+            width: 50%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+    }
+
+    .op {
+        display: flex;
+        justify-content: space-around;
+        margin-top: 20rpx;
+
+        button {
+            padding: 0;
+            width: 150rpx;
+            font-size: 25rpx;
+        }
+
+        .op1 {
+            border: 1px solid #41a863;
+            color: #41a863;
+        }
+
+        .op2 {
+            border: 1px solid #d98d00;
+            color: #d98d00;
+        }
+
+        .op3 {
+            border: 1px solid #3a78ff;
+            color: #3a78ff;
+        }
+
+        .op4 {
+            border: 1px solid #da0000;
+            color: #da0000;
+        }
+
+        .op5 {
+            border: 1px solid #888;
+            color: #888;
+        }
+    }
 </style>
\ No newline at end of file
diff --git a/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue b/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
new file mode 100644
index 0000000..7dc9a5c
--- /dev/null
+++ b/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
@@ -0,0 +1,271 @@
+<template>
+    <view>
+        <view class="tabs" id="tabs">
+            <view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">鏈娑堟伅</view>
+            <view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">鎴戞帴鏀剁殑</view>
+            <view :class="tabs == 2 ? 'on':''" @tap="switchTab(2)">鎴戝彂閫佺殑</view>
+            <view :class="tabs == 3 ? 'on':''" @tap="switchTab(3)">鎶勯�佹垜鐨�</view>
+        </view>
+
+        <!-- 宸ヤ綔鑱旂郴鍗� 鍒楄〃 -->
+        <view class="list" v-for="(item,index) in BillsDisplay" :key="index">
+            <uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+                @tap="showDetail = showDetail==index?-1:index">
+                <view class="card-detail">
+                    <template v-for="(HBillField, index) in CommonUtils.emptyValueFilter(item,HFieldList).slice(0,10)">
+                        <view class="detail" v-if="HBillField.ColmType == 'DateTime'">
+                            <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] ? dayjs(item[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }}
+                        </view>
+                        <view class="detail" v-else>
+                            <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] }}
+                        </view>
+                    </template>
+                </view>
+                <view class="card-detail" v-if="showDetail == index">
+                    <view class="card-detail">
+                        <template
+                            v-for="(HBillField, index) in CommonUtils.emptyValueFilter(item,HFieldList).slice(10,-1)">
+                            <view class="detail" v-if="HBillField.ColmType == 'DateTime'">
+                                <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] ? dayjs(item[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }}
+                            </view>
+                            <view class="detail" v-else>
+                                <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] }}
+                            </view>
+                        </template>
+
+                    </view>
+                </view>
+
+                <view class="more" v-if="showDetail == index && operations != index">
+                    <view class="part" style="border-right: 1px solid #eee;">
+                        <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+                    </view>
+                    <view class="part" @tap.stop="operations = operations==index?-1:index">
+                        <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+                    </view>
+                </view>
+                <view class="more" v-if="showDetail != index && operations != index">
+                    <view class="part" style="border-right: 1px solid #eee;">
+                        <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+                    </view>
+                    <view class="part" @tap.stop="operations = operations==index?-1:index">
+                        <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+                    </view>
+                </view>
+                <view class="op" v-if="operations == index">
+                    <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+                    <!-- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button> -->
+                    <button class="op3" size="mini" plain @tap.stop="displayDetail(item)">鏌ョ湅璇︽儏</button>
+                    <button class="op1" size="mini" plain @tap.stop="reply(item)">鍥炲</button>
+                    <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+                </view>
+            </uni-card>
+        </view>
+        <view class="over" v-if="BillsDisplay.length == 0">鏆傛棤鏁版嵁</view>
+    </view>
+</template>
+
+<script>
+    import {
+        getUserInfo
+    } from '../../../utils/auth';
+    import {
+        CommonUtils
+    } from '../../../utils/common';
+    import dayjs from 'dayjs';
+    export default {
+        // 宸ヤ綔鑱旂郴鍗曟煡璇� 妯″潡
+        name: 'OA_WorkLinkBillQuery',
+        data() {
+            return {
+                dayjs,
+                CommonUtils,
+                tabs: 0,
+                BillsDisplay: [],
+                HFieldList: [], // 瀛楁鍒楄〃
+                sWhere: "",
+                showDetail: -1,
+                operations: -1,
+            };
+        },
+        methods: {
+            switchTab(tabIndex) {
+                this.tabs = tabIndex
+                switch (tabIndex) {
+                    case 0:
+                        this.sWhere = ` and 鎺ユ敹浜� = '${getUserInfo()['HEmpName']}' and 闃呰鐘舵�� = '鏈槄'`
+                        break;
+                    case 1:
+                        this.sWhere = ` and 鎺ユ敹浜� = '${getUserInfo()['HEmpName']}'`
+                        break;
+                    case 2:
+                        this.sWhere = ` and 鍙戦�佷汉 = '${getUserInfo()['HEmpName']}'`
+                        break;
+                    case 3:
+                        this.sWhere = ` and 鎶勯�佹帴鏀朵汉 = '${getUserInfo()['HEmpName']}'`
+                        break;
+                    default:
+                        this.sWhere = ` and 鎺ユ敹浜� = '${getUserInfo()['HEmpName']}'`
+                }
+                this.getWorkLinkList()
+            },
+            async getWorkLinkList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: 'Sc_MESTransFerWorkBill/GetOA_WorkLinkBillList',
+                        data: {
+                            sWhere: this.sWhere,
+                            user: getUserInfo()["Czymc"]
+                        }
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message,
+                        list
+                    } = res.data
+                    if (count == 1) {
+                        console.log('data: ', data);
+
+                        this.BillsDisplay = data
+
+
+                        let fieldList = CommonUtils.fieldListFilterRole({
+                            ExcludeKeys: ['鏃ユ湡', '鍗曟嵁鍙�'],
+                            FieldList: list
+                        })
+
+                        if (fieldList.status == false) {
+                            CommonUtils.showTips({
+                                title: '娓╅Θ鎻愮ず',
+                                message: `鑾峰彇琛ㄥ崟缁撴瀯澶辫触: ${fieldList.Message}`
+                            })
+                        }
+
+                        this.HFieldList = fieldList.data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鑾峰彇缁翠慨鍗曞紓甯�: ${Message}`
+                        })
+                    }
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鑾峰彇缁翠慨鍗曞紓甯�: ${err}`
+                    })
+                }
+            },
+            displayDetail(item) {
+                uni.showModal({
+                    title: `${item["涓婚"]}`,
+                    content: `${item["鍐呭"]}`,
+                    showCancel: false,
+                    success: async (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            // 鍙戦�� 璇ュ崟鎹� 宸查槄璇锋眰鍒板悗绔�
+                            this.updateWorkLink(item.hmainid, item.HEntryID)
+                        }
+                    }
+                })
+            },
+            async updateWorkLink(HInterID, HEntryID) {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Sc_MESTransFerWorkBill/UpdateOA_WorkLinkBillFlagMessage",
+                        data: {
+                            HInterID,
+                            HEntryID
+                        }
+                    })
+
+                    let {
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.switchTab(this.tabs)
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鏇存柊宸ヤ綔鑱旂郴鍗曞け璐�: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鏇存柊宸ヤ綔鑱旂郴鍗曞け璐�: ${err}`
+                    })
+                }
+            },
+            reply(item) {
+                uni.navigateTo({
+                    url: `/pages/ZLGL/OA_WorkLink/OA_WorkLinkBill?HInterID=${item.hmainid}`
+                    + `&HEntryID=${item.HEntryID}&operationType=5`
+                })
+            }
+        },
+        onShow() {
+            this.switchTab(0)
+        }
+    }
+</script>
+
+<style lang="scss">
+    @import "@/pages/MJGL/style/MJBillStyle.scss";
+
+    .more {
+        color: #888;
+        font-size: 26rpx;
+        display: flex;
+        border-top: 1px solid #eee;
+        padding-top: 20rpx;
+
+        .part {
+            width: 50%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+    }
+
+    .op {
+        display: flex;
+        justify-content: space-around;
+        margin-top: 20rpx;
+
+        button {
+            padding: 0;
+            width: 150rpx;
+            font-size: 25rpx;
+        }
+
+        .op1 {
+            border: 1px solid #41a863;
+            color: #41a863;
+        }
+
+        .op2 {
+            border: 1px solid #d98d00;
+            color: #d98d00;
+        }
+
+        .op3 {
+            border: 1px solid #3a78ff;
+            color: #3a78ff;
+        }
+
+        .op4 {
+            border: 1px solid #da0000;
+            color: #da0000;
+        }
+
+        .op5 {
+            border: 1px solid #888;
+            color: #888;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue b/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
index 74c82a2..5edebd6 100644
--- a/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
+++ b/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
@@ -199,17 +199,17 @@
 					HSampleDamageQty: 0,
 					TestType: '棣栨',
 					HBadNote: '',
-					HDeptName: '',
-					HDeptID: 0,
-					HCenterID: 0,
+					HDeptName: getUserInfo().HDeptName,
+					HDeptID: getUserInfo().HDeptID,
+					HCenterID: getUserInfo().HWorkCenterID,
 					HShiftsName: '',
 					HShiftsID: 0,
-					HGroupName: '',
-					HGroupID: 0,
-					HCheckEmpName: '',
-					HCheckEmp: '',
-					HSourceName: '',
-					HSourceID: 0,
+					HGroupName: getUserInfo().HGroupName,
+					HGroupID: getUserInfo().HGroupID,
+					HCheckEmpName: getUserInfo().HEmpName,
+					HCheckEmp: getUserInfo().HEmpID,
+					HSourceName: getUserInfo().HSourceName,
+					HSourceID: getUserInfo().HSourceID,
 					HDate: dayjs(new Date()).format("YYYY-MM-DD"),
 					HBillNo: '',
 					HInterID: 0,
@@ -268,7 +268,7 @@
 			let {
 				operationType
 			} = e
-			if (operationType == 0) {
+			if (operationType == 0 || operationType == 1) {
 				this.getMaxNum()
 				this.refSav = 'Add'
 			} else {
@@ -281,6 +281,7 @@
 			this.GetEmployeeList()
 			this.getSourceList()
 			this.GetDepartmentList()
+			this.get_HWorkShift()
 		},
 		methods: {
 			HDeptNameChangeHandler() {
@@ -367,7 +368,7 @@
 					url: '/Web/GetEmployeeList_Json',
 					data: {
 						Employee: '',
-						HGroupID: this.hform.HGroupID
+						HGroupID:0
 					},
 					resFunction: (res) => {
 						let {
@@ -625,6 +626,7 @@
 								"HICMOBillNo": data1[0].浠诲姟鍗曞彿, //鐢熶骇璁㈠崟
 								"HDeptID": data1[0].HWorkShopID, //杞﹂棿ID
 								"HDeptName": data1[0].鐢熶骇杞﹂棿, //杞﹂棿
+								
 							})
 
 							uni.showToast({
@@ -706,10 +708,23 @@
 							Message
 						} = res.data
 						if (count == 1) {
-							return uni.showToast({
-								icon: 'none',
-								title: "鎻愪氦鎴愬姛!"
-							})
+							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)
+							        }
+							    }
+							});
 						} else {
 							return uni.showToast({
 								icon: 'none',
@@ -721,7 +736,7 @@
 			},
 			onAddNewHandler() {
 				uni.redirectTo({
-					url: "/pages/quyangdan/TakeSampleCheckBillList?operationType=0"
+					url: "/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=1"
 				})
 			},
 			goBack() {
diff --git a/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBillList.vue b/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBillList.vue
index edcaf01..37eb7d2 100644
--- a/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBillList.vue
+++ b/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBillList.vue
@@ -173,9 +173,7 @@
                     </view>
 
                     <view class="op" v-if="operations == index">
-                        <!-- <button class="op1" size="mini" plain @tap.stop="">瀛愯〃淇℃伅</button> -->
-                        <!-- <button class="op2" size="mini" plain @tap.stop="">鍙嶅鏍�</button> -->
-                        <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+                        <button class="op3" size="mini" plain @tap.stop="Xt_FistCheck(item)">涓嬫帹棣栦欢鍗�</button>
                         <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
                         <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
                     </view>
@@ -275,6 +273,16 @@
                     url: "/pages/quyangdan/TakeSampleCheckBill?operationType=0"
                 })
             },
+			Xt_FistCheck(item){
+				uni.navigateTo({
+					url: '/pages/ZLGL/shoujianjianyan/firstCheckBill?operationType=2&linterid=' +
+						item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙� + '&HSouceBillType=7521',
+					success: () => {
+						// 璺宠浆鎴愬姛鍚庤Е鍙戞煡璇�
+						this.onSearchClickHandler()
+					}
+				})
+			},
             del(item) {
                 uni.showModal({
                     title: '鍒犻櫎纭',
diff --git a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
index c0b1d90..bcde29c 100644
--- a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -715,30 +715,56 @@
 						})
 						return;
 					}
-					this.hform.HMaterID = data[0]['HMaterID']
-					this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
-					this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
-					this.hform.HMainSourceBillNo = data[0]['HBillNo']
-					this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
-					this.hform.HMainSourceInterID = data[0].HInterID
-					this.hform.HMainSourceEntryID = data[0].HEntryID
-					this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
-					this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
-					this.hform.HSourceBillQty = data[0].HSourceBillQty
-					this.hasSourceBill = true
-					this.hform.HICMOBillNo= data[0].浠诲姟鍗曞彿
-					this.hform.HICMOInterID= data[0].HICMOInterID
-					this.hform.HICMOEntryID= data[0].HICMOEntryID
-					this.hform.HICMOQty= data[0].鐢熶骇鏁伴噺
-					this.hform.HProcExchBillNo= data[0].鍗曟嵁鍙�
-					this.hform.HProcExchInterID= data[0].HInterID
-					this.hform.HProcExchEntryID= data[0].HEntryID
-					this.hform.HProcExchQty= data[0].娴佽浆鍗℃暟閲�
-					this.hform.HSourceName= data[0].鐢熶骇璧勬簮
-					this.hform.HSourceID= data[0].HSourceID
-					this.hform.HProcID= data[0].HProcID
-					this.hform.HProcName= data[0].褰撳墠宸ュ簭
-
+					if(this.hform.HSourceBillType=="3791"){  //鍑虹珯鍗�
+						this.hform.HMaterID = data[0]['HMaterID']
+						this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+						this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+						this.hform.HMainSourceBillNo = data[0]['鍗曟嵁鍙�']
+						this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
+						this.hform.HMainSourceInterID = data[0].HInterID
+						this.hform.HMainSourceEntryID = data[0].HEntryID
+						this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+						this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+						this.hform.HSourceBillQty = data[0].HSourceBillQty
+						this.hasSourceBill = true
+						this.hform.HICMOBillNo= data[0].浠诲姟鍗曞彿
+						this.hform.HICMOInterID= data[0].HICMOInterID
+						this.hform.HICMOEntryID= data[0].HICMOEntryID
+						this.hform.HICMOQty= data[0].鐢熶骇鏁伴噺
+						this.hform.HProcExchBillNo= data[0].HProcExchBillNo
+						this.hform.HProcExchInterID= data[0].HProcExchInterID
+						this.hform.HProcExchEntryID= data[0].HProcExchEntryID
+						this.hform.HProcExchQty= data[0].娴佽浆鍗℃暟閲�
+						this.hform.HSourceName= data[0].鐢熶骇璧勬簮
+						this.hform.HSourceID= data[0].HSourceID
+						this.hform.HProcID= data[0].HProcID
+						this.hform.HProcName= data[0].宸ュ簭鍚嶇О
+						this.hform.HCheckQty=data[0].鍑虹珯鏁伴噺
+					}else{
+						this.hform.HMaterID = data[0]['HMaterID']
+						this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+						this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+						this.hform.HMainSourceBillNo = data[0]['HBillNo']
+						this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
+						this.hform.HMainSourceInterID = data[0].HInterID
+						this.hform.HMainSourceEntryID = data[0].HEntryID
+						this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+						this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+						this.hform.HSourceBillQty = data[0].HSourceBillQty
+						this.hasSourceBill = true
+						this.hform.HICMOBillNo= data[0].浠诲姟鍗曞彿
+						this.hform.HICMOInterID= data[0].HICMOInterID
+						this.hform.HICMOEntryID= data[0].HICMOEntryID
+						this.hform.HICMOQty= data[0].鐢熶骇鏁伴噺
+						this.hform.HProcExchBillNo= data[0].鍗曟嵁鍙�
+						this.hform.HProcExchInterID= data[0].HInterID
+						this.hform.HProcExchEntryID= data[0].HEntryID
+						this.hform.HProcExchQty= data[0].娴佽浆鍗℃暟閲�
+						this.hform.HSourceName= data[0].鐢熶骇璧勬簮
+						this.hform.HSourceID= data[0].HSourceID
+						this.hform.HProcID= data[0].HProcID
+						this.hform.HProcName= data[0].褰撳墠宸ュ簭
+					}
 					this.get_CheckItem();
 				} else {
 					CommonUtils.showTips({
@@ -776,29 +802,56 @@
 							})
 							return;
 						}
-			            this.hform.HMaterID = data[0]['HMaterID']
-			            this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
-			            this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
-			            this.hform.HMainSourceBillNo = data[0]['HBillNo']
-			            this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
-			            this.hform.HMainSourceInterID = data[0].HInterID
-			            this.hform.HMainSourceEntryID = data[0].HEntryID
-			            this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
-			            this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
-			            this.hform.HSourceBillQty = data[0].HSourceBillQty
-			            this.hform.HICMOBillNo= data[0].浠诲姟鍗曞彿
-			            this.hform.HICMOInterID= data[0].HICMOInterID
-			            this.hform.HICMOEntryID= data[0].HICMOEntryID
-			            this.hform.HICMOQty= data[0].鐢熶骇鏁伴噺
-			            this.hform.HProcExchBillNo= data[0].鍗曟嵁鍙�
-			            this.hform.HProcExchInterID= data[0].HInterID
-			            this.hform.HProcExchEntryID= data[0].HEntryID
-			            this.hform.HProcExchQty= data[0].娴佽浆鍗℃暟閲�
-			            this.hform.HSourceName= data[0].鐢熶骇璧勬簮
-			            this.hform.HSourceID= data[0].HSourceID
-			            this.hform.HProcID= data[0].HProcID
-			            this.hform.HProcName= data[0].褰撳墠宸ュ簭
-			
+						if(this.hform.HSourceBillType=="3791"){
+							this.hform.HMaterID = data[0]['HMaterID']
+							this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+							this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+							this.hform.HMainSourceBillNo = data[0]['鍗曟嵁鍙�']
+							this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
+							this.hform.HMainSourceInterID = data[0].HInterID
+							this.hform.HMainSourceEntryID = data[0].HEntryID
+							this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+							this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+							this.hform.HSourceBillQty = data[0].HSourceBillQty
+							this.hasSourceBill = true
+							this.hform.HICMOBillNo= data[0].浠诲姟鍗曞彿
+							this.hform.HICMOInterID= data[0].HICMOInterID
+							this.hform.HICMOEntryID= data[0].HICMOEntryID
+							this.hform.HICMOQty= data[0].鐢熶骇鏁伴噺
+							this.hform.HProcExchBillNo= data[0].HProcExchBillNo
+							this.hform.HProcExchInterID= data[0].HProcExchInterID
+							this.hform.HProcExchEntryID= data[0].HProcExchEntryID
+							this.hform.HProcExchQty= data[0].娴佽浆鍗℃暟閲�
+							this.hform.HSourceName= data[0].鐢熶骇璧勬簮
+							this.hform.HSourceID= data[0].HSourceID
+							this.hform.HProcID= data[0].HProcID
+							this.hform.HProcName= data[0].宸ュ簭鍚嶇О
+							this.hform.HCheckQty=data[0].鍑虹珯鏁伴噺
+						}else{
+							this.hform.HMaterID = data[0]['HMaterID']
+							this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+							this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+							this.hform.HMainSourceBillNo = data[0]['HBillNo']
+							this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
+							this.hform.HMainSourceInterID = data[0].HInterID
+							this.hform.HMainSourceEntryID = data[0].HEntryID
+							this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+							this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+							this.hform.HSourceBillQty = data[0].HSourceBillQty
+							this.hform.HICMOBillNo= data[0].浠诲姟鍗曞彿
+							this.hform.HICMOInterID= data[0].HICMOInterID
+							this.hform.HICMOEntryID= data[0].HICMOEntryID
+							this.hform.HICMOQty= data[0].鐢熶骇鏁伴噺
+							this.hform.HProcExchBillNo= data[0].鍗曟嵁鍙�
+							this.hform.HProcExchInterID= data[0].HInterID
+							this.hform.HProcExchEntryID= data[0].HEntryID
+							this.hform.HProcExchQty= data[0].娴佽浆鍗℃暟閲�
+							this.hform.HSourceName= data[0].鐢熶骇璧勬簮
+							this.hform.HSourceID= data[0].HSourceID
+							this.hform.HProcID= data[0].HProcID
+							this.hform.HProcName= data[0].褰撳墠宸ュ簭
+						}
+			            
 			            this.get_CheckItem();
 			            this.hasSourceBill = true
 			            this.$refs['billList'].exit()
@@ -1708,7 +1761,7 @@
 							CheckProjectID: this.hform.HQCSchemeID || 0,
 							HBatchQty: this.hform.HProcExchQty || 0,
 							HMaterID: this.hform.HMaterID,
-							HBillType: '鐢熶骇鍏ュ簱妫�鏂规'
+							HBillType: '鏈欢妫�鏂规'
 						},
 					});
 
@@ -1731,7 +1784,7 @@
 								HUnit: data[i]["鍗曚綅鍚嶇О"],
 								HQCNote: "",
 								HAnalysisMethod: data[i]["鍒嗘瀽鏂规硶"],
-								HResult: data[i]["榛樿缁撹"],
+								HResult: data[i]["HResult"],
 								HMax: "",
 								HMin: "",
 								HAvg: "",
@@ -1917,9 +1970,7 @@
 						checkItemsArray.push(checkItem);
 					}
 					console.log('checkItemsArray: ', checkItemsArray);
-					let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(
-          checkItemsArray
-        )};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0]}`;
+					let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(checkItemsArray)};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0]}`;
 					console.log("this.checkItems: ", this.checkItems);
 
 					let res = await CommonUtils.doRequest2Sync({
@@ -2147,7 +2198,10 @@
 			} else if (this.operationType == 3) {
 				await this.RoadBillMain();
 			}
-
+			if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
+				this.HSourceBillType = "宸ュ簭鍑虹珯姹囨姤鍗�"; // 鏄剧ず鍚嶇О
+				this.hform.HSourceBillType = "3791"; // 瀵瑰簲鐨勫��
+			}
 			await this.InitHSource();
 			await this.InitHWorkShift();
 			await this.InitHEmp();
diff --git a/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue b/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
index 83e4ffd..dc1a4a7 100644
--- a/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
+++ b/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
@@ -1,2574 +1,2632 @@
 <template>
-    <view>
-        <!-- 涓昏〃鍖哄煙 -->
-        <view class="bill-main-area">
-            <!-- 涓昏〃椤电 -->
-            <view class="bill-main-tabs">
-                <view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">鍩烘湰淇℃伅</view>
-                <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍏朵粬淇℃伅</view>
-                <view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">鍒跺崟淇℃伅</view>
-            </view>
-            <!-- 涓昏〃鍐呭 -->
-            <view class="bill-main-contents">
-                <!-- 鍩烘湰淇℃伅 -->
-                <view class="bill-main-content" v-if="mainTabSelected == 1">
-                    <view class="form-item">
-                        <view class="left">鍗曟嵁鍙�</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HBillNo" disabled />
-                        </view>
-                    </view>
+	<view>
+		<!-- 涓昏〃鍖哄煙 -->
+		<view class="bill-main-area">
+			<!-- 涓昏〃椤电 -->
+			<view class="bill-main-tabs">
+				<view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">鍩烘湰淇℃伅</view>
+				<view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍏朵粬淇℃伅</view>
+				<view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">鍒跺崟淇℃伅</view>
+			</view>
+			<!-- 涓昏〃鍐呭 -->
+			<view class="bill-main-contents">
+				<!-- 鍩烘湰淇℃伅 -->
+				<view class="bill-main-content" v-if="mainTabSelected == 1">
+					<view class="form-item">
+						<view class="left">鍗曟嵁鍙�</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HBillNo" disabled />
+						</view>
+					</view>
 
-                    <view class="form-item">
-                        <view class="left">鏃ユ湡</view>
-                        <view class="right">
-                            <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HDate">
-                                <view>{{ hform.HDate }}</view>
-                            </uni-datetime-picker>
-                        </view>
-                    </view>
+					<view class="form-item">
+						<view class="left">鏃ユ湡</view>
+						<view class="right">
+							<uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HDate">
+								<view>{{ hform.HDate }}</view>
+							</uni-datetime-picker>
+						</view>
+					</view>
 
-                    <view class="form-item">
-                        <view class="left">婧愬崟鍗曞彿</view>
-                        <view class="right" :class="!hasSourceBill?'':'disabled'">
-                            <input type="text" :disabled="hasSourceBill" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�"
-                                v-model="hform.HSourceBillNo" @confirm="getSourceBillInfo(hform.HSourceBillNo)" />
-                        </view>
-                        <view class="icon-wrapper-big">
-                            <uni-icons class="right-icon" type="scan"
-                                :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
-                                :disabled="hasSourceBill" size="20" @click="toScanCode"></uni-icons>
-                        </view>
-                        <view class="icon-wrapper-big">
-                            <uni-icons class="right-icon" type="search"
-                                :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
-                                :disabled="hasSourceBill" size="20" @click="toBillSelector"></uni-icons>
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">婧愬崟鏁伴噺</view>
-                        <view class="right disabled">
-                            <input type="number" v-model="hform.HSourceBillQty" />
-                        </view>
-                    </view>
-                    <view class="form-item" v-if="false">
-                        <view class="left">鐢熶骇璧勬簮</view>
-                        <view class="right">
-                            <uni-combox :candidates="GySourceNameList" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
-                                @update:modelValue="HSourceChange"></uni-combox>
-                        </view>
-                    </view>
-                    <view class="form-item" v-if="false">
-                        <view class="left">鐢熶骇鐝</view>
-                        <view class="right">
-                            <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
-                                v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
-                        </view>
-                    </view>
-                    <view class="form-item" v-if="false">
-                        <view class="left">浠诲姟鍗曞彿</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HICMOBillNo" disabled />
-                        </view>
-                        <view class="icon-wrapper-big"><uni-icons type="search" size="20"
-                                :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
-                                :disabled="hasSourceBill" @click="showSelectorModule(hform, 5)"></uni-icons></view>
-                    </view>
-                    <view class="form-item" v-if="false">
-                        <view class="left">娴佽浆鍗″彿</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HProcExchBillNo" disabled />
-                        </view>
-                        <view class="icon-wrapper-big"><uni-icons type="search" size="20"
-                                :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
-                                :disabled="hasSourceBill" @click="showSelectorModule(hform, 6)"></uni-icons></view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">浜у搧浠ｇ爜</view>
-                        <view class="right disabled">
-                            <input type="text" disabled :value="hform.HMaterNumber" />
-                        </view>
-                        <view class="icon-wrapper-big">
-                            <uni-icons type="search" size="20"
-                                :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
-                                :disabled="hasSourceBill" @click="showSelectorModule(hform, 4)"></uni-icons>
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">浜у搧鍚嶇О</view>
-                        <view class="right disabled">
-                            <input type="text" disabled :value="hform.HMaterName" />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">妫�楠屾暟閲�</view>
-                        <view class="right">
-                            <input type="number" v-model="hform.HCheckQty" />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">妫�楠屽憳</view>
-                        <view class="right">
-                            <uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="璇烽�夋嫨妫�楠屽憳"
-                                v-model="hform.HFirstCheckEmpName"
-                                @update:modelValue="HFirstCheckEmpChange"></uni-combox>
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">妫�楠屾柟妗�</view>
-                        <view class="right disabled">
-                            <input type="text" disabled :value="this.hform.HQCSchemeName" />
-                        </view>
-                        <view class="icon-wrapper-big"><uni-icons type="search" size="20" class="enable-icon-button"
-                                @click="showSelectorModule(hform, 7)"></uni-icons></view>
-                    </view>
+					<view class="form-item">
+						<view class="left">婧愬崟鍗曞彿</view>
+						<view class="right" :class="!hasSourceBill?'':'disabled'">
+							<input type="text" :disabled="hasSourceBill" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�"
+								v-model="hform.HSourceBillNo" @confirm="getSourceBillInfo(hform.HSourceBillNo)" />
+						</view>
+						<view class="icon-wrapper-big">
+							<uni-icons class="right-icon" type="scan"
+								:class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+								:disabled="hasSourceBill" size="20" @click="toScanCode"></uni-icons>
+						</view>
+						<view class="icon-wrapper-big">
+							<uni-icons class="right-icon" type="search"
+								:class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+								:disabled="hasSourceBill" size="20" @click="toBillSelector"></uni-icons>
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">婧愬崟鏁伴噺</view>
+						<view class="right disabled">
+							<input type="number" v-model="hform.HSourceBillQty" />
+						</view>
+					</view>
+					<view class="form-item" v-if="false">
+						<view class="left">鐢熶骇璧勬簮</view>
+						<view class="right">
+							<uni-combox :candidates="GySourceNameList" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
+								@update:modelValue="HSourceChange"></uni-combox>
+						</view>
+					</view>
+					<view class="form-item" v-if="false">
+						<view class="left">鐢熶骇鐝</view>
+						<view class="right">
+							<uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
+								v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
+						</view>
+					</view>
+					<view class="form-item" v-if="false">
+						<view class="left">浠诲姟鍗曞彿</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HICMOBillNo" disabled />
+						</view>
+						<view class="icon-wrapper-big"><uni-icons type="search" size="20"
+								:class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+								:disabled="hasSourceBill" @click="showSelectorModule(hform, 5)"></uni-icons></view>
+					</view>
+					<view class="form-item" v-if="false">
+						<view class="left">娴佽浆鍗″彿</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HProcExchBillNo" disabled />
+						</view>
+						<view class="icon-wrapper-big"><uni-icons type="search" size="20"
+								:class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+								:disabled="hasSourceBill" @click="showSelectorModule(hform, 6)"></uni-icons></view>
+					</view>
+					<view class="form-item">
+						<view class="left">浜у搧浠ｇ爜</view>
+						<view class="right disabled">
+							<input type="text" disabled :value="hform.HMaterNumber" />
+						</view>
+						<view class="icon-wrapper-big">
+							<uni-icons type="search" size="20"
+								:class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+								:disabled="hasSourceBill" @click="showSelectorModule(hform, 4)"></uni-icons>
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">浜у搧鍚嶇О</view>
+						<view class="right disabled">
+							<input type="text" disabled :value="hform.HMaterName" />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">妫�楠屾暟閲�</view>
+						<view class="right">
+							<input type="number" v-model="hform.HCheckQty" />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">妫�楠屽憳</view>
+						<view class="right">
+							<uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="璇烽�夋嫨妫�楠屽憳"
+								v-model="hform.HFirstCheckEmpName"
+								@update:modelValue="HFirstCheckEmpChange"></uni-combox>
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">妫�楠屾柟妗�</view>
+						<view class="right disabled">
+							<input type="text" disabled :value="this.hform.HQCSchemeName" />
+						</view>
+						<view class="icon-wrapper-big"><uni-icons type="search" size="20" class="enable-icon-button"
+								@click="showSelectorModule(hform, 7)"></uni-icons></view>
+					</view>
 
-                    <view class="form-item">
-                        <view class="left">鍒ゆ柇缁撹</view>
-                        <view class="right none-border">
-                            <radio-group @changer="checkResultChange">
-                                <label>
-                                    <radio value="0" :checked="hform.HLastResult" /><text></text>
-                                    鍚堟牸
-                                </label>
-                                <view style="width: 20rpx; display: inline-block"></view>
-                                <label>
-                                    <radio value="1" :checked="!hform.HLastResult" /><text></text>
-                                    涓嶅悎鏍�
-                                </label>
-                            </radio-group>
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">宸ュ簭</view>
-                        <view class="right disabled">
-                            <input type="text" disabled :value="hform.HProcName" />
-                        </view>
-                        <view class="icon-wrapper-big"><uni-icons type="search" size="20"
-                                :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
-                                :disabled="hasSourceBill" @click="showSelectorModule(hform, 8)"></uni-icons></view>
-                    </view>
+					<view class="form-item">
+						<view class="left">鍒ゆ柇缁撹</view>
+						<view class="right none-border">
+							<radio-group @changer="checkResultChange">
+								<label>
+									<radio value="0" :checked="hform.HLastResult" /><text></text>
+									鍚堟牸
+								</label>
+								<view style="width: 20rpx; display: inline-block"></view>
+								<label>
+									<radio value="1" :checked="!hform.HLastResult" /><text></text>
+									涓嶅悎鏍�
+								</label>
+							</radio-group>
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">宸ュ簭</view>
+						<view class="right disabled">
+							<input type="text" disabled :value="hform.HProcName" />
+						</view>
+						<view class="icon-wrapper-big"><uni-icons type="search" size="20"
+								:class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+								:disabled="hasSourceBill" @click="showSelectorModule(hform, 8)"></uni-icons></view>
+					</view>
 
-                </view>
-                <!-- 鍏朵粬淇℃伅 -->
-                <view class="bill-main-content" v-if="mainTabSelected == 2">
-                    <view class="form-item">
-                        <view class="left">婧愬崟绫诲瀷</view>
-                        <view class="right" style="position: relative" :class="!hasSourceBill?'':'disabled'">
-                            <picker mode="selector" :range="HSourceBillTypeNameList" :disabled="hasSourceBill"
-                                @change="HSourceBillTypeNameChange">
-                                <input type="text" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" v-model="HSourceBillType" disabled />
-                                <view class="picker-overlay"></view>
-                            </picker>
-                        </view>
-                    </view>
-                    <view class="form-item" v-if="false">
-                        <view class="left">鐢熶骇鐝</view>
-                        <view class="right">
-                            <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
-                                v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">寮傚父涓存椂澶勭悊鏂规</view>
-                        <view class="right">
-                            <input type="text" v-model="hform.HErrTreatment" value="" />
-                        </view>
-                    </view>
-                    <view class="form-item" >
-                        <view class="left">浠诲姟鍗曟暟閲�</view>
-                        <view class="right">
-                            <input type="number" v-model="hform.HICMOQty" />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">娴佽浆鍗℃暟閲�</view>
-                        <view class="right">
-                            <input type="number" v-model="hform.HProcExchQty" />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">鎵瑰彿</view>
-                        <view class="right">
-                            <input type="text" value="" />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">澶囨敞</view>
-                        <view class="right">
-                            <input type="text" v-model="hform.HRemark" value="" />
-                        </view>
-                    </view>
-                </view>
-                <!-- 鍒跺崟淇℃伅 -->
-                <view class="bill-main-content" v-if="mainTabSelected == 3">
-                    <view class="form-item">
-                        <view class="left">鍒跺崟浜�</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HMaker" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">鍒跺崟鏃ユ湡</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HMakeDate" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">瀹℃牳浜�</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HChecker" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">瀹℃牳鏃ユ湡</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HCheckDate" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">鍏抽棴浜�</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HCloseMan" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">鍏抽棴鏃ユ湡</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HCloseDate" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">淇敼浜�</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HUpDater" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">淇敼鏃ユ湡</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HUpDateDate" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">浣滃簾浜�</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HDeleteMan" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">浣滃簾鏃ユ湡</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HDeleteDate" disabled />
-                        </view>
-                    </view>
-                </view>
-            </view>
-        </view>
-        <!-- 瀛愯〃鍖哄煙 -->
-        <view class="bill-sub-area">
-            <!-- 瀛愯〃椤电 -->
-            <view class="bill-sub-tabs">
-                <view v-for="subTab in subTabs" :key="subTab.id" :class="subTab.id == subTabSelected ? 'selected' : ''"
-                    @tap="subTabSelected = subTab.id">{{ subTab.name }}</view>
-            </view>
-            <!-- 瀛愯〃鍐呭 -->
-            <view class="bill-main-contents">
-                <!-- 妫�楠岄」鐩� 鍛堢幇 -->
-                <view v-if="subTabSelected == 1">
-                    <!-- 闇�閫氳繃鏄惧紡璋冪敤蹇界暐$event鍙傛暟 -->
-                    <view class="buttons" @tap="addCheckItem()">
-                        <uni-icons type="plus" style="margin-right: 10rpx" size="22"></uni-icons>鏂板
-                    </view>
-                    <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
-                    <view class="list" v-else>
-                        <uni-card v-for="checkItem in checkItems" :key="checkItem.num">
-                            <view class="card-detail">
-                                <view class="detail"> <text>搴忓彿锛�</text>{{ checkItem.num }} </view>
-                                <view class="detail editable">
-                                    <view style="flex-shrink: 0"><text>妫�楠岄」鐩細</text></view>
-                                    <input type="text" :value="checkItem.HQCCheckItemName" disabled="" />
-                                    <view class="icon-wrapper"><uni-icons type="search" size="16"
-                                            @click="showSelectorModule(checkItem, 2)"></uni-icons></view>
-                                </view>
-                                <view class="detail editable">
-                                    <view style="flex-shrink: 0"><text>妫�楠屼华鍣細</text></view>
-                                    <input type="text" :value="checkItem.HInspectInstruMentName" disabled="" />
-                                    <view class="icon-wrapper"><uni-icons type="search" size="16"
-                                            @click="showSelectorModule(checkItem, 3)"></uni-icons></view>
-                                </view>
-                                <view class="detail editable">
-                                    <view><text>缁撹锛�</text></view>
-                                    <view style="width: 4em">
-                                        {{ checkItem.HResult == 1 ? "鍚堟牸" : "涓嶅悎鏍�" }}
-                                    </view>
-                                    <view>
-                                        <switch style="width: 2em; transform: scale(0.7)"
-                                            :checked="checkItem.HResult == 1"
-                                            @change="HResultChange(checkItem.num, $event)" />
-                                    </view>
-                                </view>
-                                <view class="detail editable" style="position: relative">
-                                    <view style="flex-shrink: 0"><text>鍒嗘瀽鏂规硶锛�</text></view>
-                                    <picker :range="arrayAnalysisMethod" range-key="name"
-                                        @change="HAnalysisMethodChange(checkItem.num, $event)">
-                                        <input disabled :value="getAnalysisMethodDisplay(checkItem.HAnalysisMethod)"
-                                            placeholder="璇烽�夋嫨" />
-                                        <view class="picker-overlay"></view>
-                                    </picker>
-                                </view>
-                                <view class="detail editable">
-                                    <view style="flex-shrink: 0"><text>閲嶇偣妫�鏌ワ細</text></view>
-                                    <view>
-                                        <switch type="checkbox" style="transform: scale(0.7)"
-                                            :checked="checkItem.HKeyInspect"
-                                            @change="HKeyInspectChange(checkItem, $event)" />
-                                    </view>
-                                </view>
-                                <view class="detail" v-if="checkItem.HQCStd">
-                                    <text>妫�楠屾爣鍑嗭細</text>{{ checkItem.HQCStd }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HUnit">
-                                    <text>鍗曚綅锛�</text>{{ checkItem.HUnit }}
-                                </view>
-                                <!-- 鍙湁瀹氶噺鍒嗘瀽鎵嶅惎鐢ㄦ楠屽�� -->
-                                <view class="detail editable" v-show="checkItem.HAnalysisMethod == 2">
-                                    <text>妫�楠屽�硷細</text>
-                                    <input type="text" class="editable-input" @blur="calcHResult(checkItem)"
-                                        v-model="checkItem.HInspectValQ" />
-                                </view>
+				</view>
+				<!-- 鍏朵粬淇℃伅 -->
+				<view class="bill-main-content" v-if="mainTabSelected == 2">
+					<view class="form-item">
+						<view class="left">婧愬崟绫诲瀷</view>
+						<view class="right" style="position: relative" :class="!hasSourceBill?'':'disabled'">
+							<picker mode="selector" :range="HSourceBillTypeNameList" :disabled="hasSourceBill"
+								@change="HSourceBillTypeNameChange">
+								<input type="text" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" v-model="HSourceBillType" disabled />
+								<view class="picker-overlay"></view>
+							</picker>
+						</view>
+					</view>
+					<view class="form-item" v-if="false">
+						<view class="left">鐢熶骇鐝</view>
+						<view class="right">
+							<uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
+								v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">寮傚父涓存椂澶勭悊鏂规</view>
+						<view class="right">
+							<input type="text" v-model="hform.HErrTreatment" value="" />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">浠诲姟鍗曟暟閲�</view>
+						<view class="right">
+							<input type="number" v-model="hform.HICMOQty" />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">娴佽浆鍗℃暟閲�</view>
+						<view class="right">
+							<input type="number" v-model="hform.HProcExchQty" />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">鎵瑰彿</view>
+						<view class="right">
+							<input type="text" value="" />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">澶囨敞</view>
+						<view class="right">
+							<input type="text" v-model="hform.HRemark" value="" />
+						</view>
+					</view>
+				</view>
+				<!-- 鍒跺崟淇℃伅 -->
+				<view class="bill-main-content" v-if="mainTabSelected == 3">
+					<view class="form-item">
+						<view class="left">鍒跺崟浜�</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HMaker" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">鍒跺崟鏃ユ湡</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HMakeDate" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">瀹℃牳浜�</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HChecker" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">瀹℃牳鏃ユ湡</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HCheckDate" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">鍏抽棴浜�</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HCloseMan" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">鍏抽棴鏃ユ湡</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HCloseDate" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">淇敼浜�</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HUpDater" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">淇敼鏃ユ湡</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HUpDateDate" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">浣滃簾浜�</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HDeleteMan" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">浣滃簾鏃ユ湡</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HDeleteDate" disabled />
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 瀛愯〃鍖哄煙 -->
+		<view class="bill-sub-area">
+			<!-- 瀛愯〃椤电 -->
+			<view class="bill-sub-tabs">
+				<view v-for="subTab in subTabs" :key="subTab.id" :class="subTab.id == subTabSelected ? 'selected' : ''"
+					@tap="subTabSelected = subTab.id">{{ subTab.name }}</view>
+			</view>
+			<!-- 瀛愯〃鍐呭 -->
+			<view class="bill-main-contents">
+				<!-- 妫�楠岄」鐩� 鍛堢幇 -->
+				<view v-if="subTabSelected == 1">
+					<!-- 闇�閫氳繃鏄惧紡璋冪敤蹇界暐$event鍙傛暟 -->
+					<view class="buttons" @tap="addCheckItem()">
+						<uni-icons type="plus" style="margin-right: 10rpx" size="22"></uni-icons>鏂板
+					</view>
+					<view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
+					<view class="list" v-else>
+						<uni-card v-for="checkItem in checkItems" :key="checkItem.num">
+							<view class="card-detail">
+								<view class="detail"> <text>搴忓彿锛�</text>{{ checkItem.num }} </view>
+								<view class="detail editable">
+									<view style="flex-shrink: 0"><text>妫�楠岄」鐩細</text></view>
+									<input type="text" :value="checkItem.HQCCheckItemName" disabled="" />
+									<view class="icon-wrapper"><uni-icons type="search" size="16"
+											@click="showSelectorModule(checkItem, 2)"></uni-icons></view>
+								</view>
+								<view class="detail editable">
+									<view style="flex-shrink: 0"><text>妫�楠屼华鍣細</text></view>
+									<input type="text" :value="checkItem.HInspectInstruMentName" disabled="" />
+									<view class="icon-wrapper"><uni-icons type="search" size="16"
+											@click="showSelectorModule(checkItem, 3)"></uni-icons></view>
+								</view>
+								<view class="detail editable">
+									<view><text>缁撹锛�</text></view>
+									<view style="width: 4em">
+										{{ checkItem.HResult == 1 ? "鍚堟牸" : "涓嶅悎鏍�" }}
+									</view>
+									<view>
+										<switch style="width: 2em; transform: scale(0.7)"
+											:checked="checkItem.HResult == 1"
+											@change="HResultChange(checkItem.num, $event)" />
+									</view>
+								</view>
+								<view class="detail editable" style="position: relative">
+									<view style="flex-shrink: 0"><text>鍒嗘瀽鏂规硶锛�</text></view>
+									<picker :range="arrayAnalysisMethod" range-key="name"
+										@change="HAnalysisMethodChange(checkItem.num, $event)">
+										<input disabled :value="getAnalysisMethodDisplay(checkItem.HAnalysisMethod)"
+											placeholder="璇烽�夋嫨" />
+										<view class="picker-overlay"></view>
+									</picker>
+								</view>
+								<view class="detail editable">
+									<view style="flex-shrink: 0"><text>閲嶇偣妫�鏌ワ細</text></view>
+									<view>
+										<switch type="checkbox" style="transform: scale(0.7)"
+											:checked="checkItem.HKeyInspect"
+											@change="HKeyInspectChange(checkItem, $event)" />
+									</view>
+								</view>
+								<view class="detail" v-if="checkItem.HQCStd">
+									<text>妫�楠屾爣鍑嗭細</text>{{ checkItem.HQCStd }}
+								</view>
+								<view class="detail" v-if="checkItem.HUnit">
+									<text>鍗曚綅锛�</text>{{ checkItem.HUnit }}
+								</view>
+								<!-- 鍙湁瀹氶噺鍒嗘瀽鎵嶅惎鐢ㄦ楠屽�� -->
+								<view class="detail editable" v-show="checkItem.HAnalysisMethod == 2">
+									<text>妫�楠屽�硷細</text>
+									<input type="text" class="editable-input" @blur="calcHResult(checkItem)"
+										v-model="checkItem.HInspectValQ" />
+								</view>
 
-                                <view class="detail" v-if="checkItem.HQCNote">
-                                    <text>妫�楠岃褰曪細</text>{{ checkItem.HQCNote }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HTargetVal">
-                                    <text>鐩爣鍊硷細</text>{{ checkItem.HTargetVal }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HUpLimit">
-                                    <text>涓婇檺鍊硷細</text>{{ checkItem.HUpLimit }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HDownLimit">
-                                    <text>涓嬮檺鍊硷細</text>{{ checkItem.HDownLimit }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HMax">
-                                    <text>鏈�澶у�硷細</text>{{ checkItem.HMax }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HMin">
-                                    <text>鏈�灏忓�硷細</text>{{ checkItem.HMin }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HAvg">
-                                    <text>骞冲潎鍊硷細</text>{{ checkItem.HAvg }}
-                                </view>
-                            </view>
-                            <view style="height: 20rpx"></view>
-                            <view class="more">
-                                <view class="part" style="color: #da0000" @tap.stop="removeCheckItem(checkItem)">
-                                    <uni-icons type="trash" style="color: #da0000; margin-right: 10rpx"
-                                        size="18"></uni-icons>鍒犻櫎
-                                </view>
-                            </view>
-                        </uni-card>
-                    </view>
-                </view>
+								<view class="detail" v-if="checkItem.HQCNote">
+									<text>妫�楠岃褰曪細</text>{{ checkItem.HQCNote }}
+								</view>
+								<view class="detail" v-if="checkItem.HTargetVal">
+									<text>鐩爣鍊硷細</text>{{ checkItem.HTargetVal }}
+								</view>
+								<view class="detail" v-if="checkItem.HUpLimit">
+									<text>涓婇檺鍊硷細</text>{{ checkItem.HUpLimit }}
+								</view>
+								<view class="detail" v-if="checkItem.HDownLimit">
+									<text>涓嬮檺鍊硷細</text>{{ checkItem.HDownLimit }}
+								</view>
+								<view class="detail" v-if="checkItem.HMax">
+									<text>鏈�澶у�硷細</text>{{ checkItem.HMax }}
+								</view>
+								<view class="detail" v-if="checkItem.HMin">
+									<text>鏈�灏忓�硷細</text>{{ checkItem.HMin }}
+								</view>
+								<view class="detail" v-if="checkItem.HAvg">
+									<text>骞冲潎鍊硷細</text>{{ checkItem.HAvg }}
+								</view>
+							</view>
+							<view style="height: 20rpx"></view>
+							<view class="more">
+								<view class="part" style="color: #da0000" @tap.stop="removeCheckItem(checkItem)">
+									<uni-icons type="trash" style="color: #da0000; margin-right: 10rpx"
+										size="18"></uni-icons>鍒犻櫎
+								</view>
+							</view>
+						</uni-card>
+					</view>
+				</view>
 
-                <view v-if="subTabSelected == 2">
-                    <view class="buttons" @tap="addBadReason()">
-                        <uni-icons type="plus" style="margin-right: 10rpx" size="22"></uni-icons>鏂板
-                    </view>
-                    <view class="over" v-if="badReasons.length  == 0">鏆傛棤鏁版嵁</view>
-                    <view class="list" v-else>
-                        <uni-card v-for="(br, index) in badReasons" :key="index">
-                            <view class="card-detail">
-                                <view class="detail editable"> <text>搴忓彿锛�</text>{{ index+1 }} </view>
-                                <view class="detail editable">
-                                    <view style="flex-shrink: 0"><text>涓嶈壇鍘熷洜浠ｇ爜锛�</text></view>
-                                    <view style="flex: 1;"><text>{{ br.HBadReasonNumber }} </text></view>
-                                </view>
-                                <view class="detail editable">
-                                    <view style="flex-shrink: 0"><text>涓嶈壇鍘熷洜锛�</text></view>
-                                    <view style="flex: 1;"><text>{{ br.HBadReasonName }} </text></view>
-                                    <view class="icon-wrapper"><uni-icons type="search" size="16"
-                                            @click="showSelectorModule_BadReason(index, 9)"></uni-icons>
-                                    </view>
-                                </view>
-                                <view class="detail editable">
-                                    <view style="flex-shrink: 0"><text>鏁伴噺锛�</text></view>
-                                    <view class="editable-input">
-                                        <input type="number" v-model="br.HQty" />
-                                    </view>
-                                </view>
-                                <view class="detail editable">
-                                    <view style="flex-shrink: 0"><text>妫�楠屽憳锛�</text></view>
-                                    <text>{{ br.HCheckMan }} </text>
-                                </view>
-                                <view class="detail editable">
-                                    <view style="flex-shrink: 0"><text>鐢熶骇鐝粍锛�</text></view>
-                                    <text>{{ br.HGroupName }} </text>
-                                </view>
-                                <view class="detail editable">
-                                    <view style="flex-shrink: 0"><text>鐢熶骇璧勬簮锛�</text></view>
-                                    <text>{{ br.HSourceName }} </text>
-                                </view>
+				<view v-if="subTabSelected == 2">
+					<view class="buttons" @tap="addBadReason()">
+						<uni-icons type="plus" style="margin-right: 10rpx" size="22"></uni-icons>鏂板
+					</view>
+					<view class="over" v-if="badReasons.length  == 0">鏆傛棤鏁版嵁</view>
+					<view class="list" v-else>
+						<uni-card v-for="(br, index) in badReasons" :key="index">
+							<view class="card-detail">
+								<view class="detail editable"> <text>搴忓彿锛�</text>{{ index+1 }} </view>
+								<view class="detail editable">
+									<view style="flex-shrink: 0"><text>涓嶈壇鍘熷洜浠ｇ爜锛�</text></view>
+									<view style="flex: 1;"><text>{{ br.HBadReasonNumber }} </text></view>
+								</view>
+								<view class="detail editable">
+									<view style="flex-shrink: 0"><text>涓嶈壇鍘熷洜锛�</text></view>
+									<view style="flex: 1;"><text>{{ br.HBadReasonName }} </text></view>
+									<view class="icon-wrapper"><uni-icons type="search" size="16"
+											@click="showSelectorModule_BadReason(index, 9)"></uni-icons>
+									</view>
+								</view>
+								<view class="detail editable">
+									<view style="flex-shrink: 0"><text>鏁伴噺锛�</text></view>
+									<view class="editable-input">
+										<input type="number" v-model="br.HQty" />
+									</view>
+								</view>
+								<view class="detail editable">
+									<view style="flex-shrink: 0"><text>妫�楠屽憳锛�</text></view>
+									<text>{{ br.HCheckMan }} </text>
+								</view>
+								<view class="detail editable">
+									<view style="flex-shrink: 0"><text>鐢熶骇鐝粍锛�</text></view>
+									<text>{{ br.HGroupName }} </text>
+								</view>
+								<view class="detail editable">
+									<view style="flex-shrink: 0"><text>鐢熶骇璧勬簮锛�</text></view>
+									<text>{{ br.HSourceName }} </text>
+								</view>
 
-                            </view>
-                            <view class="more">
-                                <view class="part" style="color: #da0000" @tap.stop="delBadReason(br, index)">
-                                    <uni-icons type="trash" style="color: #da0000; margin-right: 10rpx"
-                                        size="18"></uni-icons>鍒犻櫎
-                                </view>
-                            </view>
-                        </uni-card>
-                    </view>
-                </view>
+							</view>
+							<view class="more">
+								<view class="part" style="color: #da0000" @tap.stop="delBadReason(br, index)">
+									<uni-icons type="trash" style="color: #da0000; margin-right: 10rpx"
+										size="18"></uni-icons>鍒犻櫎
+								</view>
+							</view>
+						</uni-card>
+					</view>
+				</view>
 
-                <!-- 鎶芥牱妫�楠� 鍛堢幇 -->
-                <view v-if="subTabSelected == 3">
-                    <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
-                    <view class="list" v-else>
-                        <uni-card v-for="SamplingItem in checkItems" :key="SamplingItem.num">
-                            <view class="card-detail">
-                                <view class="detail"> <text>搴忓彿锛�</text>{{ SamplingItem.num }} </view>
-                                <view class="detail editable">
-                                    <text>妫�楠岄」鐩細</text>{{ SamplingItem.HQCCheckItemName }}
-                                </view>
-                                <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
-                                <view class="detail editable" style="width: 100%">
-                                    <view style="flex-shrink: 0"><text>鎶芥牱鏂规锛�</text></view>
-                                    <input type="text" :value="SamplingItem.HSampleSchemeName" disabled />
-                                    <view class="icon-wrapper"><uni-icons type="search" size="16"
-                                            @click="showSelectorModule(SamplingItem, 1)"></uni-icons></view>
-                                </view>
-                                <view class="detail editable">
-                                    <text>鎶芥牱绫诲瀷锛�</text>{{ SamplingItem.HSamplingType }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>妫�楠屾按骞筹細</text>{{ SamplingItem.HInspectionLevel }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>涓ユ牸搴︼細</text>{{ SamplingItem.HStrictness }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>AQL锛�</text>{{ SamplingItem.HAQL }}
-                                </view>
-                                <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
-                                <view class="detail editable">
-                                    <text>鏍锋湰閲忥細</text>{{ SamplingItem.HSampleQty }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>鍏佽鏁帮細</text>{{ SamplingItem.HAcceptQty }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>鎷掔粷鏁帮細</text>{{ SamplingItem.HRejectQty }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>鏍锋湰涓嶅悎鏍兼暟锛�</text>{{ SamplingItem.HSampleUnRightQty }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>鏍锋湰鐮村潖鏁帮細</text>
-                                    <view class="editable-input">
-                                        <input type="number" v-model="SamplingItem.HSampleDamageQty" />
-                                    </view>
-                                </view>
-                                <view class="detail editable">
-                                    <text>妫�楠岀粨鏋滐細</text>
-                                    <view style="border-radius: 15%; padding: 0 10rpx" :class="
+				<!-- 鎶芥牱妫�楠� 鍛堢幇 -->
+				<view v-if="subTabSelected == 3">
+					<view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
+					<view class="list" v-else>
+						<uni-card v-for="SamplingItem in checkItems" :key="SamplingItem.num">
+							<view class="card-detail">
+								<view class="detail"> <text>搴忓彿锛�</text>{{ SamplingItem.num }} </view>
+								<view class="detail editable">
+									<text>妫�楠岄」鐩細</text>{{ SamplingItem.HQCCheckItemName }}
+								</view>
+								<view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
+								<view class="detail editable" style="width: 100%">
+									<view style="flex-shrink: 0"><text>鎶芥牱鏂规锛�</text></view>
+									<input type="text" :value="SamplingItem.HSampleSchemeName" disabled />
+									<view class="icon-wrapper"><uni-icons type="search" size="16"
+											@click="showSelectorModule(SamplingItem, 1)"></uni-icons></view>
+								</view>
+								<view class="detail editable">
+									<text>鎶芥牱绫诲瀷锛�</text>{{ SamplingItem.HSamplingType }}
+								</view>
+								<view class="detail editable">
+									<text>妫�楠屾按骞筹細</text>{{ SamplingItem.HInspectionLevel }}
+								</view>
+								<view class="detail editable">
+									<text>涓ユ牸搴︼細</text>{{ SamplingItem.HStrictness }}
+								</view>
+								<view class="detail editable">
+									<text>AQL锛�</text>{{ SamplingItem.HAQL }}
+								</view>
+								<view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
+								<view class="detail editable">
+									<text>鏍锋湰閲忥細</text>{{ SamplingItem.HSampleQty }}
+								</view>
+								<view class="detail editable">
+									<text>鍏佽鏁帮細</text>{{ SamplingItem.HAcceptQty }}
+								</view>
+								<view class="detail editable">
+									<text>鎷掔粷鏁帮細</text>{{ SamplingItem.HRejectQty }}
+								</view>
+								<view class="detail editable">
+									<text>鏍锋湰涓嶅悎鏍兼暟锛�</text>{{ SamplingItem.HSampleUnRightQty }}
+								</view>
+								<view class="detail editable">
+									<text>鏍锋湰鐮村潖鏁帮細</text>
+									<view class="editable-input">
+										<input type="number" v-model="SamplingItem.HSampleDamageQty" />
+									</view>
+								</view>
+								<view class="detail editable">
+									<text>妫�楠岀粨鏋滐細</text>
+									<view style="border-radius: 15%; padding: 0 10rpx" :class="
                                         SamplingItem.HInspectResultToSee == '鍚堟牸'
                                         ? 'pass-background'
                                         : SamplingItem.HInspectResultToSee == '涓嶅悎鏍�'
                                         ? 'unpass-background'
                                         : ''
                                     ">
-                                        {{ SamplingItem.HInspectResultToSee }}
-                                    </view>
-                                </view>
-                            </view>
-                        </uni-card>
-                    </view>
-                </view>
-                <!-- 妫�娴嬪�� 鍛堢幇 -->
-                <view v-else v-for="item in InspectModules" :key="item.id">
-                    <view v-if="subTabSelected == item.id">
-                        <InspectValueTemplateVue ref="InspectValueModules" :bind-key="item.id"
-                            @syncCheckData="InspectValueComplete" @syncInspectResult="syncInspectResult" :bind-data="{
+										{{ SamplingItem.HInspectResultToSee }}
+									</view>
+								</view>
+							</view>
+						</uni-card>
+					</view>
+				</view>
+				<!-- 妫�娴嬪�� 鍛堢幇 -->
+				<view v-else v-for="item in InspectModules" :key="item.id">
+					<view v-if="subTabSelected == item.id">
+						<InspectValueTemplateVue ref="InspectValueModules" :bind-key="item.id"
+							@syncCheckData="InspectValueComplete" @syncInspectResult="syncInspectResult" :bind-data="{
                 data: checkItems[item.checkItemId],
                 list: InspectValues[item.checkItemId],
                 mode: 3 // 鍏ュ簱妫�妫�娴嬪�兼ā鍧�
               }">
-                        </InspectValueTemplateVue>
-                    </view>
-                </view>
-            </view>
-        </view>
-        <view style="height: 120rpx"></view>
-        <view class="bottom-btn">
-            <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-            <view style="flex: 1"></view>
-            <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
-            <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
-        </view>
-        <SampleSchemePopupVue v-if="enablePopupModule == PopupModuleNameList[1]" ref="listPopup"
-            @update="SampleSchemeComplete" :bindKey="currentChechItemIDCache">
-        </SampleSchemePopupVue>
-        <CheckItemPopupVue v-if="enablePopupModule == PopupModuleNameList[2]" ref="listPopup"
-            @update="CheckItemComplete" :bindKey="currentChechItemIDCache">
-        </CheckItemPopupVue>
-        <InspectMentPopupVue v-if="enablePopupModule == PopupModuleNameList[3]" ref="listPopup"
-            @update="InspectMentComplete" :bindKey="currentChechItemIDCache">
-        </InspectMentPopupVue>
-        <MaterialPopupVue v-if="enablePopupModule == PopupModuleNameList[4]" ref="listPopup" @update="MaterComplete"
-            :bindKey="0">
-        </MaterialPopupVue>
-        <ICMOBillPopupVue v-if="enablePopupModule == PopupModuleNameList[5]" ref="listPopup" @update="ICMOBillComplete"
-            :bindKey="0"></ICMOBillPopupVue>
-        <ProcExchBillPopupVue v-if="enablePopupModule == PopupModuleNameList[6]" ref="listPopup"
-            @update="ProcExchBillComplete" :bindKey="0"></ProcExchBillPopupVue>
-        <ProcessPopupVue v-if="enablePopupModule == PopupModuleNameList[8]" ref="listPopup" @update="HProcComplete"
-            :bindKey="0"></ProcessPopupVue>
-        <CheckProjectPopupVue v-if="enablePopupModule == PopupModuleNameList[7]" ref="listPopup"
-            @update="HQCSchemeComplete" :bindKey="0"></CheckProjectPopupVue>
-        <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HSourceBillType"
-            :HStockOrgID="hform.HStockOrgID" @BillSelectComplete="HandleBillSelectComplete"></BillListPopupVue>
-        <BadReasonPopupVue v-if="enablePopupModule == PopupModuleNameList[9]" ref="listPopup"
-            @update="HBadReasonComplete"></BadReasonPopupVue>
-    </view>
+						</InspectValueTemplateVue>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view style="height: 120rpx"></view>
+		<view class="bottom-btn">
+			<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			<view style="flex: 1"></view>
+			<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+			<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+		</view>
+		<SampleSchemePopupVue v-if="enablePopupModule == PopupModuleNameList[1]" ref="listPopup"
+			@update="SampleSchemeComplete" :bindKey="currentChechItemIDCache">
+		</SampleSchemePopupVue>
+		<CheckItemPopupVue v-if="enablePopupModule == PopupModuleNameList[2]" ref="listPopup"
+			@update="CheckItemComplete" :bindKey="currentChechItemIDCache">
+		</CheckItemPopupVue>
+		<InspectMentPopupVue v-if="enablePopupModule == PopupModuleNameList[3]" ref="listPopup"
+			@update="InspectMentComplete" :bindKey="currentChechItemIDCache">
+		</InspectMentPopupVue>
+		<MaterialPopupVue v-if="enablePopupModule == PopupModuleNameList[4]" ref="listPopup" @update="MaterComplete"
+			:bindKey="0">
+		</MaterialPopupVue>
+		<ICMOBillPopupVue v-if="enablePopupModule == PopupModuleNameList[5]" ref="listPopup" @update="ICMOBillComplete"
+			:bindKey="0"></ICMOBillPopupVue>
+		<ProcExchBillPopupVue v-if="enablePopupModule == PopupModuleNameList[6]" ref="listPopup"
+			@update="ProcExchBillComplete" :bindKey="0"></ProcExchBillPopupVue>
+		<ProcessPopupVue v-if="enablePopupModule == PopupModuleNameList[8]" ref="listPopup" @update="HProcComplete"
+			:bindKey="0"></ProcessPopupVue>
+		<CheckProjectPopupVue v-if="enablePopupModule == PopupModuleNameList[7]" ref="listPopup"
+			@update="HQCSchemeComplete" :bindKey="0"></CheckProjectPopupVue>
+		<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HSourceBillType"
+			:HStockOrgID="hform.HStockOrgID" @BillSelectComplete="HandleBillSelectComplete"></BillListPopupVue>
+		<BadReasonPopupVue v-if="enablePopupModule == PopupModuleNameList[9]" ref="listPopup"
+			@update="HBadReasonComplete"></BadReasonPopupVue>
+	</view>
 </template>
 
 <script>
-    import dayjs from "dayjs";
-    import {
-        CommonUtils
-    } from "../../../utils/common";
-    import InspectValueTemplateVue from "@/components/ZLGL/InspectValueTemplate.vue";
-    import SampleSchemePopupVue from "@/components/ZLGL/SampleSchemePopup.vue";
-    import CheckItemPopupVue from "@/components/ZLGL/CheckItemPopup.vue";
-    import InspectMentPopupVue from "../../../components/ZLGL/InspectMentPopup.vue";
-    import MaterialPopupVue from "../../../components/ZLGL/MaterialPopup.vue";
-    import ICMOBillPopupVue from "../../../components/ZLGL/ICMOBillPopup.vue";
-    import ProcExchBillPopupVue from "../../../components/ZLGL/ProcExchBillPopup.vue";
-    import ProcessPopupVue from "../../../components/ZLGL/ProcessPopup.vue";
-    import CheckProjectPopupVue from "../../../components/ZLGL/CheckProjectPopup.vue";
-    import {
-        getUserInfo
-    } from "../../../utils/auth";
-    import {
-        MpaasScan
-    } from "../../../utils/mpaasScan";
-    import BillListPopupVue from "../../../components/BillListPopup/BillListPopup.vue";
-    import BadReasonPopupVue from "../../../components/ZLGL/BadReasonPopup.vue";
-    export default {
-        components: {
-            InspectValueTemplateVue,
-            SampleSchemePopupVue,
-            CheckItemPopupVue,
-            InspectMentPopupVue,
-            MaterialPopupVue,
-            ICMOBillPopupVue,
-            ProcExchBillPopupVue,
-            ProcessPopupVue,
-            CheckProjectPopupVue,
-            BillListPopupVue,
-            BadReasonPopupVue
-        },
-        computed: {
-            judgeConclusion: {
-                get() {
-                    return true;
-                },
-            },
-        },
-        data() {
-            return {
-                operationType: 1,
+	import dayjs from "dayjs";
+	import {
+		CommonUtils
+	} from "../../../utils/common";
+	import InspectValueTemplateVue from "@/components/ZLGL/InspectValueTemplate.vue";
+	import SampleSchemePopupVue from "@/components/ZLGL/SampleSchemePopup.vue";
+	import CheckItemPopupVue from "@/components/ZLGL/CheckItemPopup.vue";
+	import InspectMentPopupVue from "../../../components/ZLGL/InspectMentPopup.vue";
+	import MaterialPopupVue from "../../../components/ZLGL/MaterialPopup.vue";
+	import ICMOBillPopupVue from "../../../components/ZLGL/ICMOBillPopup.vue";
+	import ProcExchBillPopupVue from "../../../components/ZLGL/ProcExchBillPopup.vue";
+	import ProcessPopupVue from "../../../components/ZLGL/ProcessPopup.vue";
+	import CheckProjectPopupVue from "../../../components/ZLGL/CheckProjectPopup.vue";
+	import {
+		getUserInfo
+	} from "../../../utils/auth";
+	import {
+		MpaasScan
+	} from "../../../utils/mpaasScan";
+	import BillListPopupVue from "../../../components/BillListPopup/BillListPopup.vue";
+	import BadReasonPopupVue from "../../../components/ZLGL/BadReasonPopup.vue";
+	export default {
+		components: {
+			InspectValueTemplateVue,
+			SampleSchemePopupVue,
+			CheckItemPopupVue,
+			InspectMentPopupVue,
+			MaterialPopupVue,
+			ICMOBillPopupVue,
+			ProcExchBillPopupVue,
+			ProcessPopupVue,
+			CheckProjectPopupVue,
+			BillListPopupVue,
+			BadReasonPopupVue
+		},
+		computed: {
+			judgeConclusion: {
+				get() {
+					return true;
+				},
+			},
+		},
+		data() {
+			return {
+				operationType: 1,
 
-                mainTabSelected: 1,
-                subTabSelected: 1,
+				mainTabSelected: 1,
+				subTabSelected: 1,
 
-                // 婧愬崟鐘舵�佹帶鍒�
-                hasSourceBill: false,
+				// 婧愬崟鐘舵�佹帶鍒�
+				hasSourceBill: false,
 
-                // 鎺у埗褰撳墠鏄剧ず鐨勫脊绐楁ā鍧�
-                enablePopupModule: "",
-                PopupModuleNameList: [
-                    "",
-                    "SampleScheme",
-                    "CheckItem",
-                    "InspectMent",
-                    "Material",
-                    "ICMOBill",
-                    "ProcExchBill",
-                    "QCScheme",
-                    "Process",
-                    "BadReason"
-                ],
-                // 褰撳墠鎿嶄綔鐨勬楠屽崟ID缂撳瓨
-                currentChechItemIDCache: -1,
+				// 鎺у埗褰撳墠鏄剧ず鐨勫脊绐楁ā鍧�
+				enablePopupModule: "",
+				PopupModuleNameList: [
+					"",
+					"SampleScheme",
+					"CheckItem",
+					"InspectMent",
+					"Material",
+					"ICMOBill",
+					"ProcExchBill",
+					"QCScheme",
+					"Process",
+					"BadReason"
+				],
+				// 褰撳墠鎿嶄綔鐨勬楠屽崟ID缂撳瓨
+				currentChechItemIDCache: -1,
 
-                // uni-combox 閫夋嫨鍣ㄤ娇鐢�
-                // 鐢熶骇璧勬簮
-                GySourceList: [],
-                GySourceNameList: [],
-                // 鐝
-                GyWorkShiftList: [],
-                GyWorkShiftNameList: [],
-                // 妫�楠屽憳
-                GyFirstCheckEmpList: [],
-                GyFirstCheckEmpNameList: [],
+				// uni-combox 閫夋嫨鍣ㄤ娇鐢�
+				// 鐢熶骇璧勬簮
+				GySourceList: [],
+				GySourceNameList: [],
+				// 鐝
+				GyWorkShiftList: [],
+				GyWorkShiftNameList: [],
+				// 妫�楠屽憳
+				GyFirstCheckEmpList: [],
+				GyFirstCheckEmpNameList: [],
 
-                // 妫�楠屾柟妗�
-                arrayAnalysisMethod: [{
-                        value: 1,
-                        name: "瀹氭�у垎鏋�",
-                    },
-                    {
-                        value: 2,
-                        name: "瀹氶噺鍒嗘瀽",
-                    },
-                    {
-                        value: 3,
-                        name: "鍏朵粬鍒嗘瀽",
-                    },
-                ],
-                ArrayAnalysisMethodValue: [1, 2, 3],
-                // 瀛愯〃 椤电淇℃伅
-                subTabs: {
-                    1: {
-                        id: "1",
-                        name: "妫�楠岄」鐩�",
-                    },
-                    2: {
-                        id: "2",
-                        name: "涓嶈壇鍘熷洜",
-                    },
-                    3: {
-                        id: "3",
-                        name: "鎶芥牱妫�楠�",
-                    },
-                },
+				// 妫�楠屾柟妗�
+				arrayAnalysisMethod: [{
+						value: 1,
+						name: "瀹氭�у垎鏋�",
+					},
+					{
+						value: 2,
+						name: "瀹氶噺鍒嗘瀽",
+					},
+					{
+						value: 3,
+						name: "鍏朵粬鍒嗘瀽",
+					},
+				],
+				ArrayAnalysisMethodValue: [1, 2, 3],
+				// 瀛愯〃 椤电淇℃伅
+				subTabs: {
+					1: {
+						id: "1",
+						name: "妫�楠岄」鐩�",
+					},
+					2: {
+						id: "2",
+						name: "涓嶈壇鍘熷洜",
+					},
+					3: {
+						id: "3",
+						name: "鎶芥牱妫�楠�",
+					},
+				},
 
-                // 婧愬崟绫诲瀷
-                HSourceBillType: "鐢熶骇姹囨姤鍗�",
-                HSourceBillTypeValueList: ["3711", "3772"],
-                HSourceBillTypeNameList: [
-                    "鐢熶骇姹囨姤鍗�", '宸ュ簭娴佽浆鍗�'
-                ],
-                // 涓昏〃灞炴��
-                hform: {
-                    HBillType: "7501",
-                    HSourceBillType: "3711",
-                    HSourceBillNo: "",
-                    HSourceBillQty: 0,
-                    HBillNo: "",
-                    HInterID: "0",
-                    HDate: dayjs(new Date()).format("YYYY-MM-DD"),
-                    HSourceName: "",
-                    HSourceID: "0",
-                    HShiftsName: "",
-                    HShiftsID: "0",
-                    HICMOBillNo: "",
-                    HICMOInterID: "0",
-                    HICMOEntryID: "1",
-                    HICMOQty: "0",
-                    HProcExchBillNo: "",
-                    HProcExchInterID: "0",
-                    HProcExchEntryID: "0",
-                    HProcExchQty: "0",
-                    HMaterNumber: "",
-                    HMaterID: "0",
-                    HMaterName: "",
-                    HFirstCheckEmpName: getUserInfo().HEmpName,
-                    HFirstCheckEmp: getUserInfo().HEmpID,
-                    HQCSchemeName: "",
-                    HQCSchemeID: "0",
-                    HBatchNo: "",
-                    HLastResult: true, // 榛樿鍚堟牸
-                    HProcName: "",
-                    HProcID: "0",
-                    HTakeSampleCheckBillNo: "", // 鍙栨牱鍗�
-                    HTakeSampleCheckBillID: "0",
-                    HRemark: "",
-                    HErrTreatment: "", // 寮傚父涓存椂澶勭悊鏂规
-                    HMaker: getUserInfo()["Czymc"] || "",
-                    HChecker: "",
-                    HCloseMan: "",
-                    HMakeDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
-                    HCheckDate: "",
-                    HCloseDate: "",
-                    HUpDater: "",
-                    HDeleteMan: "",
-                    HUpDateDate: "",
-                    HDeleteDate: "",
-                    HResult: 1,
-                    HAnalysisMethod: "",
-                    HCheckQty: 0,
-                    HRemarkSN: "",
+				// 婧愬崟绫诲瀷
+				HSourceBillType: "鐢熶骇姹囨姤鍗�",
+				HSourceBillTypeValueList: ["3711", "3772", "3791"],
+				HSourceBillTypeNameList: [
+					"鐢熶骇姹囨姤鍗�", '宸ュ簭娴佽浆鍗�', '宸ュ簭鍑虹珯姹囨姤鍗�'
+				],
+				// 涓昏〃灞炴��
+				hform: {
+					HBillType: "7501",
+					HSourceBillType: "3711",
+					HSourceBillNo: "",
+					HSourceBillQty: 0,
+					HBillNo: "",
+					HInterID: "0",
+					HDate: dayjs(new Date()).format("YYYY-MM-DD"),
+					HSourceName: "",
+					HSourceID: "0",
+					HShiftsName: "",
+					HShiftsID: "0",
+					HICMOBillNo: "",
+					HICMOInterID: "0",
+					HICMOEntryID: "1",
+					HICMOQty: "0",
+					HProcExchBillNo: "",
+					HProcExchInterID: "0",
+					HProcExchEntryID: "0",
+					HProcExchQty: "0",
+					HMaterNumber: "",
+					HMaterID: "0",
+					HMaterName: "",
+					HFirstCheckEmpName: getUserInfo().HEmpName,
+					HFirstCheckEmp: getUserInfo().HEmpID,
+					HQCSchemeName: "",
+					HQCSchemeID: "0",
+					HBatchNo: "",
+					HLastResult: true, // 榛樿鍚堟牸
+					HProcName: "",
+					HProcID: "0",
+					HTakeSampleCheckBillNo: "", // 鍙栨牱鍗�
+					HTakeSampleCheckBillID: "0",
+					HRemark: "",
+					HErrTreatment: "", // 寮傚父涓存椂澶勭悊鏂规
+					HMaker: getUserInfo()["Czymc"] || "",
+					HChecker: "",
+					HCloseMan: "",
+					HMakeDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
+					HCheckDate: "",
+					HCloseDate: "",
+					HUpDater: "",
+					HDeleteMan: "",
+					HUpDateDate: "",
+					HDeleteDate: "",
+					HResult: 1,
+					HAnalysisMethod: "",
+					HCheckQty: 0,
+					HRemarkSN: "",
 
-                    HResDec: "",
-                    HStatus: 1,
+					HResDec: "",
+					HStatus: 1,
 
-                    HMainSourceBillType: "",
-                    HMainSourceInterID: "0",
-                    HMainSourceEntryID: "1",
-                    HMainSourceBillNo: "",
+					HMainSourceBillType: "",
+					HMainSourceInterID: "0",
+					HMainSourceEntryID: "1",
+					HMainSourceBillNo: "",
 
-                    HStockOrgID: uni.getStorageSync('OrganizationID')
-                },
-                // 妫�楠岄」鐩拰鎶芥牱妫�楠� 鍊�
-                checkItems: {},
-                // 妫�娴嬪�兼ā鍧�
-                InspectModules: {},
-                // 妫�娴嬪��
-                InspectValues: {},
-                // 涓嶈壇鍘熷洜
-                badReasons: [],
-            };
-        },
-        methods: {
-            // 鍚屾妫�楠屽�兼楠岀粨鏋�
-            syncInspectResult(item) {
-                console.log(item)
-                // 涓哄尯鍒� 鏅�氶〉绛惧拰鍔ㄦ�佺敓鎴愰〉绛撅紝鍔ㄦ�佺敓鎴愰〉绛剧殑鍓嶉潰鍔犱笂_浣滀负鍖哄垎 鍦ㄨ繘琛屽洖濉殑鏃跺�欙紝闇�瑕佸幓闄� 
-                this.HResultChange(item.bindKey.substring(1, item.bindKey.length), {
-                    detail: {
-                        value: item.HResult2 == "鍚堟牸"
-                    }
-                })
-            },
-            // 璇诲彇缂撳瓨
-            loadCache() {
-                const pages = getCurrentPages()
-                // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
-                const currentPage = pages[pages.length - 1]
-                let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
-                if (HBillTypeCache) {
-                    this.HSourceBillType = HBillTypeCache.HSourceBillTypeName
-                    this.hform.HSourceBillType = HBillTypeCache.HSourceBillType
-                    this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
-                }
-            },
-            // 鏂板涓嶈壇鍘熷洜
-            addBadReason() {
-                this.badReasons.push({
-                    'HBadReasonNumber': 0,
-                    'HBadReasonNumber': "",
-                    'HBadReasonName': "",
-                    'HCheckMan': this.hform.HFirstCheckEmpName,
-                    'HQty': 0,
-                    'HGroupName': this.hform.HGroupName || "",
-                    'HSourceName': this.hform.HSourceName
-                })
-            },
-            delBadReason(badReason, index) {
-                console.log('badReason: ', badReason);
-                this.badReasons.splice(index, 1)
-            },
-            // 鏍规嵁婧愬崟绫诲瀷閫夋嫨鍗曟嵁
-            toBillSelector() {
-                this.$refs['billList'].showPopup()
-            },
-            // 鏄剧ず涓嶈壇鍘熷洜寮圭獥 (璋冪敤鏂瑰紡鍜屽師鏈夊脊绐楄皟鐢ㄦ柟寮忎笉鍚�)
-            async showSelectorModule_BadReason(itemIndex, Moduleindex) {
-                this.enablePopupModule = this.PopupModuleNameList[Moduleindex];
-                console.log("this.$refs: ", this.$refs);
-                await this.$nextTick();
-                this.$refs.listPopup.showPopup(itemIndex);
-            },
-            async HandleBillSelectComplete(e) {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
-                        data: {
-                            HBillType: this.hform.HBillType,
-                            HSourceBillType: this.hform.HSourceBillType,
-                            HBarCode: "",
-                            HInterID: e?.HInterID,
-                            HEntryID: e?.HEntryID,
-                            Mode: 2 ,//閫夊崟妯″紡
-							user:getUserInfo()["Czymc"]
-                        }
-                    })
+					HStockOrgID: uni.getStorageSync('OrganizationID')
+				},
+				// 妫�楠岄」鐩拰鎶芥牱妫�楠� 鍊�
+				checkItems: {},
+				// 妫�娴嬪�兼ā鍧�
+				InspectModules: {},
+				// 妫�娴嬪��
+				InspectValues: {},
+				// 涓嶈壇鍘熷洜
+				badReasons: [],
+			};
+		},
+		methods: {
+			// 鍚屾妫�楠屽�兼楠岀粨鏋�
+			syncInspectResult(item) {
+				console.log(item)
+				// 涓哄尯鍒� 鏅�氶〉绛惧拰鍔ㄦ�佺敓鎴愰〉绛撅紝鍔ㄦ�佺敓鎴愰〉绛剧殑鍓嶉潰鍔犱笂_浣滀负鍖哄垎 鍦ㄨ繘琛屽洖濉殑鏃跺�欙紝闇�瑕佸幓闄� 
+				this.HResultChange(item.bindKey.substring(1, item.bindKey.length), {
+					detail: {
+						value: item.HResult2 == "鍚堟牸"
+					}
+				})
+			},
+			// 璇诲彇缂撳瓨
+			loadCache() {
+				const pages = getCurrentPages()
+				// 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+				const currentPage = pages[pages.length - 1]
+				let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
+				if (HBillTypeCache) {
+					this.HSourceBillType = HBillTypeCache.HSourceBillTypeName
+					this.hform.HSourceBillType = HBillTypeCache.HSourceBillType
+					this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
+				}
+			},
+			// 鏂板涓嶈壇鍘熷洜
+			addBadReason() {
+				this.badReasons.push({
+					'HBadReasonNumber': 0,
+					'HBadReasonNumber': "",
+					'HBadReasonName': "",
+					'HCheckMan': this.hform.HFirstCheckEmpName,
+					'HQty': 0,
+					'HGroupName': this.hform.HGroupName || "",
+					'HSourceName': this.hform.HSourceName
+				})
+			},
+			delBadReason(badReason, index) {
+				console.log('badReason: ', badReason);
+				this.badReasons.splice(index, 1)
+			},
+			// 鏍规嵁婧愬崟绫诲瀷閫夋嫨鍗曟嵁
+			toBillSelector() {
+				this.$refs['billList'].showPopup()
+			},
+			// 鏄剧ず涓嶈壇鍘熷洜寮圭獥 (璋冪敤鏂瑰紡鍜屽師鏈夊脊绐楄皟鐢ㄦ柟寮忎笉鍚�)
+			async showSelectorModule_BadReason(itemIndex, Moduleindex) {
+				this.enablePopupModule = this.PopupModuleNameList[Moduleindex];
+				console.log("this.$refs: ", this.$refs);
+				await this.$nextTick();
+				this.$refs.listPopup.showPopup(itemIndex);
+			},
+			async HandleBillSelectComplete(e) {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
+						data: {
+							HBillType: this.hform.HBillType,
+							HSourceBillType: this.hform.HSourceBillType,
+							HBarCode: "",
+							HInterID: e?.HInterID,
+							HEntryID: e?.HEntryID,
+							Mode: 2, //閫夊崟妯″紡
+							user: getUserInfo()["Czymc"]
+						}
+					})
 
-                    console.log(res)
-                    let {
-                        data,
-                        Message,
-                        count
-                    } = res.data
-                    if (count == 1) {
-						if(data[0]['HBack']==1){
+					console.log(res)
+					let {
+						data,
+						Message,
+						count
+					} = res.data
+					if (count == 1) {
+						if (data[0]['HBack'] == 1) {
 							CommonUtils.showTips({
 								title: '娓╅Θ鎻愮ず',
 								message: data[0]['HBackRemark']
 							})
 							return;
 						}
-                        this.hform.HMaterID = data[0]['HMaterID']
-                        this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
-                        this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
-                        this.hform.HMainSourceBillNo = data[0]['HBillNo']
-                        this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
-                        this.hform.HMainSourceInterID = data[0].HInterID
-                        this.hform.HMainSourceEntryID = data[0].HEntryID
-                        this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
-                        this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
-                        this.hform.HProcID = data[0]['HProcID']
-                        this.hform.HProcName = data[0]['褰撳墠宸ュ簭']
-                        this.hform.HSourceBillQty = data[0].HSourceBillQty
-                        this.hasSourceBill = true
-						this.hform.HProcExchQty = data[0]['娴佽浆鍗℃暟閲�']
-                        this.get_CheckItem();
-                        this.$refs['billList'].exit()
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: Message
-                        })
-                    }
+						if (this.hform.HSourceBillType == "3791") { //鍑虹珯鍗�
+							this.hform.HMaterID = data[0]['HMaterID']
+							this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+							this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+							this.hform.HMainSourceBillNo = data[0]['鍗曟嵁鍙�']
+							this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
+							this.hform.HMainSourceInterID = data[0].HInterID
+							this.hform.HMainSourceEntryID = data[0].HEntryID
+							this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+							this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+							this.hform.HSourceBillQty = data[0].HSourceBillQty
+							this.hasSourceBill = true
+							this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
+							this.hform.HICMOInterID = data[0].HICMOInterID
+							this.hform.HICMOEntryID = data[0].HICMOEntryID
+							this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
+							this.hform.HProcExchBillNo = data[0].HProcExchBillNo
+							this.hform.HProcExchInterID = data[0].HProcExchInterID
+							this.hform.HProcExchEntryID = data[0].HProcExchEntryID
+							this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
+							this.hform.HSourceName = data[0].鐢熶骇璧勬簮
+							this.hform.HSourceID = data[0].HSourceID
+							this.hform.HProcID = data[0].HProcID
+							this.hform.HProcName = data[0].宸ュ簭鍚嶇О
+							this.hform.HCheckQty = data[0].鍑虹珯鏁伴噺
+						} else {
+							this.hform.HMaterID = data[0]['HMaterID']
+							this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+							this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+							this.hform.HMainSourceBillNo = data[0]['HBillNo']
+							this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
+							this.hform.HMainSourceInterID = data[0].HInterID
+							this.hform.HMainSourceEntryID = data[0].HEntryID
+							this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+							this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+							this.hform.HProcID = data[0]['HProcID']
+							this.hform.HProcName = data[0]['褰撳墠宸ュ簭']
+							this.hform.HSourceBillQty = data[0].HSourceBillQty
+							this.hasSourceBill = true
+							this.hform.HProcExchQty = data[0]['娴佽浆鍗℃暟閲�']
+						}
+						this.get_CheckItem();
+						this.$refs['billList'].exit()
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
 
-                    
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: "婧愬崟涓嬫帹閿欒: " + err
-                    })
-                }
 
-            },
-            // 妫�楠屽�� 璁＄畻鏄惁鍚堟牸
-            calcHResult(item) {
-                // 闈炴娊妫�鏉′欢涓嬪垽鏂粨璁�
-                console.log('item: ', item);
-                if (!item.HSampleSchemeID) {
-                    return
-                }
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: "婧愬崟涓嬫帹閿欒: " + err
+					})
+				}
 
-                if (item.HInspectValQ >= item.HDownLimit && item.HInspectValQ <= item.HUpLimit) {
-                    this.checkItems[item.num].HResult = 1
-                    return
-                }
+			},
+			// 妫�楠屽�� 璁＄畻鏄惁鍚堟牸
+			calcHResult(item) {
+				// 闈炴娊妫�鏉′欢涓嬪垽鏂粨璁�
+				console.log('item: ', item);
+				if (!item.HSampleSchemeID) {
+					return
+				}
 
-                this.checkItems[item.num].HResult = 2
-            },
-            // 婧愬崟绫诲瀷閫夋嫨
-            HSourceBillTypeNameChange(e) {
-                this.HSourceBillType = this.HSourceBillTypeNameList[e.detail.value];
-                this.hform.HSourceBillType = this.HSourceBillTypeValueList[e.detail.value];
-                this.hform.HMainSourceBillType = this.HSourceBillTypeValueList[e.detail.value];
+				if (item.HInspectValQ >= item.HDownLimit && item.HInspectValQ <= item.HUpLimit) {
+					this.checkItems[item.num].HResult = 1
+					return
+				}
 
-                const pages = getCurrentPages()
-                // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
-                const currentPage = pages[pages.length - 1]
-                // 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
-                uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
-                    HSourceBillTypeName: this.HSourceBillType,
-                    HSourceBillType: this.hform.HSourceBillType
-                })
-            },
-            toScanCode() {
-                MpaasScan.scanCode((res) => {
-                    if (res) {
-                        this.getSourceBillInfo(res);
-                    }
-                });
-            },
-            async getSourceBillInfo(HBarCode) {
-                console.log('HBarCode: ', HBarCode);
+				this.checkItems[item.num].HResult = 2
+			},
+			// 婧愬崟绫诲瀷閫夋嫨
+			HSourceBillTypeNameChange(e) {
+				this.HSourceBillType = this.HSourceBillTypeNameList[e.detail.value];
+				this.hform.HSourceBillType = this.HSourceBillTypeValueList[e.detail.value];
+				this.hform.HMainSourceBillType = this.HSourceBillTypeValueList[e.detail.value];
 
-                // 璋冪敤閫氱敤 涓嬫帹鍑芥暟
-                let res = await CommonUtils.doRequest2Async({
-                    url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
-                    data: {
-                        HBillType: this.hform.HBillType,
-                        HSourceBillType: this.hform.HSourceBillType,
-                        HBarCode: HBarCode,
-                        HInterID: 0,
-                        HEntryID: 0,
-                        Mode: 1, //鎵爜妯″紡
-						user:getUserInfo()["Czymc"]
-                    }
-                })
+				const pages = getCurrentPages()
+				// 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+				const currentPage = pages[pages.length - 1]
+				// 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
+				uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
+					HSourceBillTypeName: this.HSourceBillType,
+					HSourceBillType: this.hform.HSourceBillType
+				})
+			},
+			toScanCode() {
+				MpaasScan.scanCode((res) => {
+					if (res) {
+						this.getSourceBillInfo(res);
+					}
+				});
+			},
+			async getSourceBillInfo(HBarCode) {
+				console.log('HBarCode: ', HBarCode);
 
-                console.log(res)
-                let {
-                    data,
-                    Message,
-                    count
-                } = res.data
-                if (count == 1) {
-                    console.log('data: ', data);
-					if(data[0]['HBack']==1){
+				// 璋冪敤閫氱敤 涓嬫帹鍑芥暟
+				let res = await CommonUtils.doRequest2Async({
+					url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
+					data: {
+						HBillType: this.hform.HBillType,
+						HSourceBillType: this.hform.HSourceBillType,
+						HBarCode: HBarCode,
+						HInterID: 0,
+						HEntryID: 0,
+						Mode: 1, //鎵爜妯″紡
+						user: getUserInfo()["Czymc"]
+					}
+				})
+
+				console.log(res)
+				let {
+					data,
+					Message,
+					count
+				} = res.data
+				if (count == 1) {
+					console.log('data: ', data);
+					if (data[0]['HBack'] == 1) {
 						CommonUtils.showTips({
 							title: '娓╅Θ鎻愮ず',
 							message: data[0]['HBackRemark']
 						})
 						return;
 					}
-                    this.hform.HMaterID = data[0]['HMaterID']
-                    this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
-                    this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
-                    this.hform.HMainSourceBillNo = data[0]['HBillNo']
-                    this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
-                    this.hform.HMainSourceInterID = data[0].HInterID
-                    this.hform.HMainSourceEntryID = data[0].HEntryID
-                    this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
-                    this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
-                    this.hform.HProcID = data[0]['HProcID']
-                    this.hform.HProcName = data[0]['褰撳墠宸ュ簭']
-                    this.hform.HSourceBillQty = data[0].HSourceBillQty
-					this.hform.HProcExchQty = data[0]['娴佽浆鍗℃暟閲�']
-                    this.hasSourceBill = true
-                    this.get_CheckItem();
-                } else {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: Message
-                    })
-                }
+					if (this.hform.HSourceBillType == "3791") { //鍑虹珯鍗�
+						this.hform.HMaterID = data[0]['HMaterID']
+						this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+						this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+						this.hform.HMainSourceBillNo = data[0]['鍗曟嵁鍙�']
+						this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
+						this.hform.HMainSourceInterID = data[0].HInterID
+						this.hform.HMainSourceEntryID = data[0].HEntryID
+						this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+						this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+						this.hform.HSourceBillQty = data[0].HSourceBillQty
+						this.hasSourceBill = true
+						this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
+						this.hform.HICMOInterID = data[0].HICMOInterID
+						this.hform.HICMOEntryID = data[0].HICMOEntryID
+						this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
+						this.hform.HProcExchBillNo = data[0].HProcExchBillNo
+						this.hform.HProcExchInterID = data[0].HProcExchInterID
+						this.hform.HProcExchEntryID = data[0].HProcExchEntryID
+						this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
+						this.hform.HSourceName = data[0].鐢熶骇璧勬簮
+						this.hform.HSourceID = data[0].HSourceID
+						this.hform.HProcID = data[0].HProcID
+						this.hform.HProcName = data[0].宸ュ簭鍚嶇О
+						this.hform.HCheckQty = data[0].鍑虹珯鏁伴噺
+					} else {
+						this.hform.HMaterID = data[0]['HMaterID']
+						this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+						this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+						this.hform.HMainSourceBillNo = data[0]['HBillNo']
+						this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
+						this.hform.HMainSourceInterID = data[0].HInterID
+						this.hform.HMainSourceEntryID = data[0].HEntryID
+						this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+						this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+						this.hform.HProcID = data[0]['HProcID']
+						this.hform.HProcName = data[0]['褰撳墠宸ュ簭']
+						this.hform.HSourceBillQty = data[0].HSourceBillQty
+						this.hform.HProcExchQty = data[0]['娴佽浆鍗℃暟閲�']
+						this.hasSourceBill = true
+					}
 
-                if (
-                    (uni.getStorageSync("OrganizationID") == "7667152" &&
-                        uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
-                    (uni.getStorageSync("OrganizationID") == "100199" &&
-                        uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
-                ) {
-                    await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
-                }
+					this.get_CheckItem();
+				} else {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: Message
+					})
+				}
 
-                // 鏍规嵁鍗曟嵁绫诲瀷锛岃皟鐢ㄤ笉鍚岀殑涓嬫帹鍑芥暟
-                // if (this.hform.HSourceBillType == 3711) {
-                // 	// 宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
-                // 	await this.LoadingInformation_ICMOReportBill(HBarCode);
-                // 	if (
-                // 		(uni.getStorageSync("OrganizationID") == "7667152" &&
-                // 			uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
-                // 		(uni.getStorageSync("OrganizationID") == "100199" &&
-                // 			uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
-                // 	) {
-                // 		await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
-                // 	}
-                // 	return;
-                // }
-                // if (this.hform.HSourceBillType == 3790) {
-                // 	// 宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
-                // 	await this.LoadingInformation_StationInBill(HBarCode);
-                // 	if (
-                // 		(uni.getStorageSync("OrganizationID") == "7667152" &&
-                // 			uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
-                // 		(uni.getStorageSync("OrganizationID") == "100199" &&
-                // 			uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
-                // 	) {
-                // 		await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
-                // 	}
-                // 	return;
-                // }
+				if (
+					(uni.getStorageSync("OrganizationID") == "7667152" &&
+						uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
+					(uni.getStorageSync("OrganizationID") == "100199" &&
+						uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
+				) {
+					await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+				}
 
-            },
-            async GetCheckItemID() {
-                if (!this.hform.HMaterName && !this.hform.HProcName) {
-                    try {
-                        let res = await CommonUtils.doRequest2Async({
-                            url: "/Web/GetCheckItemID",
-                            data: {
-                                HName: this.hform.HMaterName,
-                                HProName: this.hform.HProcName,
-                                HSourceID: this.hform.HSourceID,
-                            },
-                        });
+				// 鏍规嵁鍗曟嵁绫诲瀷锛岃皟鐢ㄤ笉鍚岀殑涓嬫帹鍑芥暟
+				// if (this.hform.HSourceBillType == 3711) {
+				// 	// 宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
+				// 	await this.LoadingInformation_ICMOReportBill(HBarCode);
+				// 	if (
+				// 		(uni.getStorageSync("OrganizationID") == "7667152" &&
+				// 			uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
+				// 		(uni.getStorageSync("OrganizationID") == "100199" &&
+				// 			uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
+				// 	) {
+				// 		await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+				// 	}
+				// 	return;
+				// }
+				// if (this.hform.HSourceBillType == 3790) {
+				// 	// 宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
+				// 	await this.LoadingInformation_StationInBill(HBarCode);
+				// 	if (
+				// 		(uni.getStorageSync("OrganizationID") == "7667152" &&
+				// 			uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
+				// 		(uni.getStorageSync("OrganizationID") == "100199" &&
+				// 			uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
+				// 	) {
+				// 		await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+				// 	}
+				// 	return;
+				// }
 
-                        let {
-                            count,
-                            Message,
-                            data
-                        } = res.data;
+			},
+			async GetCheckItemID() {
+				if (!this.hform.HMaterName && !this.hform.HProcName) {
+					try {
+						let res = await CommonUtils.doRequest2Async({
+							url: "/Web/GetCheckItemID",
+							data: {
+								HName: this.hform.HMaterName,
+								HProName: this.hform.HProcName,
+								HSourceID: this.hform.HSourceID,
+							},
+						});
 
-                        if (count != 1) {
-                            CommonUtils.showTips({
-                                title: "娓╅Θ鎻愮ず",
-                                message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${Message}`,
-                            });
-                            return;
-                        }
+						let {
+							count,
+							Message,
+							data
+						} = res.data;
 
-                        this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
-                        this.hform.HQCSchemeID = data[0].hmainid;
+						if (count != 1) {
+							CommonUtils.showTips({
+								title: "娓╅Θ鎻愮ず",
+								message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${Message}`,
+							});
+							return;
+						}
 
-                        this.get_CheckItem();
-                    } catch (err) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${err}`,
-                        });
-                    }
-                }
-            },
-            //#region 涓�鑷�
-            async LoadingInformation_ProcExchange(HBarCode) {
-                // 宸ュ簭娴佽浆鍗�
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/CheckBill/get_ProcessExchangeBill_ByBillNo",
-                        data: {
-                            HBillNo: HBarCode,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+						this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+						this.hform.HQCSchemeID = data[0].hmainid;
 
-                    let {
-                        count,
-                        Message,
-                        data
-                    } = res.data;
+						this.get_CheckItem();
+					} catch (err) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${err}`,
+						});
+					}
+				}
+			},
+			//#region 涓�鑷�
+			async LoadingInformation_ProcExchange(HBarCode) {
+				// 宸ュ簭娴佽浆鍗�
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/CheckBill/get_ProcessExchangeBill_ByBillNo",
+						data: {
+							HBillNo: HBarCode,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                    if (count != 1) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${Message}`,
-                        });
-                        return;
-                    }
-                    this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
-                    this.hform.HProcExchInterID = data[0].HProcExchInterID;
-                    this.hform.HProcExchEntryID = data[0].HProcExchEntryID || 0;
-                    this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
-                    this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
-                    this.hform.HICMOInterID = data[0].HICMOInterID;
-                    this.hform.HICMOQty = data[0].HICMOQty || 0;
-                    this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
-                    this.hform.HSourceID = data[0].HSourceID || 0;
-                    this.hform.HMaterID = data[0].HMaterID;
-                    this.hform.HMaterName = data[0].浜у搧鍚嶇О;
-                    this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
-                    this.hform.HMainSourceBillType = data[0].HBillType;
-                    this.hform.HMainSourceInterID = data[0].HInterID;
-                    this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
-                    this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
-                    this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
-                    this.hform.HProcName = data[0].褰撳墠宸ュ簭;
-                    this.hform.HBatchNo = data[0].鎵瑰彿;
+					let {
+						count,
+						Message,
+						data
+					} = res.data;
 
-                    this.hasSourceBill = true
-                    this.get_CheckItem();
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${err}`,
-                    });
-                }
-            },
-            //#endregion
+					if (count != 1) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${Message}`,
+						});
+						return;
+					}
+					this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
+					this.hform.HProcExchInterID = data[0].HProcExchInterID;
+					this.hform.HProcExchEntryID = data[0].HProcExchEntryID || 0;
+					this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+					this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
+					this.hform.HICMOInterID = data[0].HICMOInterID;
+					this.hform.HICMOQty = data[0].HICMOQty || 0;
+					this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
+					this.hform.HSourceID = data[0].HSourceID || 0;
+					this.hform.HMaterID = data[0].HMaterID;
+					this.hform.HMaterName = data[0].浜у搧鍚嶇О;
+					this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+					this.hform.HMainSourceBillType = data[0].HBillType;
+					this.hform.HMainSourceInterID = data[0].HInterID;
+					this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+					this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+					this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+					this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+					this.hform.HBatchNo = data[0].鎵瑰彿;
 
-            //#region 淇敼
-            async LoadingInformation_ICMO(HBarCode) {
-                // 鐢熶骇璁㈠崟
-                try {
-                    let sWhere = "and 鍗曟嵁鍙�='" + HBarCode + "'"
-                    console.log(sWhere)
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/LEMS/MES_IF_ICMOBillList_Json",
-                        data: {
-                            sWhere: sWhere,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+					this.hasSourceBill = true
+					this.get_CheckItem();
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${err}`,
+					});
+				}
+			},
+			//#endregion
 
-                    let {
-                        count,
-                        Message,
-                        data
-                    } = res.data;
+			//#region 淇敼
+			async LoadingInformation_ICMO(HBarCode) {
+				// 鐢熶骇璁㈠崟
+				try {
+					let sWhere = "and 鍗曟嵁鍙�='" + HBarCode + "'"
+					console.log(sWhere)
+					let res = await CommonUtils.doRequest2Async({
+						url: "/LEMS/MES_IF_ICMOBillList_Json",
+						data: {
+							sWhere: sWhere,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                    if (count != 1) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${Message}`,
-                        });
-                        return;
-                    }
-                    //鐢熶骇鏀�
-                    //this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
-                    //this.hform.HProcExchInterID = data[0].HProcExchInterID;
-                    //this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
-                    //this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
-                    this.hform.HICMOBillNo = data[0].鍗曟嵁鍙�;
-                    this.hform.HICMOInterID = data[0].hmainid;
-                    this.hform.HICMOQty = data[0].鐢熶骇浠诲姟鍗曟暟閲�;
-                    this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
-                    this.hform.HSourceID = data[0].HSourceID;
-                    this.hform.HMaterID = data[0].HMaterID;
-                    this.hform.HMaterNumber = data[0].浜у搧浠ｇ爜
-                    this.hform.HMaterName = data[0].浜у搧鍚嶇О;
-                    this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
-                    this.hform.HMainSourceBillType = data[0].鍗曟嵁绫诲瀷;
-                    this.hform.HMainSourceInterID = data[0].HInterID;
-                    this.hform.HICMOEntryID = data[0].HEntryID || 1;
-                    this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
-                    this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
-                    this.hform.HProcName = data[0].褰撳墠宸ュ簭;
-                    this.hasSourceBill = true
-                    this.get_CheckItem();
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${err}`,
-                    });
-                }
-            },
-            //#endregion
+					let {
+						count,
+						Message,
+						data
+					} = res.data;
 
-            //#region 涓�鑷�
-            async LoadingInformation_StationEntrustOutBill(HBarCode) {
-                // 宸ュ簭濮斿鎺ユ敹鍗�
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Cj_StationEntrustOutBill/list",
-                        data: {
-                            sWhere: ` and HBillNo = '${HBarCode}'`,
-                        },
-                    });
+					if (count != 1) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${Message}`,
+						});
+						return;
+					}
+					//鐢熶骇鏀�
+					//this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
+					//this.hform.HProcExchInterID = data[0].HProcExchInterID;
+					//this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
+					//this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+					this.hform.HICMOBillNo = data[0].鍗曟嵁鍙�;
+					this.hform.HICMOInterID = data[0].hmainid;
+					this.hform.HICMOQty = data[0].鐢熶骇浠诲姟鍗曟暟閲�;
+					this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
+					this.hform.HSourceID = data[0].HSourceID;
+					this.hform.HMaterID = data[0].HMaterID;
+					this.hform.HMaterNumber = data[0].浜у搧浠ｇ爜
+					this.hform.HMaterName = data[0].浜у搧鍚嶇О;
+					this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+					this.hform.HMainSourceBillType = data[0].鍗曟嵁绫诲瀷;
+					this.hform.HMainSourceInterID = data[0].HInterID;
+					this.hform.HICMOEntryID = data[0].HEntryID || 1;
+					this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+					this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+					this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+					this.hasSourceBill = true
+					this.get_CheckItem();
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${err}`,
+					});
+				}
+			},
+			//#endregion
 
-                    let {
-                        count,
-                        Message,
-                        data
-                    } = res.data;
+			//#region 涓�鑷�
+			async LoadingInformation_StationEntrustOutBill(HBarCode) {
+				// 宸ュ簭濮斿鎺ユ敹鍗�
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Cj_StationEntrustOutBill/list",
+						data: {
+							sWhere: ` and HBillNo = '${HBarCode}'`,
+						},
+					});
 
-                    if (count != 1) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${Message}`,
-                        });
-                        return;
-                    }
+					let {
+						count,
+						Message,
+						data
+					} = res.data;
 
-                    HProcExchBillNo = data[0].娴佽浆鍗″彿;
-                    HProcExchInterID = data[0].HProcExchInterID;
-                    HProcExchEntryID = data[0].HProcExchEntryID;
-                    HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
-                    HICMOBillNo = data[0].鐢熶骇璁㈠崟鍙�;
-                    HICMOInterID = data[0].HICMOInterID;
-                    HICMOQty = data[0].HICMOQty;
-                    HSourceName = data[0].鐢熶骇璧勬簮;
-                    HSourceID = data[0].HSourceID;
-                    HMaterID = data[0].HMaterID;
-                    HMaterName = data[0].浜у搧鍚嶇О;
-                    HMainSourceBillNo = data[0].鍗曟嵁鍙�;
-                    HMainSourceBillType = data[0].HBillType;
-                    HMainSourceInterID = data[0].hmainid;
-                    HICMOEntryID = data[0].HICMOEntryID || 1;
-                    this.hasSourceBill = true
-                    this.get_CheckItem();
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${err}`,
-                    });
-                }
-            },
-            //#endregion
+					if (count != 1) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${Message}`,
+						});
+						return;
+					}
 
-            async LoadingInformation_ICMOReportBill(HBarCode) {
-                // 鐢熶骇姹囨姤鍗�
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/QC_LastPieceCheckBill/get_ICMOReportBill_Tmp_getByBillNo",
-                        data: {
-                            HBillNo: HBarCode,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+					HProcExchBillNo = data[0].娴佽浆鍗″彿;
+					HProcExchInterID = data[0].HProcExchInterID;
+					HProcExchEntryID = data[0].HProcExchEntryID;
+					HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+					HICMOBillNo = data[0].鐢熶骇璁㈠崟鍙�;
+					HICMOInterID = data[0].HICMOInterID;
+					HICMOQty = data[0].HICMOQty;
+					HSourceName = data[0].鐢熶骇璧勬簮;
+					HSourceID = data[0].HSourceID;
+					HMaterID = data[0].HMaterID;
+					HMaterName = data[0].浜у搧鍚嶇О;
+					HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+					HMainSourceBillType = data[0].HBillType;
+					HMainSourceInterID = data[0].hmainid;
+					HICMOEntryID = data[0].HICMOEntryID || 1;
+					this.hasSourceBill = true
+					this.get_CheckItem();
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${err}`,
+					});
+				}
+			},
+			//#endregion
 
-                    let {
-                        count,
-                        Message,
-                        data
-                    } = res.data;
+			async LoadingInformation_ICMOReportBill(HBarCode) {
+				// 鐢熶骇姹囨姤鍗�
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/QC_LastPieceCheckBill/get_ICMOReportBill_Tmp_getByBillNo",
+						data: {
+							HBillNo: HBarCode,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                    if (count != 1) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇鐢熶骇姹囨姤鍗� 閿欒: ${Message}`,
-                        });
-                        return;
-                    }
-                    //change_inlife
-                    this.hform.HMainSourceEntryID = data[0].HEntryID || 1;
-                    this.hform.HMaterNumber = data[0].HMaterNumber;
-                    this.hform.HICMOBillNo = data[0].HICMOBillNo;
-                    this.hform.HICMOInterID = data[0].HICMOInterID;
-                    this.hform.HICMOQty = data[0].HICMOQty;
-                    this.hform.HSourceName = data[0].HSourceName;
-                    this.hform.HSourceID = data[0].HSourceID;
-                    this.hform.HMaterID = data[0].HMaterID;
-                    this.hform.HMaterName = data[0].HMaterName;
-                    this.hform.HMainSourceBillNo = data[0].HBillNo;
-                    this.hform.HMainSourceBillType = data[0].HBillType;
-                    this.hform.HMainSourceInterID = data[0].HInterID;
-                    this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
-                    this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
-                    this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+					let {
+						count,
+						Message,
+						data
+					} = res.data;
+
+					if (count != 1) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇鐢熶骇姹囨姤鍗� 閿欒: ${Message}`,
+						});
+						return;
+					}
+					//change_inlife
+					this.hform.HMainSourceEntryID = data[0].HEntryID || 1;
+					this.hform.HMaterNumber = data[0].HMaterNumber;
+					this.hform.HICMOBillNo = data[0].HICMOBillNo;
+					this.hform.HICMOInterID = data[0].HICMOInterID;
+					this.hform.HICMOQty = data[0].HICMOQty;
+					this.hform.HSourceName = data[0].HSourceName;
+					this.hform.HSourceID = data[0].HSourceID;
+					this.hform.HMaterID = data[0].HMaterID;
+					this.hform.HMaterName = data[0].HMaterName;
+					this.hform.HMainSourceBillNo = data[0].HBillNo;
+					this.hform.HMainSourceBillType = data[0].HBillType;
+					this.hform.HMainSourceInterID = data[0].HInterID;
+					this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+					this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+					this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
 
 
-                    for (let i = 0; i < data.length; i++) {
-                        this.addCheckItem(data[i])
-                    }
+					for (let i = 0; i < data.length; i++) {
+						this.addCheckItem(data[i])
+					}
 
-                    this.hasSourceBill = true
-                    this.get_CheckItem();
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇鐢熶骇姹囨姤鍗� 閿欒: ${err}`,
-                    });
-                }
-            },
-            // 妫�楠屽憳鍒濆鍖�
-            async InitHEmp() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Gy_Employee/list",
-                        data: {
-                            sWhere: `  and 缁勭粐鍚嶇О = '${uni.getStorageSync(
+					this.hasSourceBill = true
+					this.get_CheckItem();
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇鐢熶骇姹囨姤鍗� 閿欒: ${err}`,
+					});
+				}
+			},
+			// 妫�楠屽憳鍒濆鍖�
+			async InitHEmp() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Gy_Employee/list",
+						data: {
+							sWhere: `  and 缁勭粐鍚嶇О = '${uni.getStorageSync(
               "Organization"
-            )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' `,
-                            user: getUserInfo()["Czymc"],
-                            Organization: uni.getStorageSync("Organization"),
-                        },
-                    });
+            )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' order by 閮ㄩ棬浠ｇ爜`,
+							user: getUserInfo()["Czymc"],
+							Organization: uni.getStorageSync("Organization"),
+						},
+					});
 
-                    let {
-                        data,
-                        Message,
-                        count
-                    } = res.data;
+					let {
+						data,
+						Message,
+						count
+					} = res.data;
 
-                    if (count == 1) {
-                        console.log("data: ", data);
-                        this.GyFirstCheckEmpList = data;
-                        this.GyFirstCheckEmpNameList = Array.from(data).map((e) => e["鑱屽憳鍚嶇О"]);
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鍒濆鍖栨楠屽憳澶辫触: ${Message}`,
-                        });
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鍒濆鍖栨楠屽憳澶辫触: ${err}`,
-                    });
-                }
-            },
-            async HFirstCheckEmpChange(e) {
-                console.log("閫変腑妫�楠屽憳: ", e);
-                let index = this.GyFirstCheckEmpList.findIndex((elem) => elem["鑱屽憳鍚嶇О"] == e);
-                if (index == -1) {
-                    this.hform.HFirstCheckEmp = 0;
-                    this.hform.HFirstCheckEmpName = "";
-                    return;
-                }
+					if (count == 1) {
+						console.log("data: ", data);
+						this.GyFirstCheckEmpList = data;
+						this.GyFirstCheckEmpNameList = Array.from(data).map((e) => e["鑱屽憳鍚嶇О"]);
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鍒濆鍖栨楠屽憳澶辫触: ${Message}`,
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鍒濆鍖栨楠屽憳澶辫触: ${err}`,
+					});
+				}
+			},
+			async HFirstCheckEmpChange(e) {
+				console.log("閫変腑妫�楠屽憳: ", e);
+				let index = this.GyFirstCheckEmpList.findIndex((elem) => elem["鑱屽憳鍚嶇О"] == e);
+				if (index == -1) {
+					this.hform.HFirstCheckEmp = 0;
+					this.hform.HFirstCheckEmpName = "";
+					return;
+				}
 
-                this.hform.HFirstCheckEmp = this.GyFirstCheckEmpList[index]["HItemID"];
-                this.hform.HFirstCheckEmpName = this.GyFirstCheckEmpList[index]["鑱屽憳鍚嶇О"];
-            },
-            // 鐢熶骇鐝鍒濆鍖�
-            async InitHWorkShift() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Gy_ShiftsController/Get_Gy_WorkShiftList",
-                        data: {
-                            sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'')  != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync(
+				this.hform.HFirstCheckEmp = this.GyFirstCheckEmpList[index]["HItemID"];
+				this.hform.HFirstCheckEmpName = this.GyFirstCheckEmpList[index]["鑱屽憳鍚嶇О"];
+			},
+			// 鐢熶骇鐝鍒濆鍖�
+			async InitHWorkShift() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Gy_ShiftsController/Get_Gy_WorkShiftList",
+						data: {
+							sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'')  != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync(
               "Organization"
             )}'`,
-                            HMaker: getUserInfo()["Czymc"],
-                        },
-                    });
+							HMaker: getUserInfo()["Czymc"],
+						},
+					});
 
-                    let {
-                        data,
-                        Message,
-                        count
-                    } = res.data;
+					let {
+						data,
+						Message,
+						count
+					} = res.data;
 
-                    if (count == 1) {
-                        console.log("data: ", data);
-                        this.GyWorkShiftList = data;
-                        this.GyWorkShiftNameList = Array.from(data).map((e) => e["鐝鍚嶇О"]);
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鍒濆鍖栫彮娆″け璐�: ${Message}`,
-                        });
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鍒濆鍖栫彮娆″け璐�: ${err}`,
-                    });
-                }
-            },
-            async HWorkShiftChange(e) {
-                console.log("閫変腑鐝: ", e);
-                let index = this.GyWorkShiftList.findIndex((elem) => elem["鐝鍚嶇О"] == e);
-                if (index == -1) {
-                    this.hform.HWorkShiftID = 0;
-                    this.hform.HWorkShiftName = "";
-                    return;
-                }
+					if (count == 1) {
+						console.log("data: ", data);
+						this.GyWorkShiftList = data;
+						this.GyWorkShiftNameList = Array.from(data).map((e) => e["鐝鍚嶇О"]);
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鍒濆鍖栫彮娆″け璐�: ${Message}`,
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鍒濆鍖栫彮娆″け璐�: ${err}`,
+					});
+				}
+			},
+			async HWorkShiftChange(e) {
+				console.log("閫変腑鐝: ", e);
+				let index = this.GyWorkShiftList.findIndex((elem) => elem["鐝鍚嶇О"] == e);
+				if (index == -1) {
+					this.hform.HWorkShiftID = 0;
+					this.hform.HWorkShiftName = "";
+					return;
+				}
 
-                this.hform.HWorkShiftID = this.GySourceList[index]["HInterID"];
-                this.hform.HWorkShiftName = this.GySourceList[index]["鐝鍚嶇О"];
-            },
-            // 鐢熶骇璧勬簮鏇存柊
-            // 鐢熶骇璧勬簮鍒濆鍖�
-            async InitHSource() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Gy_Source/list",
-                        data: {
-                            sWhere: `and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'')  != '' and HUSEORGID = '100038'`,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+				this.hform.HWorkShiftID = this.GySourceList[index]["HInterID"];
+				this.hform.HWorkShiftName = this.GySourceList[index]["鐝鍚嶇О"];
+			},
+			// 鐢熶骇璧勬簮鏇存柊
+			// 鐢熶骇璧勬簮鍒濆鍖�
+			async InitHSource() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Gy_Source/list",
+						data: {
+							sWhere: `and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'')  != '' and HUSEORGID = '100038'`,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                    let {
-                        data,
-                        Message,
-                        count
-                    } = res.data;
+					let {
+						data,
+						Message,
+						count
+					} = res.data;
 
-                    if (count == 1) {
-                        this.GySourceList = data;
-                        this.GySourceNameList = Array.from(data).map((e) => e["鐢熶骇璧勬簮鍚嶇О"]);
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${Message}`,
-                        });
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${err}`,
-                    });
-                }
-            },
-            // 鐢熶骇璧勬簮鏇存柊
-            async HSourceChange(e) {
-                console.log("閫変腑鐢熶骇璧勬簮: ", e);
-                let index = this.GySourceList.findIndex((elem) => elem["鐢熶骇璧勬簮鍚嶇О"] == e);
-                if (index == -1) {
-                    this.hform.HSourceID = 0;
-                    this.hform.HSourceName = "";
-                    return;
-                }
+					if (count == 1) {
+						this.GySourceList = data;
+						this.GySourceNameList = Array.from(data).map((e) => e["鐢熶骇璧勬簮鍚嶇О"]);
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${Message}`,
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${err}`,
+					});
+				}
+			},
+			// 鐢熶骇璧勬簮鏇存柊
+			async HSourceChange(e) {
+				console.log("閫変腑鐢熶骇璧勬簮: ", e);
+				let index = this.GySourceList.findIndex((elem) => elem["鐢熶骇璧勬簮鍚嶇О"] == e);
+				if (index == -1) {
+					this.hform.HSourceID = 0;
+					this.hform.HSourceName = "";
+					return;
+				}
 
-                this.hform.HSourceID = this.GySourceList[index]["HItemID"];
-                this.hform.HSourceName = this.GySourceList[index]["鐢熶骇璧勬簮鍚嶇О"];
+				this.hform.HSourceID = this.GySourceList[index]["HItemID"];
+				this.hform.HSourceName = this.GySourceList[index]["鐢熶骇璧勬簮鍚嶇О"];
 
-                this.get_ICMOBillStatusList();
-                this.get_QC_TakeSampleCheckBillList();
-                this.GetCheckItemID();
-            },
-            // 鏄剧ず寮圭獥
-            async showSelectorModule(item, index) {
-                this.currentChechItemIDCache = item.num || 0; // 0 琛ㄧず娌℃湁浠讳綍瀛愯〃琚�変腑
-                this.enablePopupModule = this.PopupModuleNameList[index];
-                console.log("this.$refs: ", this.$refs);
-                await this.$nextTick();
-                if (index == 7) {
-                    // 妫�楠屾柟妗堥渶瑕侀澶栦紶閫掑伐搴忓拰鐗╂枡鍚嶇О涓や釜鍙傛暟
-                    this.$refs.listPopup.setRequiredInfo(item.HMaterName, item.HProcName);
-                }
+				this.get_ICMOBillStatusList();
+				this.get_QC_TakeSampleCheckBillList();
+				this.GetCheckItemID();
+			},
+			// 鏄剧ず寮圭獥
+			async showSelectorModule(item, index) {
+				this.currentChechItemIDCache = item.num || 0; // 0 琛ㄧず娌℃湁浠讳綍瀛愯〃琚�変腑
+				this.enablePopupModule = this.PopupModuleNameList[index];
+				console.log("this.$refs: ", this.$refs);
+				await this.$nextTick();
+				if (index == 7) {
+					// 妫�楠屾柟妗堥渶瑕侀澶栦紶閫掑伐搴忓拰鐗╂枡鍚嶇О涓や釜鍙傛暟
+					this.$refs.listPopup.setRequiredInfo(item.HMaterName, item.HProcName);
+				}
 
-                this.$refs.listPopup.showPopup();
-            },
-            getAnalysisMethodDisplay(val) {
-                console.log("AnalysisMethodVal: ", val);
-                if (val) {
-                    return this.arrayAnalysisMethod.find((e) => e.value == val).name;
-                }
-                return "";
-            },
-            checkResultChange(event) {
-                console.log("event: ", event);
-            },
-            // 妫�楠岄」鐩柊澧炶
-            addCheckItem(resource) {
-                let ordinal = this.getObjLength(this.checkItems) + 1;
-                let checkItem = {
-                    num: ordinal,
-                    HInterID: this.hform.HInterID,
-                    HQCCheckItemID: "",
-                    HQCCheckItemNumber: "",
-                    HQCCheckItemName: "",
-                    HInspectInstruMentID: "0",
-                    HInspectInstruMentNumber: "",
-                    HInspectInstruMentName: "",
-                    HQCStd: "",
-                    HUnit: "",
-                    HQCNote: "",
-                    HAnalysisMethod: "",
-                    HResult: 1,
-                    HMax: "",
-                    HMin: "",
-                    HAvg: "",
-                    HRemark: "",
-                    HKeyInspect: false,
-                    HStatus: 1,
-                    HSampleSchemeID: "",
-                    HUnitID: 0,
-                    HInspectVal: "",
-                    HTargetVal: "",
-                    HUpLimit: "",
-                    HDownLimit: "",
-                    HUpOffSet: "",
-                    HDownOffSet: "",
-                    HSampleDamageQty: 0,
-                    HSampleSchemeName: "",
-                    HSampleQty: 0,
-                    HAcceptQty: 0,
-                    HInspectionLevel: "",
-                    HRejectQty: 0,
-                    HStrictness: "",
-                    HSampleUnRightQty: 0,
-                    HAQL: "",
-                    HSamplingType: "",
-                    HInspectResultToSee: "",
-                };
-                if (resource) {
-                    // 閫氳繃涓昏〃妫�楠屾柟妗堝甫鍑虹殑妫�楠岄」鐩�
-                    Object.assign(checkItem, resource);
-                }
-                this.$set(this.checkItems, ordinal, checkItem);
-                this.$nextTick(() => {
-                    // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
-                    this.setInspectValModule(this.checkItems[ordinal]);
-                });
-            },
-            // 妫�楠岄」鐩垹闄よ
-            removeCheckItem(item) {
-                uni.showModal({
-                    title: "娓╅Θ鎻愮ず",
-                    content: `纭瑕佸垹闄ょ${item.num}琛屽悧锛熷垹闄ゅ悗涓嶈兘鎭㈠`,
-                    success: (res) => {
-                        if (res.confirm) {
-                            this.$delete(this.checkItems, item.num);
-                            this.$delete(this.subTabs, `_${item.num}`);
-                            this.$forceUpdate();
-                            this.refreshCheckItemNum();
-                        }
-                    },
-                });
-            },
-            async refreshCheckItemNum() {
-                await this.$nextTick();
-                // 閲嶆帓搴忓彿
-                let num = 1;
-                let checkItemsCache = {};
-                for (let s in this.checkItems) {
-                    checkItemsCache[num] = this.checkItems[s];
-                    checkItemsCache[num].num = num;
-                    num++;
-                }
-                this.checkItems = checkItemsCache;
-            },
-            getObjLength(obj) {
-                return Object.keys(obj).length;
-            },
-            // 缁撹淇敼
-            HResultChange(id, e) {
-                console.log("e: ", e);
-                this.checkItems[id]["HResult"] = e.detail.value ? 1 : 2;
+				this.$refs.listPopup.showPopup();
+			},
+			getAnalysisMethodDisplay(val) {
+				console.log("AnalysisMethodVal: ", val);
+				if (val) {
+					return this.arrayAnalysisMethod.find((e) => e.value == val).name;
+				}
+				return "";
+			},
+			checkResultChange(event) {
+				console.log("event: ", event);
+			},
+			// 妫�楠岄」鐩柊澧炶
+			addCheckItem(resource) {
+				let ordinal = this.getObjLength(this.checkItems) + 1;
+				let checkItem = {
+					num: ordinal,
+					HInterID: this.hform.HInterID,
+					HQCCheckItemID: "",
+					HQCCheckItemNumber: "",
+					HQCCheckItemName: "",
+					HInspectInstruMentID: "0",
+					HInspectInstruMentNumber: "",
+					HInspectInstruMentName: "",
+					HQCStd: "",
+					HUnit: "",
+					HQCNote: "",
+					HAnalysisMethod: "",
+					HResult: 1,
+					HMax: "",
+					HMin: "",
+					HAvg: "",
+					HRemark: "",
+					HKeyInspect: false,
+					HStatus: 1,
+					HSampleSchemeID: "",
+					HUnitID: 0,
+					HInspectVal: "",
+					HTargetVal: "",
+					HUpLimit: "",
+					HDownLimit: "",
+					HUpOffSet: "",
+					HDownOffSet: "",
+					HSampleDamageQty: 0,
+					HSampleSchemeName: "",
+					HSampleQty: 0,
+					HAcceptQty: 0,
+					HInspectionLevel: "",
+					HRejectQty: 0,
+					HStrictness: "",
+					HSampleUnRightQty: 0,
+					HAQL: "",
+					HSamplingType: "",
+					HInspectResultToSee: "",
+				};
+				if (resource) {
+					// 閫氳繃涓昏〃妫�楠屾柟妗堝甫鍑虹殑妫�楠岄」鐩�
+					Object.assign(checkItem, resource);
+				}
+				this.$set(this.checkItems, ordinal, checkItem);
+				this.$nextTick(() => {
+					// 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
+					this.setInspectValModule(this.checkItems[ordinal]);
+				});
+			},
+			// 妫�楠岄」鐩垹闄よ
+			removeCheckItem(item) {
+				uni.showModal({
+					title: "娓╅Θ鎻愮ず",
+					content: `纭瑕佸垹闄ょ${item.num}琛屽悧锛熷垹闄ゅ悗涓嶈兘鎭㈠`,
+					success: (res) => {
+						if (res.confirm) {
+							this.$delete(this.checkItems, item.num);
+							this.$delete(this.subTabs, `_${item.num}`);
+							this.$forceUpdate();
+							this.refreshCheckItemNum();
+						}
+					},
+				});
+			},
+			async refreshCheckItemNum() {
+				await this.$nextTick();
+				// 閲嶆帓搴忓彿
+				let num = 1;
+				let checkItemsCache = {};
+				for (let s in this.checkItems) {
+					checkItemsCache[num] = this.checkItems[s];
+					checkItemsCache[num].num = num;
+					num++;
+				}
+				this.checkItems = checkItemsCache;
+			},
+			getObjLength(obj) {
+				return Object.keys(obj).length;
+			},
+			// 缁撹淇敼
+			HResultChange(id, e) {
+				console.log("e: ", e);
+				this.checkItems[id]["HResult"] = e.detail.value ? 1 : 2;
 
-                this.HCheckLastResult();
-            },
-            // 姣忔妫�楠岄」鐩殑缁撹鏇存柊锛岄兘瑕佸垽鏂渶缁堢粨璁�
-            HCheckLastResult() {
-                let unPassNum = 0;
-                for (var key in this.checkItems) {
-                    if (!(this.checkItems[key]["HResult"] == 1)) {
-                        unPassNum++;
-                    }
-                }
+				this.HCheckLastResult();
+			},
+			// 姣忔妫�楠岄」鐩殑缁撹鏇存柊锛岄兘瑕佸垽鏂渶缁堢粨璁�
+			HCheckLastResult() {
+				let unPassNum = 0;
+				for (var key in this.checkItems) {
+					if (!(this.checkItems[key]["HResult"] == 1)) {
+						unPassNum++;
+					}
+				}
 
-                if (unPassNum > 0) {
-                    this.hform.HLastResult = false;
-                    return;
-                }
-                this.hform.HLastResult = true;
-            },
-            // 妫�楠屾柟妗堜慨鏀�
-            HAnalysisMethodChange(id, e) {
-                console.log("e: ", e);
-                this.checkItems[id]["HAnalysisMethod"] = this.arrayAnalysisMethod[e.detail.value][
-                    "value"
-                ];
+				if (unPassNum > 0) {
+					this.hform.HLastResult = false;
+					return;
+				}
+				this.hform.HLastResult = true;
+			},
+			// 妫�楠屾柟妗堜慨鏀�
+			HAnalysisMethodChange(id, e) {
+				console.log("e: ", e);
+				this.checkItems[id]["HAnalysisMethod"] = this.arrayAnalysisMethod[e.detail.value][
+					"value"
+				];
 
-                // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
-                this.setInspectValModule(this.checkItems[id]);
-            },
-            // 閲嶇偣妫�鏌ヤ慨鏀�
-            HKeyInspectChange(id, e) {
-                console.log("e: ", e);
-                this.checkItems[id]["HKeyInspect"] = e.detail.value;
-            },
-            // 妫�楠岄」鐩繑鍥�
-            async CheckItemComplete(e) {
-                console.log("CheckItemRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.checkItems[key], {
-                        HQCCheckItemID: data["HItemID"],
-                        HQCCheckItemNumber: data["浠ｇ爜"],
-                        HQCCheckItemName: data["鍚嶇О"],
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                }
-            },
-            // 妫�楠屾柟妗堣繑鍥�
-            async SampleSchemeComplete(e) {
-                console.log("SampleSchemeRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.checkItems[key], {
-                        HSampleSchemeID: data["hmainid"],
-                        HSampleSchemeNumber: data["鎶芥牱鏂规浠ｇ爜"],
-                        HSampleSchemeName: data["鎶芥牱鏂规鍚嶇О"],
-                        HSampleQty: data["鏍锋湰閲�"] || 0,
-                        HAcceptQty: data["鍏佽鏁�"] || 0,
-                        HInspectionLevel: data["妫�楠屾按骞�"],
-                        HRejectQty: data["鎷掔粷鏁�"] || 0,
-                        HStrictness: data["涓ユ牸搴�"],
-                        HSampleUnRightQty: data["鏍锋湰涓嶅悎鏍兼暟"] || 0,
-                        HAQL: data["AQL"],
-                        HSamplingType: data["鎶芥牱绫诲瀷"],
-                        HInspectResultToSee: data["妫�楠岀粨鏋�"],
-                        HUpLimit: data["涓婇檺鍊�"] || 0,
-                        HDownLimit: data["涓嬮檺鍊�"] || 0,
-                        HSampleDamageQty: data["鏍锋湰鐮村潖鏁�"] || 0,
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    this.setInspectValModule(this.checkItems[key]);
+				// 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
+				this.setInspectValModule(this.checkItems[id]);
+			},
+			// 閲嶇偣妫�鏌ヤ慨鏀�
+			HKeyInspectChange(id, e) {
+				console.log("e: ", e);
+				this.checkItems[id]["HKeyInspect"] = e.detail.value;
+			},
+			// 妫�楠岄」鐩繑鍥�
+			async CheckItemComplete(e) {
+				console.log("CheckItemRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.checkItems[key], {
+						HQCCheckItemID: data["HItemID"],
+						HQCCheckItemNumber: data["浠ｇ爜"],
+						HQCCheckItemName: data["鍚嶇О"],
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+				}
+			},
+			// 妫�楠屾柟妗堣繑鍥�
+			async SampleSchemeComplete(e) {
+				console.log("SampleSchemeRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.checkItems[key], {
+						HSampleSchemeID: data["hmainid"],
+						HSampleSchemeNumber: data["鎶芥牱鏂规浠ｇ爜"],
+						HSampleSchemeName: data["鎶芥牱鏂规鍚嶇О"],
+						HSampleQty: data["鏍锋湰閲�"] || 0,
+						HAcceptQty: data["鍏佽鏁�"] || 0,
+						HInspectionLevel: data["妫�楠屾按骞�"],
+						HRejectQty: data["鎷掔粷鏁�"] || 0,
+						HStrictness: data["涓ユ牸搴�"],
+						HSampleUnRightQty: data["鏍锋湰涓嶅悎鏍兼暟"] || 0,
+						HAQL: data["AQL"],
+						HSamplingType: data["鎶芥牱绫诲瀷"],
+						HInspectResultToSee: data["妫�楠岀粨鏋�"],
+						HUpLimit: data["涓婇檺鍊�"] || 0,
+						HDownLimit: data["涓嬮檺鍊�"] || 0,
+						HSampleDamageQty: data["鏍锋湰鐮村潖鏁�"] || 0,
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					this.setInspectValModule(this.checkItems[key]);
 
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                }
-            },
-            // 妫�楠屼华鍣ㄨ繑鍥�
-            async InspectMentComplete(e) {
-                console.log("InspectInstruMentRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.checkItems[key], {
-                        HInspectInstruMentID: data["HItemID"],
-                        HInspectInstruMentNumber: data["妫�楠屼华鍣ㄤ唬鐮�"],
-                        HInspectInstruMentName: data["妫�楠屼华鍣ㄥ悕绉�"],
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                }
-            },
-            // 浜у搧浠ｇ爜杩斿洖
-            async MaterComplete(e) {
-                console.log("MaterRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.hform, {
-                        HMaterNumber: data["鐗╂枡浠ｇ爜"],
-                        HMaterName: data["鐗╂枡鍚嶇О"],
-                        HMaterID: data["HItemID"],
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                    this.GetCheckItemID();
-                }
-            },
-            // 浠诲姟鍗曡繑鍥�
-            async ICMOBillComplete(e) {
-                console.log("ICMOBillRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.hform, {
-                        HICMOInterID: data.hmainid,
-                        HICMOEntryID: data.HEntryID || 1,
-                        HICMOBillNo: data.鍗曟嵁鍙�,
-                        HMaterNumber: data.浜у搧浠ｇ爜,
-                        HMaterName: data.浜у搧鍚嶇О,
-                        HMaterID: data.HMaterID,
-                        HICMOQty: data.鐢熶骇浠诲姟鍗曟暟閲�,
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                }
-            },
-            // 娴佽浆鍗¤繑鍥�
-            async ProcExchBillComplete(e) {
-                console.log("ProcExchBillRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.hform, {
-                        HProcExchInterID: data.hmainid,
-                        HProcExchEntryID: data.hsubid,
-                        HProcExchBillNo: data.鍗曟嵁鍙�,
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                }
-            },
-            // 妫�楠屾柟妗�(涓昏〃)杩斿洖
-            async HQCSchemeComplete(e) {
-                console.log("HQCSchemeRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.hform, {
-                        HQCSchemeID: data.hmainid,
-                        HQCSchemeName: data.妫�楠屾柟妗堝悕绉�,
-                    });
-                    await this.get_CheckItem();
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                }
-            },
-            // 宸ュ簭杩斿洖
-            async HProcComplete(e) {
-                console.log(" HProcRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.hform, {
-                        HProcName: data["宸ュ簭鍚嶇О"],
-                        HProcID: data["HItemID"],
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                    await this.GetCheckItemID();
-                    await this.get_ICMOBillStatusList();
-                    await this.get_QC_TakeSampleCheckBillList();
-                }
-            },
-            // 涓嶈壇鍘熷洜鍥炶皟
-            async HBadReasonComplete(e) {
-                console.log('e: ', e);
-                Object.assign(this.badReasons[e.index], {
-                    HBadReasonName: e.retVal[0]['涓嶈壇鍘熷洜鍚嶇О'],
-                    HBadReasonNumber: e.retVal[0]['涓嶈壇鍘熷洜浠ｇ爜'],
-                    HBadReasonID: e.retVal[0]['HItemID']
-                })
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+				}
+			},
+			// 妫�楠屼华鍣ㄨ繑鍥�
+			async InspectMentComplete(e) {
+				console.log("InspectInstruMentRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.checkItems[key], {
+						HInspectInstruMentID: data["HItemID"],
+						HInspectInstruMentNumber: data["妫�楠屼华鍣ㄤ唬鐮�"],
+						HInspectInstruMentName: data["妫�楠屼华鍣ㄥ悕绉�"],
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+				}
+			},
+			// 浜у搧浠ｇ爜杩斿洖
+			async MaterComplete(e) {
+				console.log("MaterRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.hform, {
+						HMaterNumber: data["鐗╂枡浠ｇ爜"],
+						HMaterName: data["鐗╂枡鍚嶇О"],
+						HMaterID: data["HItemID"],
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+					this.GetCheckItemID();
+				}
+			},
+			// 浠诲姟鍗曡繑鍥�
+			async ICMOBillComplete(e) {
+				console.log("ICMOBillRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.hform, {
+						HICMOInterID: data.hmainid,
+						HICMOEntryID: data.HEntryID || 1,
+						HICMOBillNo: data.鍗曟嵁鍙�,
+						HMaterNumber: data.浜у搧浠ｇ爜,
+						HMaterName: data.浜у搧鍚嶇О,
+						HMaterID: data.HMaterID,
+						HICMOQty: data.鐢熶骇浠诲姟鍗曟暟閲�,
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+				}
+			},
+			// 娴佽浆鍗¤繑鍥�
+			async ProcExchBillComplete(e) {
+				console.log("ProcExchBillRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.hform, {
+						HProcExchInterID: data.hmainid,
+						HProcExchEntryID: data.hsubid,
+						HProcExchBillNo: data.鍗曟嵁鍙�,
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+				}
+			},
+			// 妫�楠屾柟妗�(涓昏〃)杩斿洖
+			async HQCSchemeComplete(e) {
+				console.log("HQCSchemeRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.hform, {
+						HQCSchemeID: data.hmainid,
+						HQCSchemeName: data.妫�楠屾柟妗堝悕绉�,
+					});
+					await this.get_CheckItem();
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+				}
+			},
+			// 宸ュ簭杩斿洖
+			async HProcComplete(e) {
+				console.log(" HProcRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.hform, {
+						HProcName: data["宸ュ簭鍚嶇О"],
+						HProcID: data["HItemID"],
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+					await this.GetCheckItemID();
+					await this.get_ICMOBillStatusList();
+					await this.get_QC_TakeSampleCheckBillList();
+				}
+			},
+			// 涓嶈壇鍘熷洜鍥炶皟
+			async HBadReasonComplete(e) {
+				console.log('e: ', e);
+				Object.assign(this.badReasons[e.index], {
+					HBadReasonName: e.retVal[0]['涓嶈壇鍘熷洜鍚嶇О'],
+					HBadReasonNumber: e.retVal[0]['涓嶈壇鍘熷洜浠ｇ爜'],
+					HBadReasonID: e.retVal[0]['HItemID']
+				})
 
-                this.$refs['listPopup'].exit()
+				this.$refs['listPopup'].exit()
 
-            },
-            //
-            async get_QC_TakeSampleCheckBillList() {
-                // 鍙栨牱鍗曟煡璇�
-                let HProcID = this.hform.HProcID;
-                let HProcExchInterId = this.hform.HProcExchInterID;
-                let sWhere = "";
+			},
+			//
+			async get_QC_TakeSampleCheckBillList() {
+				// 鍙栨牱鍗曟煡璇�
+				let HProcID = this.hform.HProcID;
+				let HProcExchInterId = this.hform.HProcExchInterID;
+				let sWhere = "";
 
-                if (HProcID == "0" || HProcID == "") {
-                    CommonUtils.showTips({
-                        message: "璇烽�夋嫨宸ュ簭",
-                    });
-                    return;
-                }
+				if (HProcID == "0" || HProcID == "") {
+					CommonUtils.showTips({
+						message: "璇烽�夋嫨宸ュ簭",
+					});
+					return;
+				}
 
-                sWhere = " and 宸ュ簭娴佽浆鍗′富鍐呯爜='" + HProcExchInterID + "' and HProcID=" + HProcID;
+				sWhere = " and 宸ュ簭娴佽浆鍗′富鍐呯爜='" + HProcExchInterID + "' and HProcID=" + HProcID;
 
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "//QC_TakeSampleCheckBill/QC_TakeSampleCheckBillMainList",
-                        data: {
-                            sWhere: sWhere,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "//QC_TakeSampleCheckBill/QC_TakeSampleCheckBillMainList",
+						data: {
+							sWhere: sWhere,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data;
-                    if (count != 1) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${Message}`,
-                        });
-                    }
+					let {
+						data,
+						count,
+						Message
+					} = res.data;
+					if (count != 1) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${Message}`,
+						});
+					}
 
-                    this.hform.HTakeSampleCheckBillID = data[0]["hmainid"];
-                    this.hform.HTakeSampleCheckBillNo = data[0]["鍗曟嵁鍙�"];
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${err}`,
-                    });
-                }
-            },
-            async get_ICMOBillStatusList() {
-                let sWhere = "";
-                let HProcID = this.hform.HProcID;
-                let HSourceID = this.hform.HSourceID;
-                let HProcExchInterId = this.hform.HProcExchInterID;
+					this.hform.HTakeSampleCheckBillID = data[0]["hmainid"];
+					this.hform.HTakeSampleCheckBillNo = data[0]["鍗曟嵁鍙�"];
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${err}`,
+					});
+				}
+			},
+			async get_ICMOBillStatusList() {
+				let sWhere = "";
+				let HProcID = this.hform.HProcID;
+				let HSourceID = this.hform.HSourceID;
+				let HProcExchInterId = this.hform.HProcExchInterID;
 
-                if (HProcID != "0") {
-                    sWhere += " and HProcID=" + HProcID;
-                }
-                if (HSourceID != "0") {
-                    sWhere += " and HSourceID=" + HSourceID;
-                }
+				if (HProcID != "0") {
+					sWhere += " and HProcID=" + HProcID;
+				}
+				if (HSourceID != "0") {
+					sWhere += " and HSourceID=" + HSourceID;
+				}
 
-                sWhere += " and HSourceInterID=" + HProcExchInterID;
+				sWhere += " and HSourceInterID=" + HProcExchInterID;
 
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/CheckBill/GetICMOBillStatusList",
-                        data: {
-                            sWhere: sWhere,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/CheckBill/GetICMOBillStatusList",
+						data: {
+							sWhere: sWhere,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data;
-                    if (count != 1) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${Message}`,
-                        });
-                    }
+					let {
+						data,
+						count,
+						Message
+					} = res.data;
+					if (count != 1) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${Message}`,
+						});
+					}
 
-                    this.hform.HProcID = data[0]["HProcID"];
-                    this.hform.HProcName = data[0]["宸ュ簭"];
-                    this.hform.HSourceID = data[0]["HSourceID"];
-                    this.hform.HSourceName = data[0]["鐢熶骇璧勬簮"];
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${err}`,
-                    });
-                }
-            },
-            setInspectValModule(checkItem) {
-                console.log("checkItem: ", checkItem);
-                if (!checkItem || !checkItem.HAnalysisMethod || !checkItem.HSampleSchemeID) {
-                    return;
-                }
-                // 鍖哄垎妫�楠屽�奸〉绛惧拰闈欐�侀〉绛撅紝妫�楠屽�奸〉绛剧殑id浠寮�澶�
-                this.$set(this.InspectModules, `_${checkItem.num}`, {
-                    id: `_${checkItem.num}`,
-                    checkItemId: checkItem.num,
-                });
-                console.log(" this.arrayAnalysisMethod: ", checkItem.HAnalysisMethod);
-                let analysisMethodName = this.arrayAnalysisMethod.find(
-                    (e) => e.value == checkItem.HAnalysisMethod
-                ).name;
-                this.$set(this.subTabs, `_${checkItem.num}`, {
-                    id: `_${checkItem.num}`,
-                    name: `${analysisMethodName}-${checkItem.HQCCheckItemName}`,
-                });
-            },
-            InspectValueUpdate(e) {
-                console.log("e: ", e);
-                let {
-                    data,
-                    list
-                } = e;
-                this.checkItems[data.num] = Object.assign(this.checkItems[data.num], data);
-                this.$set(this.InspectValues, `${data.num}`, list);
-            },
-            // 甯﹀嚭妫�楠岄」鐩�
-            async get_CheckItem() {
-                // 棣栧厛娓呯┖妫�楠岄」鐩� 鍜� 妫�楠屽��
-                this.checkItems = {}
-                for (let key in this.subTabs) {
-                    if (key.substring(1) == "_") {
-                        this.$delete(this.subTabs, key)
-                    }
-                }
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Web/GetCheckItemByCheckProjectID_Sec",
-                        data: {
-                            CheckProjectID: this.hform.HQCSchemeID || 0,
-                            HBatchQty: this.hform.HProcExchQty || 0,
-                            HMaterID: this.hform.HMaterID,
-                            HBillType: '鐢熶骇鍏ュ簱妫�鏂规'
-                        },
-                    });
+					this.hform.HProcID = data[0]["HProcID"];
+					this.hform.HProcName = data[0]["宸ュ簭"];
+					this.hform.HSourceID = data[0]["HSourceID"];
+					this.hform.HSourceName = data[0]["鐢熶骇璧勬簮"];
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${err}`,
+					});
+				}
+			},
+			setInspectValModule(checkItem) {
+				console.log("checkItem: ", checkItem);
+				if (!checkItem || !checkItem.HAnalysisMethod || !checkItem.HSampleSchemeID) {
+					return;
+				}
+				// 鍖哄垎妫�楠屽�奸〉绛惧拰闈欐�侀〉绛撅紝妫�楠屽�奸〉绛剧殑id浠寮�澶�
+				this.$set(this.InspectModules, `_${checkItem.num}`, {
+					id: `_${checkItem.num}`,
+					checkItemId: checkItem.num,
+				});
+				console.log(" this.arrayAnalysisMethod: ", checkItem.HAnalysisMethod);
+				let analysisMethodName = this.arrayAnalysisMethod.find(
+					(e) => e.value == checkItem.HAnalysisMethod
+				).name;
+				this.$set(this.subTabs, `_${checkItem.num}`, {
+					id: `_${checkItem.num}`,
+					name: `${analysisMethodName}-${checkItem.HQCCheckItemName}`,
+				});
+			},
+			InspectValueUpdate(e) {
+				console.log("e: ", e);
+				let {
+					data,
+					list
+				} = e;
+				this.checkItems[data.num] = Object.assign(this.checkItems[data.num], data);
+				this.$set(this.InspectValues, `${data.num}`, list);
+			},
+			// 甯﹀嚭妫�楠岄」鐩�
+			async get_CheckItem() {
+				// 棣栧厛娓呯┖妫�楠岄」鐩� 鍜� 妫�楠屽��
+				this.checkItems = {}
+				for (let key in this.subTabs) {
+					if (key.substring(1) == "_") {
+						this.$delete(this.subTabs, key)
+					}
+				}
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Web/GetCheckItemByCheckProjectID_Sec",
+						data: {
+							CheckProjectID: this.hform.HQCSchemeID || 0,
+							HBatchQty: this.hform.HProcExchQty || 0,
+							HMaterID: this.hform.HMaterID,
+							HBillType: '鐢熶骇鍏ュ簱妫�鏂规'
+						},
+					});
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data;
+					let {
+						data,
+						count,
+						Message
+					} = res.data;
 
-                    if (count == 1) {
-                        for (var i = 0; i < data.length; i++) {
-                            let checkItem = {
-                                HQCCheckItemID: data[i]["HQCCheckItemID"],
-                                HQCCheckItemNumber: data[i]["妫�楠岄」鐩唬鐮�"],
-                                HQCCheckItemName: data[i]["妫�楠岄」鐩�"],
-                                HInspectInstruMentID: data[i]["HInspectInstruMentID"],
-                                HInspectInstruMentNumber: data[i]["妫�楠屼华鍣ㄤ唬鐮�"],
-                                HInspectInstruMentName: data[i]["妫�楠屼华鍣�"],
-                                HQCStd: data[i]["HQCStd"],
-                                HUnit: data[i]["鍗曚綅鍚嶇О"],
-                                HQCNote: "",
-                                HAnalysisMethod: data[i]["鍒嗘瀽鏂规硶"],
-                                HResult: data[i]["榛樿缁撹"],
-                                HMax: "",
-                                HMin: "",
-                                HAvg: "",
-                                HRemark: "",
-                                HKeyInspect: data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false,
-                                HStatus: 0,
-                                HSampleSchemeID: data[i]["HSampleSchemeID"],
-                                HUnitID: data[i]["HUnitID"],
-                                HInspectVal: "",
-                                HTargetVal: "",
-                                HUpLimit: data[i].涓婇檺鍊�,
-                                HDownLimit: data[i].涓嬮檺鍊�,
-                                HUpOffSet: "",
-                                HDownOffSet: "",
-                                HSampleDamageQty: "0",
-                                HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
-                                HSampleQty: data[i].鏍锋湰閲�,
-                                HAcceptQty: data[i].鍏佽鏁�,
-                                HInspectionLevel: data[i].妫�楠屾按骞�,
-                                HRejectQty: data[i].鎷掔粷鏁�,
-                                HStrictness: data[i].涓ユ牸搴�,
-                                HSampleUnRightQty: 0,
-                                HAQL: data[i].AQL,
-                                HSamplingType: data[i].鎶芥牱绫诲瀷,
-                                HCompareSymbol: data[i].姣旇緝绗�,
-                                HTargetVal: data[i].鐩爣鍊� || 0,
-                            };
+					if (count == 1) {
+						for (var i = 0; i < data.length; i++) {
+							let checkItem = {
+								HQCCheckItemID: data[i]["HQCCheckItemID"],
+								HQCCheckItemNumber: data[i]["妫�楠岄」鐩唬鐮�"],
+								HQCCheckItemName: data[i]["妫�楠岄」鐩�"],
+								HInspectInstruMentID: data[i]["HInspectInstruMentID"],
+								HInspectInstruMentNumber: data[i]["妫�楠屼华鍣ㄤ唬鐮�"],
+								HInspectInstruMentName: data[i]["妫�楠屼华鍣�"],
+								HQCStd: data[i]["HQCStd"],
+								HUnit: data[i]["鍗曚綅鍚嶇О"],
+								HQCNote: "",
+								HAnalysisMethod: data[i]["鍒嗘瀽鏂规硶"],
+								HResult: data[i]["榛樿缁撹"],
+								HMax: "",
+								HMin: "",
+								HAvg: "",
+								HRemark: "",
+								HKeyInspect: data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false,
+								HStatus: 0,
+								HSampleSchemeID: data[i]["HSampleSchemeID"],
+								HUnitID: data[i]["HUnitID"],
+								HInspectVal: "",
+								HTargetVal: "",
+								HUpLimit: data[i].涓婇檺鍊�,
+								HDownLimit: data[i].涓嬮檺鍊�,
+								HUpOffSet: "",
+								HDownOffSet: "",
+								HSampleDamageQty: "0",
+								HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
+								HSampleQty: data[i].鏍锋湰閲�,
+								HAcceptQty: data[i].鍏佽鏁�,
+								HInspectionLevel: data[i].妫�楠屾按骞�,
+								HRejectQty: data[i].鎷掔粷鏁�,
+								HStrictness: data[i].涓ユ牸搴�,
+								HSampleUnRightQty: 0,
+								HAQL: data[i].AQL,
+								HSamplingType: data[i].鎶芥牱绫诲瀷,
+								HCompareSymbol: data[i].姣旇緝绗�,
+								HTargetVal: data[i].鐩爣鍊� || 0,
+							};
 
-                            this.addCheckItem(checkItem);
-                        }
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${Message} `,
-                        });
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${err} `,
-                    });
-                }
-            },
-            async getMaxBillNo() {
-                try {
-                    let res = await CommonUtils.doRequest2Sync({
-                        url: "/Web/GetMAXNum",
-                        data: {
-                            HBillType: "7501",
-                        },
-                    });
+							this.addCheckItem(checkItem);
+						}
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${Message} `,
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${err} `,
+					});
+				}
+			},
+			async getMaxBillNo() {
+				try {
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Web/GetMAXNum",
+						data: {
+							HBillType: "7501",
+						},
+					});
 
-                    if (!res) {
-                        return;
-                    }
+					if (!res) {
+						return;
+					}
 
-                    let {
-                        data,
-                        Message,
-                        count
-                    } = res.data;
-                    if (count == 1) {
-                        this.hform.HInterID = data[0].HInterID;
-                        this.hform.HBillNo = data[0].HBillNo;
-                    } else {
-                        throw Message;
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: "鑾峰彇鍗曟嵁鍙峰紓甯�: " + err,
-                    });
-                }
-            },
-            // 妫�楠屽�艰繑鍥炲��
-            InspectValueComplete(e) {
-                console.log("e: ", e);
-                let key = e.num;
-                e.HStatus = e.HStatus ? 1 : 0
-                if (e.HResult2 == '') {
-                    e.HResult2 = this.checkItems[key].HResult
-                }
-                Object.assign(this.checkItems[key], e);
-                this.checkItems[key].HInspectResultToSee = this.checkItems[key].HResult2;
-                this.checkItems[key].HResult = this.checkItems[key].HResult2 == '鍚堟牸' ? 1 : 2;
+					let {
+						data,
+						Message,
+						count
+					} = res.data;
+					if (count == 1) {
+						this.hform.HInterID = data[0].HInterID;
+						this.hform.HBillNo = data[0].HBillNo;
+					} else {
+						throw Message;
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鑾峰彇鍗曟嵁鍙峰紓甯�: " + err,
+					});
+				}
+			},
+			// 妫�楠屽�艰繑鍥炲��
+			InspectValueComplete(e) {
+				console.log("e: ", e);
+				let key = e.num;
+				e.HStatus = e.HStatus ? 1 : 0
+				if (e.HResult2 == '') {
+					e.HResult2 = this.checkItems[key].HResult
+				}
+				Object.assign(this.checkItems[key], e);
+				this.checkItems[key].HInspectResultToSee = this.checkItems[key].HResult2;
+				this.checkItems[key].HResult = this.checkItems[key].HResult2 == '鍚堟牸' ? 1 : 2;
 
-                this.HCheckLastResult();
+				this.HCheckLastResult();
 
-            },
-            checkSubmitValidate() {
-                // if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
-                // 	CommonUtils.showTips({
-                // 		message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
-                // 	});
-                // 	return false;
-                // }
+			},
+			checkSubmitValidate() {
+				// if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
+				// 	CommonUtils.showTips({
+				// 		message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
+				// 	});
+				// 	return false;
+				// }
 
-                if (this.hform.HFirstCheckEmp == 0) {
-                    CommonUtils.showTips({
-                        message: "妫�楠屽憳鏈�夋嫨锛�",
-                    });
-                    return false;
-                }
+				if (this.hform.HFirstCheckEmp == 0) {
+					CommonUtils.showTips({
+						message: "妫�楠屽憳鏈�夋嫨锛�",
+					});
+					return false;
+				}
 
-                for (let key in this.checkItems) {
-                    if (!this.checkItems[key].HQCCheckItemID) {
-                        CommonUtils.showTips({
-                            message: `绗�${this.checkItems[key].num}琛屾楠岄」鐩笉鑳戒负绌�!`,
-                        });
-                        return false;
-                    }
+				for (let key in this.checkItems) {
+					if (!this.checkItems[key].HQCCheckItemID) {
+						CommonUtils.showTips({
+							message: `绗�${this.checkItems[key].num}琛屾楠岄」鐩笉鑳戒负绌�!`,
+						});
+						return false;
+					}
 
-                    if (
-                        this.checkItems[key].HSampleSchemeID == "" ||
-                        this.checkItems[key].HSampleSchemeID == null
-                    ) {
-                        this.checkItems[key].HSampleSchemeID = 0;
-                    }
-                    if (
-                        this.checkItems[key].HSampleQty == "" ||
-                        this.checkItems[key].HSampleQty == null
-                    ) {
-                        this.checkItems[key].HSampleQty = 0;
-                    }
-                    if (
-                        this.checkItems[key].HSampleDamageQty == "" ||
-                        this.checkItems[key].HSampleDamageQty == null
-                    ) {
-                        this.checkItems[key].HSampleDamageQty = 0;
-                    }
-                    if (
-                        this.checkItems[key].HAcceptQty == "" ||
-                        this.checkItems[key].HAcceptQty == null
-                    ) {
-                        this.checkItems[key].HAcceptQty = 0;
-                    }
-                    if (
-                        this.checkItems[key].HRejectQty == "" ||
-                        this.checkItems[key].HRejectQty == null
-                    ) {
-                        this.checkItems[key].HRejectQty = 0;
-                    }
-                    if (
-                        this.checkItems[key].HSampleUnRightQty == "" ||
-                        this.checkItems[key].HSampleUnRightQty == 0
-                    ) {
-                        this.checkItems[key].HSampleUnRightQty = 0;
-                    }
-                    if (this.checkItems[key].HUnitID == "") {
-                        this.checkItems[key].HUnitID = 0;
-                    }
-                }
+					if (
+						this.checkItems[key].HSampleSchemeID == "" ||
+						this.checkItems[key].HSampleSchemeID == null
+					) {
+						this.checkItems[key].HSampleSchemeID = 0;
+					}
+					if (
+						this.checkItems[key].HSampleQty == "" ||
+						this.checkItems[key].HSampleQty == null
+					) {
+						this.checkItems[key].HSampleQty = 0;
+					}
+					if (
+						this.checkItems[key].HSampleDamageQty == "" ||
+						this.checkItems[key].HSampleDamageQty == null
+					) {
+						this.checkItems[key].HSampleDamageQty = 0;
+					}
+					if (
+						this.checkItems[key].HAcceptQty == "" ||
+						this.checkItems[key].HAcceptQty == null
+					) {
+						this.checkItems[key].HAcceptQty = 0;
+					}
+					if (
+						this.checkItems[key].HRejectQty == "" ||
+						this.checkItems[key].HRejectQty == null
+					) {
+						this.checkItems[key].HRejectQty = 0;
+					}
+					if (
+						this.checkItems[key].HSampleUnRightQty == "" ||
+						this.checkItems[key].HSampleUnRightQty == 0
+					) {
+						this.checkItems[key].HSampleUnRightQty = 0;
+					}
+					if (this.checkItems[key].HUnitID == "") {
+						this.checkItems[key].HUnitID = 0;
+					}
+				}
 
-                return true;
-            },
-            async submit() {
-                if (!this.checkSubmitValidate()) {
-                    return;
-                }
-                try {
-                    console.log('this.$refs: ', this.$refs);
-                    // 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
-                    if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules
-                        .length >
-                        0) {
-                        // 鍔犺浇鏈夋楠屽�兼ā鍧�
-                        await this.$refs.InspectValueModules[0].set_SaveValue();
-                        this.InspectValues[0] = this.$refs.InspectValueModules[0].InSpectValues;
-                        await this.InspectValueComplete(this.$refs.InspectValueModules[0].checkData)
-                    }
-                    let InspectValuesTrans = [];
-                    let HInterID = this.hform.HInterID;
-                    for (let key in this.InspectValues) {
-                        let HEntryID = key;
+				return true;
+			},
+			async submit() {
+				if (!this.checkSubmitValidate()) {
+					return;
+				}
+				try {
+					console.log('this.$refs: ', this.$refs);
+					// 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
+					if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules
+						.length >
+						0) {
+						// 鍔犺浇鏈夋楠屽�兼ā鍧�
+						await this.$refs.InspectValueModules[0].set_SaveValue();
+						this.InspectValues[0] = this.$refs.InspectValueModules[0].InSpectValues;
+						await this.InspectValueComplete(this.$refs.InspectValueModules[0].checkData)
+					}
+					let InspectValuesTrans = [];
+					let HInterID = this.hform.HInterID;
+					for (let key in this.InspectValues) {
+						let HEntryID = key;
 
-                        InspectValuesTrans.push(
-                            `${JSON.stringify(this.InspectValues[key])}`
-                        );
-                    }
-                    let checkItemsArray = [];
-                    for (var key in this.checkItems) {
-                        let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]))
-                        delete checkItem.data
-                        checkItemsArray.push(checkItem);
-                    }
-                    console.log('checkItemsArray: ', checkItemsArray);
-                    let sMainSub =
-                        `${JSON.stringify(this.hform)};${JSON.stringify(
+						InspectValuesTrans.push(
+							`${JSON.stringify(this.InspectValues[key])}`
+						);
+					}
+					let checkItemsArray = [];
+					for (var key in this.checkItems) {
+						let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]))
+						delete checkItem.data
+						checkItemsArray.push(checkItem);
+					}
+					console.log('checkItemsArray: ', checkItemsArray);
+					let sMainSub =
+						`${JSON.stringify(this.hform)};${JSON.stringify(
           checkItemsArray
         )};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0] || '[]'};${JSON.stringify(this.badReasons)}`;
-                    console.log("this.checkItems: ", this.checkItems);
+					console.log("this.checkItems: ", this.checkItems);
 
-                    let res = await CommonUtils.doRequest2Sync({
-                        url: "/QC_LastPieceCheckBill/set_SaveBill",
-                        data: {
-                            sMainSub: sMainSub,
-                        },
-                        method: "POST",
-                    });
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/QC_LastPieceCheckBill/set_SaveBill",
+						data: {
+							sMainSub: sMainSub,
+						},
+						method: "POST",
+					});
 
-                    if (!res) {
-                        return;
-                    }
+					if (!res) {
+						return;
+					}
 
-                    let {
-                        count,
-                        Message,
-                        data
-                    } = res.data;
-                    if (count == 1) {
-                        uni.showModal({
-                            title: "鎻愮ず",
-                            content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
-                            success: (res) => {
-                                if (res.confirm) {
-                                    console.log("鐢ㄦ埛鐐瑰嚮纭畾");
-                                    uni.redirectTo({
-                                        url: "/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2?operationType=1",
-                                    });
-                                } else if (res.cancel) {
-                                    console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
-                                    // setTimeout(() => {
-                                    //     uni.navigateBack();
-                                    // }, 50)
-                                }
-                            },
-                        });
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鐢熶骇鍏ュ簱鏍￠獙鍗曚繚瀛橀敊璇�: ${Message}`,
-                        });
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鐢熶骇鍏ュ簱鏍￠獙鍗曚繚瀛橀敊璇�: ${err}`,
-                    });
-                }
-            },
-            addNew() {
-                uni.redirectTo({
-                    url: "/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2?operationType=1",
-                });
-            },
-            goBack() {
-                uni.navigateBack();
-            },
-            async RoadBillMain() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBill_Edit",
-                        data: {
-                            sWhere: ` and hmainid=${this.hform.HInterID}`,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+					let {
+						count,
+						Message,
+						data
+					} = res.data;
+					if (count == 1) {
+						uni.showModal({
+							title: "鎻愮ず",
+							content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
+							success: (res) => {
+								if (res.confirm) {
+									console.log("鐢ㄦ埛鐐瑰嚮纭畾");
+									uni.redirectTo({
+										url: "/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2?operationType=1",
+									});
+								} else if (res.cancel) {
+									console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
+									// setTimeout(() => {
+									//     uni.navigateBack();
+									// }, 50)
+								}
+							},
+						});
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鐢熶骇鍏ュ簱鏍￠獙鍗曚繚瀛橀敊璇�: ${Message}`,
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鐢熶骇鍏ュ簱鏍￠獙鍗曚繚瀛橀敊璇�: ${err}`,
+					});
+				}
+			},
+			addNew() {
+				uni.redirectTo({
+					url: "/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2?operationType=1",
+				});
+			},
+			goBack() {
+				uni.navigateBack();
+			},
+			async RoadBillMain() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBill_Edit",
+						data: {
+							sWhere: ` and hmainid=${this.hform.HInterID}`,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data;
+					let {
+						data,
+						count,
+						Message
+					} = res.data;
 
-                    if (count == 1) {
-                        console.log("RoadBillMain: : ", data);
-                        Object.assign(this.hform, {
-                            HInterID: data[0].hmainid,
-                            HBillNo: data[0].鍗曟嵁鍙�,
-                            HDate: dayjs(data[0].鏃ユ湡).format("YYYY-MM-DD"),
-                            HSourceID: data[0].HSourceID,
-                            HSourceName: data[0].鐢熶骇璧勬簮鍚嶇О,
-                            HICMOBillNo: data[0].浠诲姟鍗曞彿,
-                            HICMOQty: data[0].浠诲姟鍗曟暟閲�,
-                            HICMOInterID: data[0].HICMOInterID,
-                            HICMOEntryID: data[0].HICMOEntryID || 1,
-                            HMaterID: data[0].HMaterID,
-                            HMaterName: data[0].鐗╂枡鍚嶇О,
-                            HMaterNumber: data[0].鐗╂枡浠ｇ爜,
-                            HProcID: data[0].HProcID,
-                            HProcName: data[0].HProcName,
-                            HProcExchQty: data[0].HProcExchQty || 0,
-                            HProcExchBillNo: data[0].HProcExchBillNo,
-                            HProcExchInterID: data[0].HProcExchInterID,
-                            HProcExchEntryID: data[0].HProcExchEntryID || 0,
-                            HFirstCheckEmp: data[0].HFirstCheckEmp,
-                            HFirstCheckEmpName: data[0].璐ㄦ鍛樺悕绉�,
-                            HQCSchemeID: data[0].妫�楠屾柟妗圛D,
-                            HQCSchemeName: data[0].妫�楠屾柟妗堝悕绉�,
-                            HRemark: data[0].琛ㄥご澶囨敞,
-                            HMaker: data[0].鍒跺崟浜�,
-                            HMakeDate: data[0].鍒跺崟鏃ユ湡,
-                            HChecker: data[0].瀹℃牳浜�,
-                            HCheckDate: data[0].瀹℃牳鏃ユ湡,
-                            HCloseMan: data[0].鍏抽棴浜�,
-                            HCloseDate: data[0].鍏抽棴鏃ユ湡,
-                            HUpDateDate: data[0].淇敼鏃ユ湡,
-                            HDeleteDate: data[0].浣滃簾鏃ユ湡,
-                            HSampleSchemeID: data[0].HSampleSchemeID,
-                            HSampleSchemeName: data[0].鎶芥牱鏂规鍚嶇О,
-                            HSampleQty: data[0].鏍锋湰閲�,
-                            HSampleQty2: data[0].鏍锋湰閲�,
-                            HSampleDamageQty: data[0].鏍锋湰鐮村潖鏁�,
-                            HSamplingType: data[0].鎶芥牱绫诲瀷,
-                            HAcceptQty: data[0].鍏佽鏁�,
-                            HInspectionLevel: data[0].妫�楠屾按骞�,
-                            HRejectQty: data[0].鎷掔粷鏁�,
-                            HStrictness: data[0].涓ユ牸搴�,
-                            HSampleUnRightQty: data[0].鏍锋湰涓嶅悎鏍兼暟 || 0,
-                            HSampleUnRightQty2: data[0].鏍锋湰涓嶅悎鏍兼暟,
-                            HAQL: data[0].AQL,
-                            HUnitID: data[0].HUnitID,
-                            HUnit: data[0].鍗曚綅,
-                            HInspectValB: data[0].妫�娴嬪�煎熀纭�璧勬枡,
-                            HInspectVal: data[0].妫�娴嬪��,
-                            HTargetValB: data[0].鐩爣鍊煎熀纭�璧勬枡,
-                            HTargetVal: data[0].鐩爣鍊�,
-                            HUpLimit: data[0].涓婇檺鍊�,
-                            HDownLimit: data[0].涓嬮檺鍊�,
-                            HUpOffSet: data[0].涓婂亸宸�,
-                            HDownOffSet: data[0].涓嬪亸宸�,
-                            HEntryID: data[0].hsubid,
-                            HQCCheckItemName: data[0].妫�楠岄」鐩悕绉�,
-                            HQCCheckItemID: data[0].HQCCheckItemID,
-                            HShiftsID: data[0].HShiftsID,
-                            HShiftsName: data[0].鐝鍚嶇О,
-                            HErrTreatment: data[0].寮傚父涓存椂澶勭悊鏂规,
-                            HBatchNo: data[0].鎵瑰彿,
-                            HLastResult: data[0].鍒ゅ畾缁撹 == "鍚堟牸" ? true : false,
-                            HTakeSampleCheckBillID: data[0].HTakeSampleCheckBillID,
-                            HTakeSampleCheckBillNo: data[0].HTakeSampleCheckBillNo,
-                            HAnalysisMethod: function() {
-                                if (data[0].HAnalysisMethod == 1) {
-                                    return '瀹氭�ф楠�'
-                                } else if (data[0].HAnalysisMethod == 2) {
-                                    return '瀹氶噺妫�楠�'
-                                } else {
-                                    return '鍏朵粬妫�楠�'
-                                }
-                            }(),
+					if (count == 1) {
+						console.log("RoadBillMain: : ", data);
+						Object.assign(this.hform, {
+							HInterID: data[0].hmainid,
+							HBillNo: data[0].鍗曟嵁鍙�,
+							HDate: dayjs(data[0].鏃ユ湡).format("YYYY-MM-DD"),
+							HSourceID: data[0].HSourceID,
+							HSourceName: data[0].鐢熶骇璧勬簮鍚嶇О,
+							HICMOBillNo: data[0].浠诲姟鍗曞彿,
+							HICMOQty: data[0].浠诲姟鍗曟暟閲�,
+							HICMOInterID: data[0].HICMOInterID,
+							HICMOEntryID: data[0].HICMOEntryID || 1,
+							HMaterID: data[0].HMaterID,
+							HMaterName: data[0].鐗╂枡鍚嶇О,
+							HMaterNumber: data[0].鐗╂枡浠ｇ爜,
+							HProcID: data[0].HProcID,
+							HProcName: data[0].HProcName,
+							HProcExchQty: data[0].HProcExchQty || 0,
+							HProcExchBillNo: data[0].HProcExchBillNo,
+							HProcExchInterID: data[0].HProcExchInterID,
+							HProcExchEntryID: data[0].HProcExchEntryID || 0,
+							HFirstCheckEmp: data[0].HFirstCheckEmp,
+							HFirstCheckEmpName: data[0].璐ㄦ鍛樺悕绉�,
+							HQCSchemeID: data[0].妫�楠屾柟妗圛D,
+							HQCSchemeName: data[0].妫�楠屾柟妗堝悕绉�,
+							HRemark: data[0].琛ㄥご澶囨敞,
+							HMaker: data[0].鍒跺崟浜�,
+							HMakeDate: data[0].鍒跺崟鏃ユ湡,
+							HChecker: data[0].瀹℃牳浜�,
+							HCheckDate: data[0].瀹℃牳鏃ユ湡,
+							HCloseMan: data[0].鍏抽棴浜�,
+							HCloseDate: data[0].鍏抽棴鏃ユ湡,
+							HUpDateDate: data[0].淇敼鏃ユ湡,
+							HDeleteDate: data[0].浣滃簾鏃ユ湡,
+							HSampleSchemeID: data[0].HSampleSchemeID,
+							HSampleSchemeName: data[0].鎶芥牱鏂规鍚嶇О,
+							HSampleQty: data[0].鏍锋湰閲�,
+							HSampleQty2: data[0].鏍锋湰閲�,
+							HSampleDamageQty: data[0].鏍锋湰鐮村潖鏁�,
+							HSamplingType: data[0].鎶芥牱绫诲瀷,
+							HAcceptQty: data[0].鍏佽鏁�,
+							HInspectionLevel: data[0].妫�楠屾按骞�,
+							HRejectQty: data[0].鎷掔粷鏁�,
+							HStrictness: data[0].涓ユ牸搴�,
+							HSampleUnRightQty: data[0].鏍锋湰涓嶅悎鏍兼暟 || 0,
+							HSampleUnRightQty2: data[0].鏍锋湰涓嶅悎鏍兼暟,
+							HAQL: data[0].AQL,
+							HUnitID: data[0].HUnitID,
+							HUnit: data[0].鍗曚綅,
+							HInspectValB: data[0].妫�娴嬪�煎熀纭�璧勬枡,
+							HInspectVal: data[0].妫�娴嬪��,
+							HTargetValB: data[0].鐩爣鍊煎熀纭�璧勬枡,
+							HTargetVal: data[0].鐩爣鍊�,
+							HUpLimit: data[0].涓婇檺鍊�,
+							HDownLimit: data[0].涓嬮檺鍊�,
+							HUpOffSet: data[0].涓婂亸宸�,
+							HDownOffSet: data[0].涓嬪亸宸�,
+							HEntryID: data[0].hsubid,
+							HQCCheckItemName: data[0].妫�楠岄」鐩悕绉�,
+							HQCCheckItemID: data[0].HQCCheckItemID,
+							HShiftsID: data[0].HShiftsID,
+							HShiftsName: data[0].鐝鍚嶇О,
+							HErrTreatment: data[0].寮傚父涓存椂澶勭悊鏂规,
+							HBatchNo: data[0].鎵瑰彿,
+							HLastResult: data[0].鍒ゅ畾缁撹 == "鍚堟牸" ? true : false,
+							HTakeSampleCheckBillID: data[0].HTakeSampleCheckBillID,
+							HTakeSampleCheckBillNo: data[0].HTakeSampleCheckBillNo,
+							HAnalysisMethod: function() {
+								if (data[0].HAnalysisMethod == 1) {
+									return '瀹氭�ф楠�'
+								} else if (data[0].HAnalysisMethod == 2) {
+									return '瀹氶噺妫�楠�'
+								} else {
+									return '鍏朵粬妫�楠�'
+								}
+							}(),
 
 
 
-                        });
+						});
 
-                        for (let i = 0; i < data.length; i++) {
-                            this.addCheckItem({
-                                HQCCheckItemID: data[i].HQCCheckItemID,
-                                HQCCheckItemNumber: data[i].妫�楠岄」鐩唬鐮�,
-                                HQCCheckItemName: data[i].妫�楠岄」鐩悕绉�,
-                                HInspectInstruMentID: data[i].HInspectInstruMentID,
-                                HInspectInstruMentNumber: data[i].妫�楠屼华鍣ㄤ唬鐮�,
-                                HInspectInstruMentName: data[i].妫�楠屼华鍣ㄥ悕绉�,
-                                HQCStd: data[i].妫�楠屾爣鍑�,
-                                HUnit: data[i].鍗曚綅鍚嶇О,
-                                HQCNote: data[i].妫�楠岃褰�,
-                                HResult: data[i].缁撹 == "鍚堟牸" ? 1 : 0,
-                                HMax: data[i].鏈�澶у��,
-                                HMin: data[i].鏈�灏忓��,
-                                HAvg: data[i].骞冲潎鍊�,
-                                HRemark: data[i].琛ㄤ綋澶囨敞,
-                                HAnalysisMethod: data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ?
-                                    1 : data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ?
-                                    2 : 3,
-                                HKeyInspect: data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
-                                HSampleSchemeID: data[i].HSampleSchemeID,
-                                HUnitID: data[i].HUnitID,
-                                HInspectVal: data[i].妫�娴嬪��,
-                                HTargetVal: data[i].鐩爣鍊�,
-                                HUpLimit: data[i].涓婇檺鍊�,
-                                HDownLimit: data[i].涓嬮檺鍊�,
-                                HUpOffSet: data[i].涓婂亸宸�,
-                                HDownOffSet: data[i].涓嬪亸宸�,
-                                HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
-                                HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
-                                HSampleQty: data[i].鏍锋湰閲�,
-                                HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
-                                HAcceptQty: data[i].鍏佽鏁�,
-                                HInspectionLevel: 0,
-                                HRejectQty: data[i].鎷掔粷鏁�,
-                                HStrictness: 0,
-                                HSampleUnRightQty: data[i].鏍锋湰涓嶅悎鏍兼暟,
-                                HAQL: data[i].AQL,
-                                HSamplingType: 0,
-                                HSamplingType: data[i].鎶芥牱绫诲瀷,
-                                HStrictness: data[i].涓ユ牸搴�,
-                                HInspectResultToSee: data[i].妫�楠岀粨鏋�
-                            });
+						for (let i = 0; i < data.length; i++) {
+							this.addCheckItem({
+								HQCCheckItemID: data[i].HQCCheckItemID,
+								HQCCheckItemNumber: data[i].妫�楠岄」鐩唬鐮�,
+								HQCCheckItemName: data[i].妫�楠岄」鐩悕绉�,
+								HInspectInstruMentID: data[i].HInspectInstruMentID,
+								HInspectInstruMentNumber: data[i].妫�楠屼华鍣ㄤ唬鐮�,
+								HInspectInstruMentName: data[i].妫�楠屼华鍣ㄥ悕绉�,
+								HQCStd: data[i].妫�楠屾爣鍑�,
+								HUnit: data[i].鍗曚綅鍚嶇О,
+								HQCNote: data[i].妫�楠岃褰�,
+								HResult: data[i].缁撹 == "鍚堟牸" ? 1 : 0,
+								HMax: data[i].鏈�澶у��,
+								HMin: data[i].鏈�灏忓��,
+								HAvg: data[i].骞冲潎鍊�,
+								HRemark: data[i].琛ㄤ綋澶囨敞,
+								HAnalysisMethod: data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ?
+									1 : data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ?
+									2 : 3,
+								HKeyInspect: data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
+								HSampleSchemeID: data[i].HSampleSchemeID,
+								HUnitID: data[i].HUnitID,
+								HInspectVal: data[i].妫�娴嬪��,
+								HTargetVal: data[i].鐩爣鍊�,
+								HUpLimit: data[i].涓婇檺鍊�,
+								HDownLimit: data[i].涓嬮檺鍊�,
+								HUpOffSet: data[i].涓婂亸宸�,
+								HDownOffSet: data[i].涓嬪亸宸�,
+								HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
+								HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
+								HSampleQty: data[i].鏍锋湰閲�,
+								HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
+								HAcceptQty: data[i].鍏佽鏁�,
+								HInspectionLevel: 0,
+								HRejectQty: data[i].鎷掔粷鏁�,
+								HStrictness: 0,
+								HSampleUnRightQty: data[i].鏍锋湰涓嶅悎鏍兼暟,
+								HAQL: data[i].AQL,
+								HSamplingType: 0,
+								HSamplingType: data[i].鎶芥牱绫诲瀷,
+								HStrictness: data[i].涓ユ牸搴�,
+								HInspectResultToSee: data[i].妫�楠岀粨鏋�
+							});
 
-                        }
+						}
 
-                        this.hasSourceBill = true
-                        let resBadReason = await CommonUtils.doRequest2Async({
-                            url: '/QC_LastPieceCheckBill_BadReason/getBadReasonList',
-                            data: {
-                                HInterID: data[0].hmainid,
-                                user: getUserInfo()["Czymc"],
-                            }
-                        })
+						this.hasSourceBill = true
+						let resBadReason = await CommonUtils.doRequest2Async({
+							url: '/QC_LastPieceCheckBill_BadReason/getBadReasonList',
+							data: {
+								HInterID: data[0].hmainid,
+								user: getUserInfo()["Czymc"],
+							}
+						})
 
-                        ({
-                            count,
-                            data
-                        } = resBadReason.data)
-                        if (count == 1) {
-                            this.badReasons.push(...data)
-                        }
+						({
+							count,
+							data
+						} = resBadReason.data)
+						if (count == 1) {
+							this.badReasons.push(...data)
+						}
 
-                        this.hasSourceBill = true
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鍔犺浇鍗曟嵁澶辫触: ${Message}`,
-                        });
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鍔犺浇鍗曟嵁澶辫触: ${err}`,
-                    });
-                }
-            },
-        },
-        async onLoad(e) {
-            this.operationType = e.operationType || 1;
-            this.hform.HInterID = e.linterid || 0;
-            if (this.operationType == 1) {
-                await this.getMaxBillNo();
-            } else if (this.operationType == 2) {
+						this.hasSourceBill = true
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鍔犺浇鍗曟嵁澶辫触: ${Message}`,
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鍔犺浇鍗曟嵁澶辫触: ${err}`,
+					});
+				}
+			},
+		},
+		async onLoad(e) {
+			this.operationType = e.operationType || 1;
+			this.hform.HInterID = e.linterid || 0;
+			if (this.operationType == 1) {
+				await this.getMaxBillNo();
+			} else if (this.operationType == 2) {
 
-            } else if (this.operationType == 3) {
-                await this.RoadBillMain();
-            }
-
-            await this.InitHSource();
-            await this.InitHWorkShift();
-            await this.InitHEmp();
-            await this.loadCache()
-        },
-    };
+			} else if (this.operationType == 3) {
+				await this.RoadBillMain();
+			}
+			if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
+				this.HSourceBillType = "宸ュ簭鍑虹珯姹囨姤鍗�"; // 鏄剧ず鍚嶇О
+				this.hform.HSourceBillType = "3791"; // 瀵瑰簲鐨勫��
+			}
+			await this.InitHSource();
+			await this.InitHWorkShift();
+			await this.InitHEmp();
+			await this.loadCache()
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-    input {
-        width: inherit;
-        font-size: 26rpx;
-    }
+	input {
+		width: inherit;
+		font-size: 26rpx;
+	}
 
-    .uni-input {
-        padding: 0;
-    }
+	.uni-input {
+		padding: 0;
+	}
 
-    .bill-main-tabs,
-    .bill-sub-tabs {
-        box-sizing: border-box;
-        width: 730rpx;
-        display: flex;
-        flex-direction: row;
-        flex-wrap: nowrap;
-        gap: 20rpx;
-        flex-shrink: 0;
-        overflow-x: auto;
-        border-bottom: 1px solid #ddd;
-        padding: 20rpx 10rpx;
-        white-space: nowrap;
+	.bill-main-tabs,
+	.bill-sub-tabs {
+		box-sizing: border-box;
+		width: 730rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		gap: 20rpx;
+		flex-shrink: 0;
+		overflow-x: auto;
+		border-bottom: 1px solid #ddd;
+		padding: 20rpx 10rpx;
+		white-space: nowrap;
 
-        view {
-            width: auto;
-            font-size: 26rpx;
-            color: #555;
-            text-align: center;
-            padding: 16rpx 0;
-        }
+		view {
+			width: auto;
+			font-size: 26rpx;
+			color: #555;
+			text-align: center;
+			padding: 16rpx 0;
+		}
 
-        .selected {
-            color: #3a78ff;
-            font-weight: bold;
-            border-bottom: 3px solid #3a78ff;
-        }
-    }
+		.selected {
+			color: #3a78ff;
+			font-weight: bold;
+			border-bottom: 3px solid #3a78ff;
+		}
+	}
 
-    .bill-main-content,
-    .bill-sub-content {
-        box-sizing: border-box;
-        padding: 0 30rpx 0 30rpx;
-        display: flex;
-        flex-direction: column;
+	.bill-main-content,
+	.bill-sub-content {
+		box-sizing: border-box;
+		padding: 0 30rpx 0 30rpx;
+		display: flex;
+		flex-direction: column;
 
-        .form-item {
-            width: 100%;
-            display: flex;
-            align-items: center;
-            font-size: 26rpx;
-            padding: 6rpx 0;
+		.form-item {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			font-size: 26rpx;
+			padding: 6rpx 0;
 
-            .left {
-                width: 208rpx;
+			.left {
+				width: 208rpx;
 
-                text {
-                    color: red;
-                    font-weight: bold;
-                }
-            }
+				text {
+					color: red;
+					font-weight: bold;
+				}
+			}
 
-            .right {
-                // width: 450rpx;
-                padding: 8rpx 20rpx;
-                font-size: 26rpx;
-                flex: 1;
-                border-radius: 22rpx;
-                border: 1px solid #acacac;
+			.right {
+				// width: 450rpx;
+				padding: 8rpx 20rpx;
+				font-size: 26rpx;
+				flex: 1;
+				border-radius: 22rpx;
+				border: 1px solid #acacac;
 
-                .uni-combox {
-                    padding: 0;
-                    height: auto;
+				.uni-combox {
+					padding: 0;
+					height: auto;
 
-                    .uni-input-placeholder,
-                    .uni-input-input {
-                        font-size: 26rpx;
-                    }
-                }
+					.uni-input-placeholder,
+					.uni-input-input {
+						font-size: 26rpx;
+					}
+				}
 
-                .uni-combox::v-deep input {
-                    height: inherit;
-                    font-size: 26rpx;
-                }
-            }
+				.uni-combox::v-deep input {
+					height: inherit;
+					font-size: 26rpx;
+				}
+			}
 
-            .disabled {
-                border: 1px solid #e4e4e4;
-                background-color: #e4e4e4;
-            }
+			.disabled {
+				border: 1px solid #e4e4e4;
+				background-color: #e4e4e4;
+			}
 
-            .none-border {
-                border: none;
-            }
-        }
-    }
+			.none-border {
+				border: none;
+			}
+		}
+	}
 
-    .bottom-btn {
-        box-sizing: border-box;
-        width: 100%;
-        height: 120rpx;
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        background-color: #fff;
-        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
-        padding: 30rpx 40rpx 40rpx 40rpx;
-        display: flex;
-        flex-direction: row;
-        gap: 10rpx;
+	.bottom-btn {
+		box-sizing: border-box;
+		width: 100%;
+		height: 120rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background-color: #fff;
+		box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+		padding: 30rpx 40rpx 40rpx 40rpx;
+		display: flex;
+		flex-direction: row;
+		gap: 10rpx;
 
-        button {
-            border-radius: 50rpx;
-            width: 180rpx;
-            height: 66rpx;
-            line-height: 66rpx;
-            font-size: 28rpx;
-        }
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
 
-        .btn-a {
-            background-color: #3a78ff;
-            color: #fff;
-        }
+		.btn-a {
+			background-color: #3a78ff;
+			color: #fff;
+		}
 
-        .btn-b {
-            background-color: #41a863;
-            color: #fff;
-        }
+		.btn-b {
+			background-color: #41a863;
+			color: #fff;
+		}
 
-        .btn-c {
-            background-color: #acacac;
-            color: #fff;
-            // position: absolute;
-            // right: 120rpx;
-        }
+		.btn-c {
+			background-color: #acacac;
+			color: #fff;
+			// position: absolute;
+			// right: 120rpx;
+		}
 
-        .btn-d {
-            background-color: #ff8901;
-            color: #fff;
-        }
-    }
+		.btn-d {
+			background-color: #ff8901;
+			color: #fff;
+		}
+	}
 
-    .buttons {
-        box-sizing: border-box;
-        width: 100%;
-        display: flex;
-        justify-content: center;
-        padding: 10rpx 0;
+	.buttons {
+		box-sizing: border-box;
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		padding: 10rpx 0;
 
-        button {
-            border-radius: 50rpx;
-            width: 180rpx;
-            height: 66rpx;
-            line-height: 66rpx;
-            font-size: 26rpx;
-        }
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 26rpx;
+		}
 
-        .btn-a {
-            background-color: #acacac;
-            color: #fff;
-        }
+		.btn-a {
+			background-color: #acacac;
+			color: #fff;
+		}
 
-        .btn-b {
-            background-color: #41a863;
-            color: #fff;
-        }
+		.btn-b {
+			background-color: #41a863;
+			color: #fff;
+		}
 
-        .btn-c {
-            background-color: #3a78ff;
-            color: #fff;
-        }
-    }
+		.btn-c {
+			background-color: #3a78ff;
+			color: #fff;
+		}
+	}
 
-    .list {
-        width: 100%;
+	.list {
+		width: 100%;
 
-        .card-detail {
-            width: 100%;
-            display: flex;
-            flex-wrap: wrap;
-            justify-content: space-between;
-            align-items: center;
-            line-height: 120%;
-            gap: 10rpx 0;
+		.card-detail {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			align-items: center;
+			line-height: 120%;
+			gap: 10rpx 0;
 
-            input {
-                font-size: 26rpx;
-            }
+			input {
+				font-size: 26rpx;
+			}
 
-            .detail {
-                // width: 50%;
-                box-sizing: border-box;
-                font-size: 26rpx;
-                color: #555;
-                padding-right: 20rpx;
+			.detail {
+				// width: 50%;
+				box-sizing: border-box;
+				font-size: 26rpx;
+				color: #555;
+				padding-right: 20rpx;
 
-                text {
-                    color: #999;
-                    font-size: 26rpx;
-                }
-            }
+				text {
+					color: #999;
+					font-size: 26rpx;
+				}
+			}
 
-            .editable {
-                width: 50%;
-                display: inline-flex;
-                flex-direction: row;
-                align-items: center;
+			.editable {
+				width: 50%;
+				display: inline-flex;
+				flex-direction: row;
+				align-items: center;
 
-                text {
-                    flex-shrink: 0;
-                }
+				text {
+					flex-shrink: 0;
+				}
 
-                .editable-input {
-                    border: 1px solid #acacac;
-                    border-radius: 5rpx;
-                    padding: 0 12rpx;
-                }
-            }
-        }
-    }
+				.editable-input {
+					border: 1px solid #acacac;
+					border-radius: 5rpx;
+					padding: 0 12rpx;
+				}
+			}
+		}
+	}
 
-    .icon-wrapper {
-        background-color: #3a78ff;
-        border-radius: 100%;
-        width: 40rpx;
-        height: 40rpx;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        flex-shrink: 0;
+	.icon-wrapper {
+		background-color: #3a78ff;
+		border-radius: 100%;
+		width: 40rpx;
+		height: 40rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-shrink: 0;
 
-        .uni-icons {
-            color: #fff !important;
-        }
-    }
+		.uni-icons {
+			color: #fff !important;
+		}
+	}
 
-    .icon-wrapper-big {
-        background-color: #3a78ff;
-        border-radius: 100%;
-        width: 50rpx;
-        height: 50rpx;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        flex-shrink: 0;
-        margin-left: 20rpx;
+	.icon-wrapper-big {
+		background-color: #3a78ff;
+		border-radius: 100%;
+		width: 50rpx;
+		height: 50rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-shrink: 0;
+		margin-left: 20rpx;
 
-        .uni-icons {
-            color: #fff !important;
-        }
-    }
+		.uni-icons {
+			color: #fff !important;
+		}
+	}
 
-    .more {
-        color: #888;
-        font-size: 22rpx;
-        display: flex;
-        border-top: 1px solid #eee;
-        padding-top: 10rpx;
+	.more {
+		color: #888;
+		font-size: 22rpx;
+		display: flex;
+		border-top: 1px solid #eee;
+		padding-top: 10rpx;
 
-        .part {
-            width: 100%;
-            text-align: center;
-        }
-    }
+		.part {
+			width: 100%;
+			text-align: center;
+		}
+	}
 
-    .pass-background {
-        background-color: #cee3f2;
-        border: none;
-    }
+	.pass-background {
+		background-color: #cee3f2;
+		border: none;
+	}
 
-    .unpass-background {
-        background-color: #f0d6e3;
-        border: none;
-    }
+	.unpass-background {
+		background-color: #f0d6e3;
+		border: none;
+	}
 
-    .enable-icon-button {
-        background-color: #3a78ff;
-        padding: 6rpx;
-        color: #fff;
-        border-radius: 100%;
-    }
+	.enable-icon-button {
+		background-color: #3a78ff;
+		padding: 6rpx;
+		color: #fff;
+		border-radius: 100%;
+	}
 
-    .disable-icon-button {
-        background-color: lightgray;
-        padding: 6rpx;
-        color: #fff;
-        border-radius: 100%;
-        pointer-events: none;
-    }
+	.disable-icon-button {
+		background-color: lightgray;
+		padding: 6rpx;
+		color: #fff;
+		border-radius: 100%;
+		pointer-events: none;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
index 0e9ca6a..c5f936a 100644
--- a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
+++ b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -1,2397 +1,2553 @@
 <template>
-    <view>
-        <!-- 涓昏〃鍖哄煙 -->
-        <view class="bill-main-area">
-            <!-- 涓昏〃椤电 -->
-            <view class="bill-main-tabs">
-                <view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">鍩烘湰淇℃伅</view>
-                <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍏朵粬淇℃伅</view>
-                <view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">鍒跺崟淇℃伅</view>
-            </view>
-            <!-- 涓昏〃鍐呭 -->
-            <view class="bill-main-contents">
-                <!-- 鍩烘湰淇℃伅 -->
-                <view class="bill-main-content" v-if="mainTabSelected == 1">
-                    <view class="form-item">
-                        <view class="left">鍗曟嵁鍙�</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HBillNo" disabled />
-                        </view>
-                    </view>
-
-                    <view class="form-item">
-                        <view class="left">鏃ユ湡</view>
-                        <view class="right">
-                            <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HDate">
-                                <view>{{ hform.HDate }}</view>
-                            </uni-datetime-picker>
-                        </view>
-                    </view>
-<view class="form-item">
-                        <view class="left">婧愬崟鍗曞彿</view>
-                        <view class="right" :class="!hasSourceBill?'':'disabled'">
-                            <input type="text" :disabled="hasSourceBill" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�"
-                                v-model="hform.HSourceBillNo" @confirm="getSourceBillInfo(hform.HSourceBillNo)" />
-                        </view>
-                        <view class="icon-wrapper-big">
-                            <uni-icons class="right-icon" type="scan"
-                                :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
-                                :disabled="hasSourceBill" size="20" @click="toScanCode"></uni-icons>
-                        </view>
-						<view class="icon-wrapper-big">
-						    <uni-icons class="right-icon" type="search"
-						        :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
-						        :disabled="hasSourceBill" size="20" @click="toBillSelector"></uni-icons>
-						</view>
-                    </view>
-                    
-                    <view class="form-item">
-                        <view class="left">浠诲姟鍗曞彿</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HICMOBillNo" disabled />
-                        </view>
-                        <view class="icon-wrapper-big"><uni-icons type="search" size="20"
-							:class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
-							:disabled="hasSourceBill"
-                                @click="showSelectorModule(hform, 5)"></uni-icons></view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">娴佽浆鍗″彿</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HProcExchBillNo" disabled />
-                        </view>
-                        <view class="icon-wrapper-big"><uni-icons type="search" size="20"
-                                :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
-                                :disabled="hasSourceBill"@click="showSelectorModule(hform, 6)"></uni-icons></view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">浜у搧浠ｇ爜</view>
-                        <view class="right disabled">
-                            <input type="text" disabled :value="hform.HMaterNumber" />
-                        </view>
-                        <view class="icon-wrapper-big">
-                            <uni-icons type="search" size="20":class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
-                                :disabled="hasSourceBill" @click="showSelectorModule(hform, 4)"></uni-icons>
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">浜у搧鍚嶇О</view>
-                        <view class="right disabled">
-                            <input type="text" disabled :value="hform.HMaterName" />
-                        </view>
-                    </view>
+	<view>
+		<!-- 涓昏〃鍖哄煙 -->
+		<view class="bill-main-area">
+			<!-- 涓昏〃椤电 -->
+			<view class="bill-main-tabs">
+				<view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">鍩烘湰淇℃伅</view>
+				<view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍏朵粬淇℃伅</view>
+				<view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">鍒跺崟淇℃伅</view>
+			</view>
+			<!-- 涓昏〃鍐呭 -->
+			<view class="bill-main-contents">
+				<!-- 鍩烘湰淇℃伅 -->
+				<view class="bill-main-content" v-if="mainTabSelected == 1">
 					<view class="form-item">
-					    <view class="left">妫�楠屾暟閲�</view>
-					    <view class="right">
-					        <input type="number" v-model="hform.HCheckQty" />
-					    </view>
+						<view class="left">鍗曟嵁鍙�</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HBillNo" disabled />
+						</view>
 					</view>
-                    <view class="form-item">
-                        <view class="left">妫�楠屽憳</view>
-                        <view class="right">
-                            <uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="璇烽�夋嫨妫�楠屽憳"
-                                v-model="hform.HFirstCheckEmpName"
-                                @update:modelValue="HFirstCheckEmpChange"></uni-combox>
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">妫�楠屾柟妗�</view>
-                        <view class="right disabled">
-                            <input type="text" disabled :value="this.hform.HQCSchemeName" />
-                        </view>
-                        <view class="icon-wrapper-big"><uni-icons type="search" size="20"
-                                @click="showSelectorModule(hform, 7)"></uni-icons></view>
-                    </view>
-                    
-                    <view class="form-item">
-                        <view class="left">鍒ゆ柇缁撹</view>
-                        <view class="right none-border">
-                            <radio-group @changer="checkResultChange">
-                                <label>
-                                    <radio value="0" :checked="hform.HLastResult" /><text></text>
-                                    鍚堟牸
-                                </label>
-                                <view style="width: 20rpx; display: inline-block"></view>
-                                <label>
-                                    <radio value="1" :checked="!hform.HLastResult" /><text></text>
-                                    涓嶅悎鏍�
-                                </label>
-                            </radio-group>
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">宸ュ簭</view>
-                        <view class="right disabled">
-                            <input type="text" disabled :value="hform.HProcName" />
-                        </view>
-                        <view class="icon-wrapper-big"><uni-icons type="search" size="20"
-                                :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
-                                :disabled="hasSourceBill"@click="showSelectorModule(hform, 8)"></uni-icons></view>
-                    </view>
-                    
-                </view>
-                <!-- 鍏朵粬淇℃伅 -->
-                <view class="bill-main-content" v-if="mainTabSelected == 2">
-                    <view class="form-item">
-                        <view class="left">婧愬崟绫诲瀷</view>
-                        <view class="right" style="position: relative" :class="!hasSourceBill?'':'disabled'">
-                            <picker mode="selector" :range="HSourceBillTypeNameList" :disabled="hasSourceBill"
-                                @change="HSourceBillTypeNameChange">
-                                <input type="text" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" v-model="HSourceBillType" />
-                                <view class="picker-overlay"></view>
-                            </picker>
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">鐢熶骇璧勬簮</view>
-                        <view class="right">
-                            <uni-combox :candidates="GySourceNameList" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
-                                @update:modelValue="HSourceChange"></uni-combox>
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">鐢熶骇鐝</view>
-                        <view class="right">
-                            <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
-                                v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
-                        </view>
-                    </view>
-                    <!-- <view class="form-item">
-                        <view class="left">鐢熶骇鐝</view>
-                        <view class="right">
-                            <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
-                                v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
-                        </view>
-                    </view> -->
-                    <view class="form-item">
-                        <view class="left">寮傚父涓存椂澶勭悊鏂规</view>
-                        <view class="right">
-                            <input type="text" v-model="hform.HErrTreatment" value="" />
-                        </view>
-                    </view>
-                    <!-- <view class="form-item">
+
+					<view class="form-item">
+						<view class="left">鏃ユ湡</view>
+						<view class="right">
+							<uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HDate">
+								<view>{{ hform.HDate }}</view>
+							</uni-datetime-picker>
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">婧愬崟鍗曞彿</view>
+						<view class="right" :class="!hasSourceBill?'':'disabled'">
+							<input type="text" :disabled="hasSourceBill" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�"
+								v-model="hform.HSourceBillNo" @confirm="getSourceBillInfo(hform.HSourceBillNo)" />
+						</view>
+						<view class="icon-wrapper-big">
+							<uni-icons class="right-icon" type="scan"
+								:class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+								:disabled="hasSourceBill" size="20" @click="toScanCode"></uni-icons>
+						</view>
+						<view class="icon-wrapper-big">
+							<uni-icons class="right-icon" type="search"
+								:class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+								:disabled="hasSourceBill" size="20" @click="toBillSelector"></uni-icons>
+						</view>
+					</view>
+
+					<view class="form-item">
+						<view class="left">浠诲姟鍗曞彿</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HICMOBillNo" disabled />
+						</view>
+						<view class="icon-wrapper-big"><uni-icons type="search" size="20"
+								:class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+								:disabled="hasSourceBill" @click="showSelectorModule(hform, 5)"></uni-icons></view>
+					</view>
+					<view class="form-item">
+						<view class="left">娴佽浆鍗″彿</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HProcExchBillNo" disabled />
+						</view>
+						<view class="icon-wrapper-big"><uni-icons type="search" size="20"
+								:class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+								:disabled="hasSourceBill" @click="showSelectorModule(hform, 6)"></uni-icons></view>
+					</view>
+					<view class="form-item">
+						<view class="left">鍙栨牱鍗曞彿</view>
+						<view class="right disabled">
+							<input type="text" disabled :value="hform.HTakeSampleCheckBillNo" />
+							<input type="text" style="display: none;" disabled :value="hform.HTakeSampleCheckBillID" />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">浜у搧浠ｇ爜</view>
+						<view class="right disabled">
+							<input type="text" disabled :value="hform.HMaterNumber" />
+						</view>
+						<view class="icon-wrapper-big">
+							<uni-icons type="search" size="20"
+								:class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+								:disabled="hasSourceBill" @click="showSelectorModule(hform, 4)"></uni-icons>
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">浜у搧鍚嶇О</view>
+						<view class="right disabled">
+							<input type="text" disabled :value="hform.HMaterName" />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">妫�楠屾暟閲�</view>
+						<view class="right">
+							<input type="number" v-model="hform.HCheckQty" />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">妫�楠屽憳</view>
+						<view class="right">
+							<uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="璇烽�夋嫨妫�楠屽憳"
+								v-model="hform.HFirstCheckEmpName"
+								@update:modelValue="HFirstCheckEmpChange"></uni-combox>
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">妫�楠屾柟妗�</view>
+						<view class="right disabled">
+							<input type="text" disabled :value="this.hform.HQCSchemeName" />
+						</view>
+						<view class="icon-wrapper-big"><uni-icons type="search" size="20"
+								@click="showSelectorModule(hform, 7)"></uni-icons></view>
+					</view>
+
+					<view class="form-item">
+						<view class="left">鍒ゆ柇缁撹</view>
+						<view class="right none-border">
+							<radio-group @changer="checkResultChange">
+								<label>
+									<radio value="0" :checked="hform.HLastResult" /><text></text>
+									鍚堟牸
+								</label>
+								<view style="width: 20rpx; display: inline-block"></view>
+								<label>
+									<radio value="1" :checked="!hform.HLastResult" /><text></text>
+									涓嶅悎鏍�
+								</label>
+							</radio-group>
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">宸ュ簭</view>
+						<view class="right disabled">
+							<input type="text" disabled :value="hform.HProcName" />
+						</view>
+						<view class="icon-wrapper-big"><uni-icons type="search" size="20"
+								:class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+								:disabled="hasSourceBill" @click="showSelectorModule(hform, 8)"></uni-icons></view>
+					</view>
+
+				</view>
+				<!-- 鍏朵粬淇℃伅 -->
+				<view class="bill-main-content" v-if="mainTabSelected == 2">
+					<view class="form-item">
+						<view class="left">婧愬崟绫诲瀷</view>
+						<view class="right" style="position: relative" :class="!hasSourceBill?'':'disabled'">
+							<picker mode="selector" :range="HSourceBillTypeNameList" :disabled="hasSourceBill"
+								@change="HSourceBillTypeNameChange">
+								<input type="text" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" v-model="HSourceBillType" />
+								<view class="picker-overlay"></view>
+							</picker>
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">鐢熶骇璧勬簮</view>
+						<view class="right">
+							<uni-combox :candidates="GySourceNameList" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
+								@update:modelValue="HSourceChange"></uni-combox>
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">鐢熶骇鐝</view>
+						<view class="right">
+							<uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
+								v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">寮傚父涓存椂澶勭悊鏂规</view>
+						<view class="right">
+							<input type="text" v-model="hform.HErrTreatment" value="" />
+						</view>
+					</view>
+					<!-- <view class="form-item">
                         <view class="left">浠诲姟鍗曟暟閲�</view>
                         <view class="right">
                             <input type="number" v-model="hform.HICMOQty" />
                         </view>
                     </view> -->
-                    <view class="form-item">
-                        <view class="left">娴佽浆鍗℃暟閲�</view>
-                        <view class="right">
-                            <input type="number" v-model="hform.HProcExchQty" />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">鎵瑰彿</view>
-                        <view class="right">
-                            <input type="text" v-model="hform.HBatchNo" />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">澶囨敞</view>
-                        <view class="right">
-                            <input type="text" v-model="hform.HRemark" value="" />
-                        </view>
-                    </view>
-                </view>
-                <!-- 鍒跺崟淇℃伅 -->
-                <view class="bill-main-content" v-if="mainTabSelected == 3">
-                    <view class="form-item">
-                        <view class="left">鍒跺崟浜�</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HMaker" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">鍒跺崟鏃ユ湡</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HMakeDate" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">瀹℃牳浜�</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HChecker" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">瀹℃牳鏃ユ湡</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HCheckDate" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">鍏抽棴浜�</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HCloseMan" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">鍏抽棴鏃ユ湡</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HCloseDate" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">淇敼浜�</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HUpDater" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">淇敼鏃ユ湡</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HUpDateDate" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">浣滃簾浜�</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HDeleteMan" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">浣滃簾鏃ユ湡</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HDeleteDate" disabled />
-                        </view>
-                    </view>
-                </view>
+					<view class="form-item">
+						<view class="left">娴佽浆鍗℃暟閲�</view>
+						<view class="right">
+							<input type="number" v-model="hform.HProcExchQty" />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">鎵瑰彿</view>
+						<view class="right">
+							<input type="text" v-model="hform.HBatchNo" />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">澶囨敞</view>
+						<view class="right">
+							<input type="text" v-model="hform.HRemark" value="" />
+						</view>
+					</view>
+				</view>
+				<!-- 鍒跺崟淇℃伅 -->
+				<view class="bill-main-content" v-if="mainTabSelected == 3">
+					<view class="form-item">
+						<view class="left">鍒跺崟浜�</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HMaker" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">鍒跺崟鏃ユ湡</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HMakeDate" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">瀹℃牳浜�</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HChecker" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">瀹℃牳鏃ユ湡</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HCheckDate" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">鍏抽棴浜�</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HCloseMan" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">鍏抽棴鏃ユ湡</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HCloseDate" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">淇敼浜�</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HUpDater" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">淇敼鏃ユ湡</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HUpDateDate" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">浣滃簾浜�</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HDeleteMan" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">浣滃簾鏃ユ湡</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HDeleteDate" disabled />
+						</view>
+					</view>
+				</view>
 
-            </view>
-        </view>
-        <!-- 瀛愯〃鍖哄煙 -->
-        <view class="bill-sub-area">
-            <!-- 瀛愯〃椤电 -->
-            <view class="bill-sub-tabs">
-                <view v-for="subTab in subTabs" :key="subTab.id" :class="subTab.id == subTabSelected ? 'selected' : ''"
-                    @tap="subTabSelected = subTab.id">{{ subTab.name }}</view>
-            </view>
-            <!-- 瀛愯〃鍐呭 -->
-            <view class="bill-main-contents">
-                <!-- 妫�楠岄」鐩� 鍛堢幇 -->
-                <view v-if="subTabSelected == 1">
-                    <!-- 闇�閫氳繃鏄惧紡璋冪敤蹇界暐$event鍙傛暟 -->
-                    <view class="buttons" @tap="addCheckItem()">
-                        <uni-icons type="plus" style="margin-right: 10rpx" size="22"></uni-icons>鏂板
-                    </view>
-                    <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
-                    <view class="list" v-else>
-                        <uni-card v-for="checkItem in checkItems" :key="checkItem.num">
-                            <view class="card-detail">
-                                <view class="detail"> <text>搴忓彿锛�</text>{{ checkItem.num }} </view>
-                                <view class="detail editable">
-                                    <view style="flex-shrink: 0"><text>妫�楠岄」鐩細</text></view>
-                                    <input type="text" :value="checkItem.HQCCheckItemName" disabled="" />
-                                    <view class="icon-wrapper"><uni-icons type="search" size="16"
-                                            @click="showSelectorModule(checkItem, 2)"></uni-icons></view>
-                                </view>
-                                <view class="detail editable">
-                                    <view style="flex-shrink: 0"><text>妫�楠屼华鍣細</text></view>
-                                    <input type="text" :value="checkItem.HInspectInstruMentName" disabled="" />
-                                    <view class="icon-wrapper"><uni-icons type="search" size="16"
-                                            @click="showSelectorModule(checkItem, 3)"></uni-icons></view>
-                                </view>
-                                <view class="detail editable">
-                                    <view><text>缁撹锛�</text></view>
-                                    <view style="width: 4em">
-                                        {{ checkItem.HResult == 1 ? "鍚堟牸" : "涓嶅悎鏍�" }}
-                                    </view>
-                                    <view>
-                                        <switch style="width: 2em; transform: scale(0.7)"
-                                            :checked="checkItem.HResult == 1"
-                                            @change="HResultChange(checkItem.num, $event)" />
-                                    </view>
-                                </view>
-                                <view class="detail editable" style="position: relative">
-                                    <view style="flex-shrink: 0"><text>鍒嗘瀽鏂规硶锛�</text></view>
-                                    <picker :range="arrayAnalysisMethod" range-key="name"
-                                        @change="HAnalysisMethodChange(checkItem.num, $event)">
-                                        <input disabled :value="getAnalysisMethodDisplay(checkItem.HAnalysisMethod)"
-                                            placeholder="璇烽�夋嫨" />
-                                        <view class="picker-overlay"></view>
-                                    </picker>
-                                </view>
-                                <view class="detail editable">
-                                    <view style="flex-shrink: 0"><text>閲嶇偣妫�鏌ワ細</text></view>
-                                    <view>
-                                        <switch type="checkbox" style="transform: scale(0.7)"
-                                            :checked="checkItem.HKeyInspect"
-                                            @change="HKeyInspectChange(checkItem, $event)" />
-                                    </view>
-                                </view>
-                                <view class="detail" v-if="checkItem.HQCStd">
-                                    <text>妫�楠屾爣鍑嗭細</text>{{ checkItem.HQCStd }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HUnit">
-                                    <text>鍗曚綅锛�</text>{{ checkItem.HUnit }}
-                                </view>
-                                <!-- 鍙湁瀹氶噺鍒嗘瀽鎵嶅惎鐢ㄦ楠屽�� -->
-                                <view class="detail editable" v-show="checkItem.HAnalysisMethod == 2"> 
-                                    <text>妫�楠屽�硷細</text>
-                                    <input type="text" class="editable-input" @blur="calcHResult(checkItem)" v-model="checkItem.HInspectValQ" />
-                                    
-                                </view>
-                                <view class="detail" v-if="checkItem.HQCNote">
-                                    <text>妫�楠岃褰曪細</text>{{ checkItem.HQCNote }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HTargetVal">
-                                    <text>鐩爣鍊硷細</text>{{ checkItem.HTargetVal }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HUpLimit">
-                                    <text>涓婇檺鍊硷細</text>{{ checkItem.HUpLimit }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HDownLimit">
-                                    <text>涓嬮檺鍊硷細</text>{{ checkItem.HDownLimit }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HMax">
-                                    <text>鏈�澶у�硷細</text>{{ checkItem.HMax }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HMin">
-                                    <text>鏈�灏忓�硷細</text>{{ checkItem.HMin }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HAvg">
-                                    <text>骞冲潎鍊硷細</text>{{ checkItem.HAvg }}
-                                </view>
-                            </view>
-                            <view style="height: 20rpx"></view>
-                            <view class="more">
-                                <view class="part" style="color: #da0000" @tap.stop="removeCheckItem(checkItem)">
-                                    <uni-icons type="trash" style="color: #da0000; margin-right: 10rpx"
-                                        size="18"></uni-icons>鍒犻櫎
-                                </view>
-                            </view>
-                        </uni-card>
-                    </view>
-                </view>
-                <!-- 鎶芥牱妫�楠� 鍛堢幇 -->
-                <view v-if="subTabSelected == 2">
-                    <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
-                    <view class="list" v-else>
-                        <uni-card v-for="SamplingItem in checkItems" :key="SamplingItem.num">
-                            <view class="card-detail">
-                                <view class="detail"> <text>搴忓彿锛�</text>{{ SamplingItem.num }} </view>
-                                <view class="detail editable">
-                                    <text>妫�楠岄」鐩細</text>{{ SamplingItem.HQCCheckItemName }}
-                                </view>
-                                <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
-                                <view class="detail editable" style="width: 100%">
-                                    <view style="flex-shrink: 0"><text>鎶芥牱鏂规锛�</text></view>
-                                    <input type="text" :value="SamplingItem.HSampleSchemeName" disabled />
-                                    <view class="icon-wrapper"><uni-icons type="search" size="16"
-                                            @click="showSelectorModule(SamplingItem, 1)"></uni-icons></view>
-                                </view>
-                                <view class="detail editable">
-                                    <text>鎶芥牱绫诲瀷锛�</text>{{ SamplingItem.HSamplingType }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>妫�楠屾按骞筹細</text>{{ SamplingItem.HInspectionLevel }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>涓ユ牸搴︼細</text>{{ SamplingItem.HStrictness }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>AQL锛�</text>{{ SamplingItem.HAQL }}
-                                </view>
-                                <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
-                                <view class="detail editable">
-                                    <text>鏍锋湰閲忥細</text>{{ SamplingItem.HSampleQty }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>鍏佽鏁帮細</text>{{ SamplingItem.HAcceptQty }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>鎷掔粷鏁帮細</text>{{ SamplingItem.HRejectQty }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>鏍锋湰涓嶅悎鏍兼暟锛�</text>{{ SamplingItem.HSampleUnRightQty }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>鏍锋湰鐮村潖鏁帮細</text>
-                                    <view class="editable-input">
-                                        <input type="number" v-model="SamplingItem.HSampleDamageQty" />
-                                    </view>
-                                </view>
-                                <view class="detail editable">
-                                    <text>妫�楠岀粨鏋滐細</text>
-                                    <view style="border-radius: 15%; padding: 0 10rpx" :class="
+			</view>
+		</view>
+		<!-- 瀛愯〃鍖哄煙 -->
+		<view class="bill-sub-area">
+			<!-- 瀛愯〃椤电 -->
+			<view class="bill-sub-tabs">
+				<view v-for="subTab in subTabs" :key="subTab.id" :class="subTab.id == subTabSelected ? 'selected' : ''"
+					@tap="subTabSelected = subTab.id">{{ subTab.name }}</view>
+			</view>
+			<!-- 瀛愯〃鍐呭 -->
+			<view class="bill-main-contents">
+				<!-- 妫�楠岄」鐩� 鍛堢幇 -->
+				<view v-if="subTabSelected == 1">
+					<!-- 闇�閫氳繃鏄惧紡璋冪敤蹇界暐$event鍙傛暟 -->
+					<view class="buttons" @tap="addCheckItem()">
+						<uni-icons type="plus" style="margin-right: 10rpx" size="22"></uni-icons>鏂板
+					</view>
+					<view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
+					<view class="list" v-else>
+						<uni-card v-for="checkItem in checkItems" :key="checkItem.num">
+							<view class="card-detail">
+								<view class="detail"> <text>搴忓彿锛�</text>{{ checkItem.num }} </view>
+								<view class="detail editable">
+									<view style="flex-shrink: 0"><text>妫�楠岄」鐩細</text></view>
+									<input type="text" :value="checkItem.HQCCheckItemName" disabled="" />
+									<view class="icon-wrapper"><uni-icons type="search" size="16"
+											@click="showSelectorModule(checkItem, 2)"></uni-icons></view>
+								</view>
+								<view class="detail editable">
+									<view style="flex-shrink: 0"><text>妫�楠屼华鍣細</text></view>
+									<input type="text" :value="checkItem.HInspectInstruMentName" disabled="" />
+									<view class="icon-wrapper"><uni-icons type="search" size="16"
+											@click="showSelectorModule(checkItem, 3)"></uni-icons></view>
+								</view>
+								<view class="detail editable">
+									<view><text>缁撹锛�</text></view>
+									<view style="width: 4em">
+										{{ checkItem.HResult == 1 ? "鍚堟牸" : "涓嶅悎鏍�" }}
+									</view>
+									<view>
+										<switch style="width: 2em; transform: scale(0.7)"
+											:checked="checkItem.HResult == 1"
+											@change="HResultChange(checkItem.num, $event)" />
+									</view>
+								</view>
+								<view class="detail editable" style="position: relative">
+									<view style="flex-shrink: 0"><text>鍒嗘瀽鏂规硶锛�</text></view>
+									<picker :range="arrayAnalysisMethod" range-key="name"
+										@change="HAnalysisMethodChange(checkItem.num, $event)">
+										<input disabled :value="getAnalysisMethodDisplay(checkItem.HAnalysisMethod)"
+											placeholder="璇烽�夋嫨" />
+										<view class="picker-overlay"></view>
+									</picker>
+								</view>
+								<view class="detail editable">
+									<view style="flex-shrink: 0"><text>閲嶇偣妫�鏌ワ細</text></view>
+									<view>
+										<switch type="checkbox" style="transform: scale(0.7)"
+											:checked="checkItem.HKeyInspect"
+											@change="HKeyInspectChange(checkItem, $event)" />
+									</view>
+								</view>
+								<view class="detail" v-if="checkItem.HQCStd">
+									<text>妫�楠屾爣鍑嗭細</text>{{ checkItem.HQCStd }}
+								</view>
+								<view class="detail" v-if="checkItem.HUnit">
+									<text>鍗曚綅锛�</text>{{ checkItem.HUnit }}
+								</view>
+								<!-- 鍙湁瀹氶噺鍒嗘瀽鎵嶅惎鐢ㄦ楠屽�� -->
+								<view class="detail editable" v-show="checkItem.HAnalysisMethod == 2">
+									<text>妫�楠屽�硷細</text>
+									<input type="text" class="editable-input" @blur="calcHResult(checkItem)"
+										v-model="checkItem.HInspectValQ" />
+
+								</view>
+								<view class="detail" v-if="checkItem.HQCNote">
+									<text>妫�楠岃褰曪細</text>{{ checkItem.HQCNote }}
+								</view>
+								<view class="detail" v-if="checkItem.HTargetVal">
+									<text>鐩爣鍊硷細</text>{{ checkItem.HTargetVal }}
+								</view>
+								<view class="detail" v-if="checkItem.HUpLimit">
+									<text>涓婇檺鍊硷細</text>{{ checkItem.HUpLimit }}
+								</view>
+								<view class="detail" v-if="checkItem.HDownLimit">
+									<text>涓嬮檺鍊硷細</text>{{ checkItem.HDownLimit }}
+								</view>
+								<view class="detail" v-if="checkItem.HMax">
+									<text>鏈�澶у�硷細</text>{{ checkItem.HMax }}
+								</view>
+								<view class="detail" v-if="checkItem.HMin">
+									<text>鏈�灏忓�硷細</text>{{ checkItem.HMin }}
+								</view>
+								<view class="detail" v-if="checkItem.HAvg">
+									<text>骞冲潎鍊硷細</text>{{ checkItem.HAvg }}
+								</view>
+							</view>
+							<view style="height: 20rpx"></view>
+							<view class="more">
+								<view class="part" style="color: #da0000" @tap.stop="removeCheckItem(checkItem)">
+									<uni-icons type="trash" style="color: #da0000; margin-right: 10rpx"
+										size="18"></uni-icons>鍒犻櫎
+								</view>
+							</view>
+						</uni-card>
+					</view>
+				</view>
+				<!-- 鎶芥牱妫�楠� 鍛堢幇 -->
+				<view v-if="subTabSelected == 2">
+					<view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
+					<view class="list" v-else>
+						<uni-card v-for="SamplingItem in checkItems" :key="SamplingItem.num">
+							<view class="card-detail">
+								<view class="detail"> <text>搴忓彿锛�</text>{{ SamplingItem.num }} </view>
+								<view class="detail editable">
+									<text>妫�楠岄」鐩細</text>{{ SamplingItem.HQCCheckItemName }}
+								</view>
+								<view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
+								<view class="detail editable" style="width: 100%">
+									<view style="flex-shrink: 0"><text>鎶芥牱鏂规锛�</text></view>
+									<input type="text" :value="SamplingItem.HSampleSchemeName" disabled />
+									<view class="icon-wrapper"><uni-icons type="search" size="16"
+											@click="showSelectorModule(SamplingItem, 1)"></uni-icons></view>
+								</view>
+								<view class="detail editable">
+									<text>鎶芥牱绫诲瀷锛�</text>{{ SamplingItem.HSamplingType }}
+								</view>
+								<view class="detail editable">
+									<text>妫�楠屾按骞筹細</text>{{ SamplingItem.HInspectionLevel }}
+								</view>
+								<view class="detail editable">
+									<text>涓ユ牸搴︼細</text>{{ SamplingItem.HStrictness }}
+								</view>
+								<view class="detail editable">
+									<text>AQL锛�</text>{{ SamplingItem.HAQL }}
+								</view>
+								<view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
+								<view class="detail editable">
+									<text>鏍锋湰閲忥細</text>{{ SamplingItem.HSampleQty }}
+								</view>
+								<view class="detail editable">
+									<text>鍏佽鏁帮細</text>{{ SamplingItem.HAcceptQty }}
+								</view>
+								<view class="detail editable">
+									<text>鎷掔粷鏁帮細</text>{{ SamplingItem.HRejectQty }}
+								</view>
+								<view class="detail editable">
+									<text>鏍锋湰涓嶅悎鏍兼暟锛�</text>{{ SamplingItem.HSampleUnRightQty }}
+								</view>
+								<view class="detail editable">
+									<text>鏍锋湰鐮村潖鏁帮細</text>
+									<view class="editable-input">
+										<input type="number" v-model="SamplingItem.HSampleDamageQty" />
+									</view>
+								</view>
+								<view class="detail editable">
+									<text>妫�楠岀粨鏋滐細</text>
+									<view style="border-radius: 15%; padding: 0 10rpx" :class="
                                         SamplingItem.HInspectResultToSee == '鍚堟牸'
                                         ? 'pass-background'
                                         : SamplingItem.HInspectResultToSee == '涓嶅悎鏍�'
                                         ? 'unpass-background'
                                         : ''
                                     ">
-                                        {{ SamplingItem.HInspectResultToSee }}
-                                    </view>
-                                </view>
-                            </view>
-                        </uni-card>
-                    </view>
-                </view>
-                <!-- 妫�娴嬪�� 鍛堢幇 -->
-                <view v-else v-for="item in InspectModules" :key="item.id">
-                    <view v-if="subTabSelected == item.id">
-                        <InspectValueTemplateVue ref="InspectValueModules" :bind-key="item.id"
-                            @syncCheckData="InspectValueComplete" :bind-data="{
+										{{ SamplingItem.HInspectResultToSee }}
+									</view>
+								</view>
+							</view>
+						</uni-card>
+					</view>
+				</view>
+				<!-- 妫�娴嬪�� 鍛堢幇 -->
+				<view v-else v-for="item in InspectModules" :key="item.id">
+					<view v-if="subTabSelected == item.id">
+						<InspectValueTemplateVue ref="InspectValueModules" :bind-key="item.id"
+							@syncCheckData="InspectValueComplete" :bind-data="{
                 data: checkItems[item.checkItemId],
                 list: InspectValues[item.checkItemId],
                 mode: 1 // 棣栨妫�娴嬪�兼ā鍧�
               }">
-                        </InspectValueTemplateVue>
-                    </view>
-                </view>
-            </view>
-        </view>
-        <view style="height: 120rpx"></view>
-        <view class="bottom-btn">
-            <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-            <view style="flex: 1"></view>
-            <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
-            <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
-        </view>
-        <SampleSchemePopupVue v-if="enablePopupModule == PopupModuleNameList[1]" ref="listPopup"
-            @update="SampleSchemeComplete" :bindKey="currentChechItemIDCache">
-        </SampleSchemePopupVue>
-        <CheckItemPopupVue v-if="enablePopupModule == PopupModuleNameList[2]" ref="listPopup"
-            @update="CheckItemComplete" :bindKey="currentChechItemIDCache">
-        </CheckItemPopupVue>
-        <InspectMentPopupVue v-if="enablePopupModule == PopupModuleNameList[3]" ref="listPopup"
-            @update="InspectMentComplete" :bindKey="currentChechItemIDCache">
-        </InspectMentPopupVue>
-        <MaterialPopupVue v-if="enablePopupModule == PopupModuleNameList[4]" ref="listPopup" @update="MaterComplete"
-            :bindKey="0">
-        </MaterialPopupVue>
-        <ICMOBillPopupVue v-if="enablePopupModule == PopupModuleNameList[5]" ref="listPopup" @update="ICMOBillComplete"
-            :bindKey="0"></ICMOBillPopupVue>
-        <ProcExchBillPopupVue v-if="enablePopupModule == PopupModuleNameList[6]" ref="listPopup"
-            @update="ProcExchBillComplete" :bindKey="0"></ProcExchBillPopupVue>
-        <ProcessPopupVue v-if="enablePopupModule == PopupModuleNameList[8]" ref="listPopup" @update="HProcComplete"
-            :bindKey="0"></ProcessPopupVue>
-        <CheckProjectPopupVue v-if="enablePopupModule == PopupModuleNameList[7]" ref="listPopup"
-            @update="HQCSchemeComplete" :bindKey="0"></CheckProjectPopupVue>
+						</InspectValueTemplateVue>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view style="height: 120rpx"></view>
+		<view class="bottom-btn">
+			<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			<view style="flex: 1"></view>
+			<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+			<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+		</view>
+		<SampleSchemePopupVue v-if="enablePopupModule == PopupModuleNameList[1]" ref="listPopup"
+			@update="SampleSchemeComplete" :bindKey="currentChechItemIDCache">
+		</SampleSchemePopupVue>
+		<CheckItemPopupVue v-if="enablePopupModule == PopupModuleNameList[2]" ref="listPopup"
+			@update="CheckItemComplete" :bindKey="currentChechItemIDCache">
+		</CheckItemPopupVue>
+		<InspectMentPopupVue v-if="enablePopupModule == PopupModuleNameList[3]" ref="listPopup"
+			@update="InspectMentComplete" :bindKey="currentChechItemIDCache">
+		</InspectMentPopupVue>
+		<MaterialPopupVue v-if="enablePopupModule == PopupModuleNameList[4]" ref="listPopup" @update="MaterComplete"
+			:bindKey="0">
+		</MaterialPopupVue>
+		<ICMOBillPopupVue v-if="enablePopupModule == PopupModuleNameList[5]" ref="listPopup" @update="ICMOBillComplete"
+			:bindKey="0"></ICMOBillPopupVue>
+		<ProcExchBillPopupVue v-if="enablePopupModule == PopupModuleNameList[6]" ref="listPopup"
+			@update="ProcExchBillComplete" :bindKey="0"></ProcExchBillPopupVue>
+		<ProcessPopupVue v-if="enablePopupModule == PopupModuleNameList[8]" ref="listPopup" @update="HProcComplete"
+			:bindKey="0"></ProcessPopupVue>
+		<CheckProjectPopupVue v-if="enablePopupModule == PopupModuleNameList[7]" ref="listPopup"
+			@update="HQCSchemeComplete" :bindKey="0"></CheckProjectPopupVue>
 		<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HSourceBillType"
-		    :HStockOrgID="hform.HStockOrgID" @BillSelectComplete="HandleBillSelectComplete"></BillListPopupVue>
-    </view>
+			:HStockOrgID="hform.HStockOrgID" @BillSelectComplete="HandleBillSelectComplete"></BillListPopupVue>
+	</view>
 </template>
 
 <script>
-    import dayjs from "dayjs";
-    import {
-        CommonUtils
-    } from "../../../utils/common";
-    import InspectValueTemplateVue from "@/components/ZLGL/InspectValueTemplate.vue";
-    import SampleSchemePopupVue from "@/components/ZLGL/SampleSchemePopup.vue";
-    import CheckItemPopupVue from "@/components/ZLGL/CheckItemPopup.vue";
-    import InspectMentPopupVue from "../../../components/ZLGL/InspectMentPopup.vue";
-    import MaterialPopupVue from "../../../components/ZLGL/MaterialPopup.vue";
-    import ICMOBillPopupVue from "../../../components/ZLGL/ICMOBillPopup.vue";
-    import ProcExchBillPopupVue from "../../../components/ZLGL/ProcExchBillPopup.vue";
-    import ProcessPopupVue from "../../../components/ZLGL/ProcessPopup.vue";
-    import CheckProjectPopupVue from "../../../components/ZLGL/CheckProjectPopup.vue";
+	import dayjs from "dayjs";
+	import {
+		CommonUtils
+	} from "../../../utils/common";
+	import InspectValueTemplateVue from "@/components/ZLGL/InspectValueTemplate.vue";
+	import SampleSchemePopupVue from "@/components/ZLGL/SampleSchemePopup.vue";
+	import CheckItemPopupVue from "@/components/ZLGL/CheckItemPopup.vue";
+	import InspectMentPopupVue from "../../../components/ZLGL/InspectMentPopup.vue";
+	import MaterialPopupVue from "../../../components/ZLGL/MaterialPopup.vue";
+	import ICMOBillPopupVue from "../../../components/ZLGL/ICMOBillPopup.vue";
+	import ProcExchBillPopupVue from "../../../components/ZLGL/ProcExchBillPopup.vue";
+	import ProcessPopupVue from "../../../components/ZLGL/ProcessPopup.vue";
+	import CheckProjectPopupVue from "../../../components/ZLGL/CheckProjectPopup.vue";
 	import BillListPopupVue from "../../../components/BillListPopup/BillListPopup.vue";
-    import {
-        getUserInfo
-    } from "../../../utils/auth";
-    import {
-        MpaasScan
-    } from "../../../utils/mpaasScan";
-    export default {
-        components: {
-            InspectValueTemplateVue,
-            SampleSchemePopupVue,
-            CheckItemPopupVue,
-            InspectMentPopupVue,
-            MaterialPopupVue,
-            ICMOBillPopupVue,
-            ProcExchBillPopupVue,
-            ProcessPopupVue,
-            CheckProjectPopupVue,
+	import {
+		getUserInfo
+	} from "../../../utils/auth";
+	import {
+		MpaasScan
+	} from "../../../utils/mpaasScan";
+	export default {
+		components: {
+			InspectValueTemplateVue,
+			SampleSchemePopupVue,
+			CheckItemPopupVue,
+			InspectMentPopupVue,
+			MaterialPopupVue,
+			ICMOBillPopupVue,
+			ProcExchBillPopupVue,
+			ProcessPopupVue,
+			CheckProjectPopupVue,
 			BillListPopupVue,
-        },
-        computed: {
-            judgeConclusion: {
-                get() {
-                    return true;
-                },
-            },
-        },
-        data() {
-            return {
-                operationType: 1,
+		},
+		computed: {
+			judgeConclusion: {
+				get() {
+					return true;
+				},
+			},
+		},
+		data() {
+			return {
+				operationType: 1,
 
-                mainTabSelected: 1,
-                subTabSelected: 1,
+				mainTabSelected: 1,
+				subTabSelected: 1,
 
-                // 婧愬崟鐘舵�佹帶鍒�
-                hasSourceBill: false,
+				// 婧愬崟鐘舵�佹帶鍒�
+				hasSourceBill: false,
 
-                // 鎺у埗褰撳墠鏄剧ず鐨勫脊绐楁ā鍧�
-                enablePopupModule: "",
-                PopupModuleNameList: [
-                    "",
-                    "SampleScheme",
-                    "CheckItem",
-                    "InspectMent",
-                    "Material",
-                    "ICMOBill",
-                    "ProcExchBill",
-                    "QCScheme",
-                    "Process",
-                ],
-                // 褰撳墠鎿嶄綔鐨勬楠屽崟ID缂撳瓨
-                currentChechItemIDCache: -1,
+				// 鎺у埗褰撳墠鏄剧ず鐨勫脊绐楁ā鍧�
+				enablePopupModule: "",
+				PopupModuleNameList: [
+					"",
+					"SampleScheme",
+					"CheckItem",
+					"InspectMent",
+					"Material",
+					"ICMOBill",
+					"ProcExchBill",
+					"QCScheme",
+					"Process",
+				],
+				// 褰撳墠鎿嶄綔鐨勬楠屽崟ID缂撳瓨
+				currentChechItemIDCache: -1,
 
-                // uni-combox 閫夋嫨鍣ㄤ娇鐢�
-                // 鐢熶骇璧勬簮
-                GySourceList: [],
-                GySourceNameList: [],
-                // 鐝
-                GyWorkShiftList: [],
-                GyWorkShiftNameList: [],
-                // 妫�楠屽憳
-                GyFirstCheckEmpList: [],
-                GyFirstCheckEmpNameList: [],
+				// uni-combox 閫夋嫨鍣ㄤ娇鐢�
+				// 鐢熶骇璧勬簮
+				GySourceList: [],
+				GySourceNameList: [],
+				// 鐝
+				GyWorkShiftList: [],
+				GyWorkShiftNameList: [],
+				// 妫�楠屽憳
+				GyFirstCheckEmpList: [],
+				GyFirstCheckEmpNameList: [],
 
-                // 妫�楠屾柟妗�
-                arrayAnalysisMethod: [{
-                        value: 1,
-                        name: "瀹氭�у垎鏋�",
-                    },
-                    {
-                        value: 2,
-                        name: "瀹氶噺鍒嗘瀽",
-                    },
-                    {
-                        value: 3,
-                        name: "鍏朵粬鍒嗘瀽",
-                    },
-                ],
-                ArrayAnalysisMethodValue: [1, 2, 3],
-                // 瀛愯〃 椤电淇℃伅
-                subTabs: {
-                    1: {
-                        id: "1",
-                        name: "妫�楠岄」鐩�",
-                    },
-                    2: {
-                        id: "2",
-                        name: "鎶芥牱妫�楠�",
-                    },
-                },
+				// 妫�楠屾柟妗�
+				arrayAnalysisMethod: [{
+						value: 1,
+						name: "瀹氭�у垎鏋�",
+					},
+					{
+						value: 2,
+						name: "瀹氶噺鍒嗘瀽",
+					},
+					{
+						value: 3,
+						name: "鍏朵粬鍒嗘瀽",
+					},
+				],
+				ArrayAnalysisMethodValue: [1, 2, 3],
+				// 瀛愯〃 椤电淇℃伅
+				subTabs: {
+					1: {
+						id: "1",
+						name: "妫�楠岄」鐩�",
+					},
+					2: {
+						id: "2",
+						name: "鎶芥牱妫�楠�",
+					},
+				},
 
-                // 婧愬崟绫诲瀷
-                HSourceBillType: "宸ュ簭杩涚珯鎺ユ敹鍗�",
-                HSourceBillTypeValueList: ["3790", "3793", "3710", "3772"],
-                HSourceBillTypeNameList: [
-                    "宸ュ簭杩涚珯鎺ユ敹鍗�",
-                    "宸ュ簭濮斿鎺ユ敹鍗�",
-                    "鐢熶骇璁㈠崟",
-                    "宸ュ簭娴佽浆鍗�",
-                ],
-                // 涓昏〃灞炴��
-                hform: {
+				// 婧愬崟绫诲瀷
+				HSourceBillType: "宸ュ簭杩涚珯鎺ユ敹鍗�",
+				HSourceBillTypeValueList: ["3790", "3793", "3710", "3772", "7521"],
+				HSourceBillTypeNameList: [
+					"宸ュ簭杩涚珯鎺ユ敹鍗�",
+					"宸ュ簭濮斿鎺ユ敹鍗�",
+					"鐢熶骇璁㈠崟",
+					"宸ュ簭娴佽浆鍗�",
+					"鍙栨牱鍗�",
+				],
+				// 涓昏〃灞炴��
+				hform: {
 					HBillType: '7505',
-                    HSourceBillType: "3790",
-                    HSourceBillNo: "",
+					HSourceBillType: "3790",
+					HSourceBillNo: "",
 					HSourceBillQty: 0,
-                    HBillNo: "",
-                    HInterID: "0",
-                    HDate: dayjs(new Date()).format("YYYY-MM-DD"),
-                    HSourceName: "",
-                    HSourceID: "0",
-                    HShiftsName: "",
-                    HShiftsID: "0",
-                    HICMOBillNo: "",
-                    HICMOInterID: "0",
-                    HICMOEntryID: "1",
-                    HICMOQty: "0",
-                    HProcExchBillNo: "",
-                    HProcExchInterID: "0",
-                    HProcExchEntryID: "0",
-                    HProcExchQty: "0",
-                    HMaterNumber: "",
-                    HMaterID: "0",
-                    HMaterName: "",
-                    HFirstCheckEmpName: getUserInfo().HEmpName,
-                    HFirstCheckEmp: getUserInfo().HEmpID,
-                    HQCSchemeName: "",
-                    HQCSchemeID: "0",
-                    HBatchNo: "",
-                    HLastResult: true, // 榛樿鍚堟牸
-                    HProcName: "",
-                    HProcID: "0",
-                    HTakeSampleCheckBillNo: "", // 鍙栨牱鍗�
-                    HTakeSampleCheckBillID: "0",
-                    HRemark: "",
-                    HErrTreatment: "", // 寮傚父涓存椂澶勭悊鏂规
-                    HMaker: getUserInfo()["Czymc"] || "",
-                    HChecker: "",
-                    HCloseMan: "",
-                    HMakeDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
-                    HCheckDate: "",
-                    HCloseDate: "",
-                    HUpDater: "",
-                    HDeleteMan: "",
-                    HUpDateDate: "",
-                    HDeleteDate: "",
-                    HResult: 1,
-                    HAnalysisMethod: "",
-					
-					HCheckQty: 0,
-					
-                    HResDec: "",
-                    HStatus: 1,
+					HBillNo: "",
+					HInterID: "0",
+					HDate: dayjs(new Date()).format("YYYY-MM-DD"),
+					HSourceName: "",
+					HSourceID: "0",
+					HShiftsName: "",
+					HShiftsID: "0",
+					HICMOBillNo: "",
+					HICMOInterID: "0",
+					HICMOEntryID: "1",
+					HICMOQty: "0",
+					HProcExchBillNo: "",
+					HProcExchInterID: "0",
+					HProcExchEntryID: "0",
+					HProcExchQty: "0",
+					HMaterNumber: "",
+					HMaterID: "0",
+					HMaterName: "",
+					HFirstCheckEmpName: getUserInfo().HEmpName,
+					HFirstCheckEmp: getUserInfo().HEmpID,
+					HQCSchemeName: "",
+					HQCSchemeID: "0",
+					HBatchNo: "",
+					HLastResult: true, // 榛樿鍚堟牸
+					HProcName: "",
+					HProcID: "0",
+					HTakeSampleCheckBillNo: "", // 鍙栨牱鍗�
+					HTakeSampleCheckBillID: "0",
+					HRemark: "",
+					HErrTreatment: "", // 寮傚父涓存椂澶勭悊鏂规
+					HMaker: getUserInfo()["Czymc"] || "",
+					HChecker: "",
+					HCloseMan: "",
+					HMakeDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
+					HCheckDate: "",
+					HCloseDate: "",
+					HUpDater: "",
+					HDeleteMan: "",
+					HUpDateDate: "",
+					HDeleteDate: "",
+					HResult: 1,
+					HAnalysisMethod: "",
 
-                    HMainSourceBillType: "",
-                    HMainSourceInterID: "0",
-                    HMainSourceEntryID: "1",
-                    HMainSourceBillNo: "",
-					
+					HCheckQty: 0,
+
+					HResDec: "",
+					HStatus: 1,
+
+					HMainSourceBillType: "",
+					HMainSourceInterID: "0",
+					HMainSourceEntryID: "1",
+					HMainSourceBillNo: "",
+
 					HStockOrgID: uni.getStorageSync('OrganizationID'),
-                },
-                // 妫�楠岄」鐩拰鎶芥牱妫�楠� 鍊�
-                checkItems: {},
-                // 妫�娴嬪�兼ā鍧�
-                InspectModules: {},
-                // 妫�娴嬪��
-                InspectValues: {},
-            };
-        },
-        methods: {
-            // 妫�楠屽�� 璁＄畻鏄惁鍚堟牸
-            calcHResult(item){
-                // 闈炴娊妫�鏉′欢涓嬪垽鏂粨璁�
-                console.log('item: ',item);
-                if(!item.HSampleSchemeID) {
-                    return
-                }
-                
-                if(item.HInspectValQ >= item.HDownLimit && item.HInspectValQ <= item.HUpLimit){
-                    this.checkItems[item.num].HResult = 1
-                    return
-                }
-                
-                this.checkItems[item.num].HResult = 2
-            },
+				},
+				// 妫�楠岄」鐩拰鎶芥牱妫�楠� 鍊�
+				checkItems: {},
+				// 妫�娴嬪�兼ā鍧�
+				InspectModules: {},
+				// 妫�娴嬪��
+				InspectValues: {},
+			};
+		},
+		methods: {
+			// 妫�楠屽�� 璁＄畻鏄惁鍚堟牸
+			calcHResult(item) {
+				// 闈炴娊妫�鏉′欢涓嬪垽鏂粨璁�
+				console.log('item: ', item);
+				if (!item.HSampleSchemeID) {
+					return
+				}
+
+				if (item.HInspectValQ >= item.HDownLimit && item.HInspectValQ <= item.HUpLimit) {
+					this.checkItems[item.num].HResult = 1
+					return
+				}
+
+				this.checkItems[item.num].HResult = 2
+			},
 			// 璇诲彇缂撳瓨
 			loadCache() {
-			    const pages = getCurrentPages()
-			    // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
-			    const currentPage = pages[pages.length - 1]
-			    let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
-			    if (HBillTypeCache) {
-			        this.HSourceBillType = HBillTypeCache.HSourceBillTypeName
-			        this.hform.HSourceBillType = HBillTypeCache.HSourceBillType
-			        this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
-			    }
+				const pages = getCurrentPages()
+				// 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+				const currentPage = pages[pages.length - 1]
+				let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
+				if (HBillTypeCache) {
+					this.HSourceBillType = HBillTypeCache.HSourceBillTypeName
+					this.hform.HSourceBillType = HBillTypeCache.HSourceBillType
+					this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
+				}
 			},
-            // 婧愬崟绫诲瀷閫夋嫨
-            HSourceBillTypeNameChange(e) {
-                this.HSourceBillType = this.HSourceBillTypeNameList[e.detail.value];
-                this.hform.HSourceBillType = this.HSourceBillTypeValueList[e.detail.value];
+			// 婧愬崟绫诲瀷閫夋嫨
+			HSourceBillTypeNameChange(e) {
+				this.HSourceBillType = this.HSourceBillTypeNameList[e.detail.value];
+				this.hform.HSourceBillType = this.HSourceBillTypeValueList[e.detail.value];
 				const pages = getCurrentPages()
 				// 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
 				const currentPage = pages[pages.length - 1]
 				// 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
 				uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
-				    HSourceBillTypeName: this.HSourceBillType,
-				    HSourceBillType: this.hform.HSourceBillType
+					HSourceBillTypeName: this.HSourceBillType,
+					HSourceBillType: this.hform.HSourceBillType
 				})
-            },
+			},
 			// 鏍规嵁婧愬崟绫诲瀷閫夋嫨鍗曟嵁
 			toBillSelector() {
-			    this.$refs['billList'].showPopup()
+				this.$refs['billList'].showPopup()
 			},
-            toScanCode() {
-                MpaasScan.scanCode((res) => {
-                    if (res) {
-                        this.getSourceBillInfo(res);
-                    }
-                });
-            },
-            async getSourceBillInfo(HBarCode) {
-                console.log('HBarCode: ', HBarCode);
-                let res = await CommonUtils.doRequest2Async({
-                    url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
-                    data: {
-                        HBillType: this.hform.HBillType,
-                        HSourceBillType: this.hform.HSourceBillType,
-                        HBarCode: HBarCode,
-                        HInterID: 0,
-                        HEntryID: 0,
-                        Mode: 1, //鎵爜妯″紡
-						user:getUserInfo()["Czymc"]
-                    }
-                })
-            
-                console.log(res)
-                let {
-                    data,
-                    Message,
-                    count
-                } = res.data
-                if (count == 1) {
-                    this.hform.HMaterID = data[0]['HMaterID']
-                    this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
-                    this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
-                    this.hform.HMainSourceBillNo = data[0]['HBillNo']
-                    this.hform.HSourceBillNo = data[0]['HBillNo']
-                    this.hform.HMainSourceInterID = data[0].HInterID
-                    this.hform.HMainSourceEntryID = data[0].HEntryID
-                    this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
-                    this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
-                    this.hform.HSourceBillQty = data[0].HSourceBillQty
-                    this.hasSourceBill = true
-					this.hform.HICMOBillNo= data[0].浠诲姟鍗曞彿
-					this.hform.HICMOInterID= data[0].HICMOInterID
-					this.hform.HICMOEntryID= data[0].HICMOEntryID
-					this.hform.HICMOQty= data[0].鐢熶骇鏁伴噺
-					this.hform.HProcExchBillNo= data[0].鍗曟嵁鍙�
-					this.hform.HProcExchInterID= data[0].HInterID
-					this.hform.HProcExchEntryID= data[0].HEntryID
-					this.hform.HProcExchQty= data[0].娴佽浆鍗℃暟閲�
-					this.hform.HSourceName= data[0].鐢熶骇璧勬簮
-					this.hform.HSourceID= data[0].HSourceID
-					this.hform.HProcID= data[0].HProcID
-					this.hform.HProcName= data[0].褰撳墠宸ュ簭
+			toScanCode() {
+				MpaasScan.scanCode((res) => {
+					if (res) {
+						this.getSourceBillInfo(res);
+					}
+				});
+			},
+			async getSourceBillInfo(HBarCode) {
+				console.log('HBarCode: ', HBarCode);
+				let res = await CommonUtils.doRequest2Async({
+					url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
+					data: {
+						HBillType: this.hform.HBillType,
+						HSourceBillType: this.hform.HSourceBillType,
+						HBarCode: HBarCode,
+						HInterID: 0,
+						HEntryID: 0,
+						Mode: 1, //鎵爜妯″紡
+						user: getUserInfo()["Czymc"]
+					}
+				})
 
-                    this.get_CheckItem();
-                } else {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: Message
-                    })
-                }
-            
-                // if (
-                //     (uni.getStorageSync("OrganizationID") == "7667152" &&
-                //         uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
-                //     (uni.getStorageSync("OrganizationID") == "100199" &&
-                //         uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
-                // ) {
-                //     await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
-                // }
-                
-            },
+				console.log(res)
+				let {
+					data,
+					Message,
+					count
+				} = res.data
+				if (count == 1) {
+					if(this.hform.HSourceBillType=="3772"){
+						this.hform.HMaterID = data[0]['HMaterID']
+						this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+						this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+						this.hform.HMainSourceBillNo = data[0]['HBillNo']
+						this.hform.HSourceBillNo = data[0]['HBillNo']
+						this.hform.HMainSourceInterID = data[0].HInterID
+						this.hform.HMainSourceEntryID = data[0].HEntryID
+						this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+						this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+						this.hform.HSourceBillQty = data[0].HSourceBillQty
+						this.hasSourceBill = true
+						this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
+						this.hform.HICMOInterID = data[0].HICMOInterID
+						this.hform.HICMOEntryID = data[0].HICMOEntryID
+						this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
+						this.hform.HProcExchBillNo = data[0].鍗曟嵁鍙�
+						this.hform.HProcExchInterID = data[0].HInterID
+						this.hform.HProcExchEntryID = data[0].HEntryID
+						this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
+						this.hform.HSourceName = data[0].鐢熶骇璧勬簮
+						this.hform.HSourceID = data[0].HSourceID
+						this.hform.HProcID = data[0].HProcID
+						this.hform.HProcName = data[0].褰撳墠宸ュ簭
+					}
+					else if(this.hform.HSourceBillType=="7521"){
+						this.hform.HMaterID = data[0]['HMaterID']
+						this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+						this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+						this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�
+						this.hform.HSourceBillNo = data[0].鍗曟嵁鍙�
+						this.hform.HMainSourceInterID = data[0].HInterID
+						this.hform.HMainSourceEntryID = data[0].HEntryID
+						this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+						this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+						this.hform.HSourceBillQty = data[0].妫�楠屾暟閲�
+						this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
+						this.hform.HICMOInterID = data[0].HICMOInterID
+						this.hform.HICMOEntryID = data[0].HICMOEntryID
+						this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
+						this.hform.HProcExchBillNo = data[0].HProcExchBillNo
+						this.hform.HProcExchInterID = data[0].HProcExchInterID
+						this.hform.HProcExchEntryID = data[0].HProcExchEntryID
+						this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
+						this.hform.HSourceName = data[0].鐢熶骇璧勬簮
+						this.hform.HSourceID = data[0].HSourceID
+						this.hform.HProcID = data[0].HProcID
+						this.hform.HProcName = data[0].褰撳墠宸ュ簭
+						this.hform.HTakeSampleCheckBillNo = data[0].鍗曟嵁鍙�
+						this.hform.HTakeSampleCheckBillID = data[0].HInterID
+					}
+					else{
+						this.hform.HMaterID = data[0]['HMaterID']
+						this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+						this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+						this.hform.HMainSourceBillNo = data[0]['HBillNo']
+						this.hform.HSourceBillNo = data[0]['HBillNo']
+						this.hform.HMainSourceInterID = data[0].HInterID
+						this.hform.HMainSourceEntryID = data[0].HEntryID
+						this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+						this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+						this.hform.HSourceBillQty = data[0].HSourceBillQty
+						this.hasSourceBill = true
+						this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
+						this.hform.HICMOInterID = data[0].HICMOInterID
+						this.hform.HICMOEntryID = data[0].HICMOEntryID
+						this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
+						this.hform.HProcExchBillNo = data[0].鍗曟嵁鍙�
+						this.hform.HProcExchInterID = data[0].HInterID
+						this.hform.HProcExchEntryID = data[0].HEntryID
+						this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
+						this.hform.HSourceName = data[0].鐢熶骇璧勬簮
+						this.hform.HSourceID = data[0].HSourceID
+						this.hform.HProcID = data[0].HProcID
+						this.hform.HProcName = data[0].褰撳墠宸ュ簭
+					}
+					this.get_CheckItem();
+				} else {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: Message
+					})
+				}
+
+			},
 			async HandleBillSelectComplete(e) {
-			    try {
-			        let res = await CommonUtils.doRequest2Async({
-			            url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
-			            data: {
-			                HBillType: this.hform.HBillType,
-			                HSourceBillType: this.hform.HSourceBillType,
-			                HBarCode: "",
-			                HInterID: e?.HInterID,
-			                HEntryID: e?.HEntryID,
-			                Mode: 2 ,//閫夊崟妯″紡
-							user:getUserInfo()["Czymc"]
-			            }
-			        })
-			
-			        let {
-			            data,
-			            Message,
-			            count
-			        } = res.data
-			        if (count == 1) {
-			            console.log('鑾峰彇婧愬崟锛�', data)
-			            this.hform.HMaterID = data[0]['HMaterID']
-			            this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
-			            this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
-			            this.hform.HMainSourceBillNo = data[0]['HBillNo']
-			            this.hform.HSourceBillNo = data[0]['HBillNo']
-			            this.hform.HMainSourceInterID = data[0].HInterID
-			            this.hform.HMainSourceEntryID = data[0].HEntryID
-			            this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
-			            this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
-			            this.hform.HSourceBillQty = data[0].HSourceBillQty
-			            this.hform.HICMOBillNo= data[0].浠诲姟鍗曞彿
-			            this.hform.HICMOInterID= data[0].HICMOInterID
-			            this.hform.HICMOEntryID= data[0].HICMOEntryID
-			            this.hform.HICMOQty= data[0].鐢熶骇鏁伴噺
-			            this.hform.HProcExchBillNo= data[0].鍗曟嵁鍙�
-			            this.hform.HProcExchInterID= data[0].HInterID
-			            this.hform.HProcExchEntryID= data[0].HEntryID
-			            this.hform.HProcExchQty= data[0].娴佽浆鍗℃暟閲�
-			            this.hform.HSourceName= data[0].鐢熶骇璧勬簮
-			            this.hform.HSourceID= data[0].HSourceID
-			            this.hform.HProcID= data[0].HProcID
-			            this.hform.HProcName= data[0].褰撳墠宸ュ簭
-			
-			            this.get_CheckItem();
-			            this.hasSourceBill = true
-			            this.$refs['billList'].exit()
-			        } else {
-			            CommonUtils.showTips({
-			                title: '娓╅Θ鎻愮ず',
-			                message: Message
-			            })
-			        }
-			
-			    } catch (err) {
-			        CommonUtils.showTips({
-			            title: '娓╅Θ鎻愮ず',
-			            message: "婧愬崟涓嬫帹閿欒: " + err
-			        })
-			    }
-			
+				console.log('e: ', e);
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
+						data: {
+							HBillType: this.hform.HBillType,
+							HSourceBillType: this.hform.HSourceBillType,
+							HBarCode: "",
+							HInterID: e?.HInterID,
+							HEntryID: e?.HEntryID,
+							Mode: 2, //閫夊崟妯″紡
+							user: getUserInfo()["Czymc"]
+						}
+					})
+
+					let {
+						data,
+						Message,
+						count
+					} = res.data
+					if (count == 1) {
+						if(this.hform.HSourceBillType=="3772"){
+							this.hform.HMaterID = data[0]['HMaterID']
+							this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+							this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+							this.hform.HMainSourceBillNo = data[0]['HBillNo']
+							this.hform.HSourceBillNo = data[0]['HBillNo']
+							this.hform.HMainSourceInterID = data[0].HInterID
+							this.hform.HMainSourceEntryID = data[0].HEntryID
+							this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+							this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+							this.hform.HSourceBillQty = data[0].HSourceBillQty
+							this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
+							this.hform.HICMOInterID = data[0].HICMOInterID
+							this.hform.HICMOEntryID = data[0].HICMOEntryID
+							this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
+							this.hform.HProcExchBillNo = data[0].鍗曟嵁鍙�
+							this.hform.HProcExchInterID = data[0].HInterID
+							this.hform.HProcExchEntryID = data[0].HEntryID
+							this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
+							this.hform.HSourceName = data[0].鐢熶骇璧勬簮
+							this.hform.HSourceID = data[0].HSourceID
+							this.hform.HProcID = data[0].HProcID
+							this.hform.HProcName = data[0].褰撳墠宸ュ簭
+						}else if(this.hform.HSourceBillType=="7521"){
+							this.hform.HMaterID = data[0]['HMaterID']
+							this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+							this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+							this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�
+							this.hform.HSourceBillNo = data[0].鍗曟嵁鍙�
+							this.hform.HMainSourceInterID = data[0].HInterID
+							this.hform.HMainSourceEntryID = data[0].HEntryID
+							this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+							this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+							this.hform.HSourceBillQty = data[0].妫�楠屾暟閲�
+							this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
+							this.hform.HICMOInterID = data[0].HICMOInterID
+							this.hform.HICMOEntryID = data[0].HICMOEntryID
+							this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
+							this.hform.HProcExchBillNo = data[0].HProcExchBillNo
+							this.hform.HProcExchInterID = data[0].HProcExchInterID
+							this.hform.HProcExchEntryID = data[0].HProcExchEntryID
+							this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
+							this.hform.HSourceName = data[0].鐢熶骇璧勬簮
+							this.hform.HSourceID = data[0].HSourceID
+							this.hform.HProcID = data[0].HProcID
+							this.hform.HProcName = data[0].褰撳墠宸ュ簭
+							this.hform.HTakeSampleCheckBillNo = data[0].鍗曟嵁鍙�
+							this.hform.HTakeSampleCheckBillID = data[0].HInterID
+						}else{
+							this.hform.HMaterID = data[0]['HMaterID']
+							this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+							this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+							this.hform.HMainSourceBillNo = data[0]['HBillNo']
+							this.hform.HSourceBillNo = data[0]['HBillNo']
+							this.hform.HMainSourceInterID = data[0].HInterID
+							this.hform.HMainSourceEntryID = data[0].HEntryID
+							this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+							this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+							this.hform.HSourceBillQty = data[0].HSourceBillQty
+							this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
+							this.hform.HICMOInterID = data[0].HICMOInterID
+							this.hform.HICMOEntryID = data[0].HICMOEntryID
+							this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
+							this.hform.HProcExchBillNo = data[0].鍗曟嵁鍙�
+							this.hform.HProcExchInterID = data[0].HInterID
+							this.hform.HProcExchEntryID = data[0].HEntryID
+							this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
+							this.hform.HSourceName = data[0].鐢熶骇璧勬簮
+							this.hform.HSourceID = data[0].HSourceID
+							this.hform.HProcID = data[0].HProcID
+							this.hform.HProcName = data[0].褰撳墠宸ュ簭
+						}
+						
+						console.log('鑾峰彇婧愬崟锛�', data)
+						
+
+						this.get_CheckItem();
+						this.hasSourceBill = true
+						this.$refs['billList'].exit()
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: "婧愬崟涓嬫帹閿欒: " + err
+					})
+				}
+
 			},
-            async GetCheckItemID() {
-                if (!this.hform.HMaterName && !this.hform.HProcName) {
-                    try {
-                        let res = await CommonUtils.doRequest2Async({
-                            url: "/Web/GetCheckItemID",
-                            data: {
-                                HName: this.hform.HMaterName,
-                                HProName: this.hform.HProcName,
-                                HSourceID: this.hform.HSourceID,
-                            },
-                        });
+			async GetCheckItemID() {
+				if (!this.hform.HMaterName && !this.hform.HProcName) {
+					try {
+						let res = await CommonUtils.doRequest2Async({
+							url: "/Web/GetCheckItemID",
+							data: {
+								HName: this.hform.HMaterName,
+								HProName: this.hform.HProcName,
+								HSourceID: this.hform.HSourceID,
+							},
+						});
 
-                        let {
-                            count,
-                            Message,
-                            data
-                        } = res.data;
+						let {
+							count,
+							Message,
+							data
+						} = res.data;
 
-                        if (count != 1) {
-                            CommonUtils.showTips({
-                                title: "娓╅Θ鎻愮ず",
-                                message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${Message}`,
-                            });
-                            return;
-                        }
+						if (count != 1) {
+							CommonUtils.showTips({
+								title: "娓╅Θ鎻愮ず",
+								message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${Message}`,
+							});
+							return;
+						}
 
-                        this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
-                        this.hform.HQCSchemeID = data[0].hmainid;
+						this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+						this.hform.HQCSchemeID = data[0].hmainid;
 
-                        this.get_CheckItem();
-                    } catch (err) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${err}`,
-                        });
-                    }
-                }
-            },
-            async LoadingInformation_ProcExchange(HBarCode) {
-                // 宸ュ簭娴佽浆鍗�
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/CheckBill/get_ProcessExchangeBill_ByBillNo",
-                        data: {
-                            HBillNo: HBarCode,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+						this.get_CheckItem();
+					} catch (err) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${err}`,
+						});
+					}
+				}
+			},
+			async LoadingInformation_ProcExchange(HBarCode) {
+				// 宸ュ簭娴佽浆鍗�
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/CheckBill/get_ProcessExchangeBill_ByBillNo",
+						data: {
+							HBillNo: HBarCode,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                    let {
-                        count,
-                        Message,
-                        data
-                    } = res.data;
+					let {
+						count,
+						Message,
+						data
+					} = res.data;
 
-                    if (count != 1) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${Message}`,
-                        });
-                        return;
-                    }
-                    this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
-                    this.hform.HProcExchInterID = data[0].HProcExchInterID;
-                    this.hform.HProcExchEntryID = data[0].HProcExchEntryID || 0;
-                    this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
-                    this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
-                    this.hform.HICMOInterID = data[0].HICMOInterID;
-                    this.hform.HICMOQty = data[0].HICMOQty || 0;
-                    this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
-                    this.hform.HSourceID = data[0].HSourceID || 0;
-                    this.hform.HMaterID = data[0].HMaterID;
-                    this.hform.HMaterName = data[0].浜у搧鍚嶇О;
-                    this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
-                    this.hform.HMainSourceBillType = data[0].HBillType;
-                    this.hform.HMainSourceInterID = data[0].HInterID;
-                    this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
-                    this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
-                    this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
-                    this.hform.HProcName = data[0].褰撳墠宸ュ簭;
-                    this.hform.HBatchNo = data[0].鎵瑰彿;
+					if (count != 1) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${Message}`,
+						});
+						return;
+					}
+					this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
+					this.hform.HProcExchInterID = data[0].HProcExchInterID;
+					this.hform.HProcExchEntryID = data[0].HProcExchEntryID || 0;
+					this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+					this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
+					this.hform.HICMOInterID = data[0].HICMOInterID;
+					this.hform.HICMOQty = data[0].HICMOQty || 0;
+					this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
+					this.hform.HSourceID = data[0].HSourceID || 0;
+					this.hform.HMaterID = data[0].HMaterID;
+					this.hform.HMaterName = data[0].浜у搧鍚嶇О;
+					this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+					this.hform.HMainSourceBillType = data[0].HBillType;
+					this.hform.HMainSourceInterID = data[0].HInterID;
+					this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+					this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+					this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+					this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+					this.hform.HBatchNo = data[0].鎵瑰彿;
 
-                    this.hasSourceBill = true
-                    this.get_CheckItem();
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${err}`,
-                    });
-                }
-            },
-            async LoadingInformation_ICMO(HBarCode) {
-                // 鐢熶骇璁㈠崟
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/QC_FirstPieceCheckBill/get_ICMOBill_ByBillNo",
-                        data: {
-                            HBillNo: HBarCode,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+					this.hasSourceBill = true
+					this.get_CheckItem();
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${err}`,
+					});
+				}
+			},
+			async LoadingInformation_ICMO(HBarCode) {
+				// 鐢熶骇璁㈠崟
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/QC_FirstPieceCheckBill/get_ICMOBill_ByBillNo",
+						data: {
+							HBillNo: HBarCode,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                    let {
-                        count,
-                        Message,
-                        data
-                    } = res.data;
+					let {
+						count,
+						Message,
+						data
+					} = res.data;
 
-                    if (count != 1) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${Message}`,
-                        });
-                        return;
-                    }
-                    this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
-                    this.hform.HProcExchInterID = data[0].HProcExchInterID;
-                    this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
-                    this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
-                    this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
-                    this.hform.HICMOInterID = data[0].HICMOInterID;
-                    this.hform.HICMOQty = data[0].HICMOQty;
-                    this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
-                    this.hform.HSourceID = data[0].HSourceID;
-                    this.hform.HMaterID = data[0].HMaterID;
-                    this.hform.HMaterName = data[0].浜у搧鍚嶇О;
-                    this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
-                    this.hform.HMainSourceBillType = data[0].HBillType;
-                    this.hform.HMainSourceInterID = data[0].HInterID;
-                    this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
-                    this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
-                    this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
-                    this.hform.HProcName = data[0].褰撳墠宸ュ簭;
-                    this.hasSourceBill = true
-                    this.get_CheckItem();
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${err}`,
-                    });
-                }
-            },
-            async LoadingInformation_StationEntrustOutBill(HBarCode) {
-                // 宸ュ簭濮斿鎺ユ敹鍗�
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Cj_StationEntrustOutBill/list",
-                        data: {
-                            sWhere: ` and HBillNo = '${HBarCode}'`,
-                        },
-                    });
+					if (count != 1) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${Message}`,
+						});
+						return;
+					}
+					this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
+					this.hform.HProcExchInterID = data[0].HProcExchInterID;
+					this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
+					this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+					this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
+					this.hform.HICMOInterID = data[0].HICMOInterID;
+					this.hform.HICMOQty = data[0].HICMOQty;
+					this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
+					this.hform.HSourceID = data[0].HSourceID;
+					this.hform.HMaterID = data[0].HMaterID;
+					this.hform.HMaterName = data[0].浜у搧鍚嶇О;
+					this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+					this.hform.HMainSourceBillType = data[0].HBillType;
+					this.hform.HMainSourceInterID = data[0].HInterID;
+					this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+					this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+					this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+					this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+					this.hasSourceBill = true
+					this.get_CheckItem();
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${err}`,
+					});
+				}
+			},
+			async LoadingInformation_StationEntrustOutBill(HBarCode) {
+				// 宸ュ簭濮斿鎺ユ敹鍗�
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Cj_StationEntrustOutBill/list",
+						data: {
+							sWhere: ` and HBillNo = '${HBarCode}'`,
+						},
+					});
 
-                    let {
-                        count,
-                        Message,
-                        data
-                    } = res.data;
+					let {
+						count,
+						Message,
+						data
+					} = res.data;
 
-                    if (count != 1) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${Message}`,
-                        });
-                        return;
-                    }
+					if (count != 1) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${Message}`,
+						});
+						return;
+					}
 
-                    HProcExchBillNo = data[0].娴佽浆鍗″彿;
-                    HProcExchInterID = data[0].HProcExchInterID;
-                    HProcExchEntryID = data[0].HProcExchEntryID;
-                    HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
-                    HICMOBillNo = data[0].鐢熶骇璁㈠崟鍙�;
-                    HICMOInterID = data[0].HICMOInterID;
-                    HICMOQty = data[0].HICMOQty;
-                    HSourceName = data[0].鐢熶骇璧勬簮;
-                    HSourceID = data[0].HSourceID;
-                    HMaterID = data[0].HMaterID;
-                    HMaterName = data[0].浜у搧鍚嶇О;
-                    HMainSourceBillNo = data[0].鍗曟嵁鍙�;
-                    HMainSourceBillType = data[0].HBillType;
-                    HMainSourceInterID = data[0].HInterID;
-                    HICMOEntryID = data[0].HICMOEntryID || 1;
-                    this.hasSourceBill = true
-                    this.get_CheckItem();
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${err}`,
-                    });
-                }
-            },
-            async LoadingInformation_StationInBill(HBarCode) {
-                // 杩涚珯鎺ユ敹鍗�
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/QC_FirstPieceCheckBill/get_StationInBill_ByHBillNo",
-                        data: {
-                            HBillNo: HBarCode,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+					HProcExchBillNo = data[0].娴佽浆鍗″彿;
+					HProcExchInterID = data[0].HProcExchInterID;
+					HProcExchEntryID = data[0].HProcExchEntryID;
+					HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+					HICMOBillNo = data[0].鐢熶骇璁㈠崟鍙�;
+					HICMOInterID = data[0].HICMOInterID;
+					HICMOQty = data[0].HICMOQty;
+					HSourceName = data[0].鐢熶骇璧勬簮;
+					HSourceID = data[0].HSourceID;
+					HMaterID = data[0].HMaterID;
+					HMaterName = data[0].浜у搧鍚嶇О;
+					HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+					HMainSourceBillType = data[0].HBillType;
+					HMainSourceInterID = data[0].HInterID;
+					HICMOEntryID = data[0].HICMOEntryID || 1;
+					this.hasSourceBill = true
+					this.get_CheckItem();
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${err}`,
+					});
+				}
+			},
+			async LoadingInformation_StationInBill(HBarCode) {
+				// 杩涚珯鎺ユ敹鍗�
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/QC_FirstPieceCheckBill/get_StationInBill_ByHBillNo",
+						data: {
+							HBillNo: HBarCode,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                    let {
-                        count,
-                        Message,
-                        data
-                    } = res.data;
+					let {
+						count,
+						Message,
+						data
+					} = res.data;
 
-                    if (count != 1) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇杩涚珯鎺ユ敹鍗� 閿欒: ${Message}`,
-                        });
-                        return;
-                    }
-                    this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
-                    this.hform.HProcExchInterID = data[0].HProcExchInterID;
-                    this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
-                    this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
-                    this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
-                    this.hform.HICMOInterID = data[0].HICMOInterID;
-                    this.hform.HICMOQty = data[0].HICMOQty;
-                    this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
-                    this.hform.HSourceID = data[0].HSourceID;
-                    this.hform.HMaterID = data[0].HMaterID;
-                    this.hform.HMaterName = data[0].浜у搧鍚嶇О;
-                    this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
-                    this.hform.HMainSourceBillType = data[0].HBillType;
-                    this.hform.HMainSourceInterID = data[0].HInterID;
-                    this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
-                    this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
-                    this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
-                    this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+					if (count != 1) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇杩涚珯鎺ユ敹鍗� 閿欒: ${Message}`,
+						});
+						return;
+					}
+					this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
+					this.hform.HProcExchInterID = data[0].HProcExchInterID;
+					this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
+					this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+					this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
+					this.hform.HICMOInterID = data[0].HICMOInterID;
+					this.hform.HICMOQty = data[0].HICMOQty;
+					this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
+					this.hform.HSourceID = data[0].HSourceID;
+					this.hform.HMaterID = data[0].HMaterID;
+					this.hform.HMaterName = data[0].浜у搧鍚嶇О;
+					this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+					this.hform.HMainSourceBillType = data[0].HBillType;
+					this.hform.HMainSourceInterID = data[0].HInterID;
+					this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+					this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+					this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+					this.hform.HProcName = data[0].褰撳墠宸ュ簭;
 
-                    for (let i = 0; i < data.length; i++) {
-                        this.addCheckItem(data[i])
-                    }
+					for (let i = 0; i < data.length; i++) {
+						this.addCheckItem(data[i])
+					}
 
-                    this.hasSourceBill = true
-                    this.get_CheckItem();
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇杩涚珯鎺ユ敹鍗� 閿欒: ${err}`,
-                    });
-                }
-            },
-            // 妫�楠屽憳鍒濆鍖�
-            async InitHEmp() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Gy_Employee/list",
-                        data: {
-                            sWhere: `  and 缁勭粐鍚嶇О = '${uni.getStorageSync(
-              "Organization"
-            )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' `,
-                            user: getUserInfo()["Czymc"],
-                            Organization: uni.getStorageSync("Organization"),
-                        },
-                    });
+					this.hasSourceBill = true
+					this.get_CheckItem();
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇杩涚珯鎺ユ敹鍗� 閿欒: ${err}`,
+					});
+				}
+			},
+			async LoadingInformation_TakeSampleCheckBill(linterid) {
+				// 鍙栨牱鍗�
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/QC_FirstPieceCheckBill/get_TakeSampleCheckBill",
+						data: {
+							HInterID: linterid,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                    let {
-                        data,
-                        Message,
-                        count
-                    } = res.data;
+					let {
+						count,
+						Message,
+						data
+					} = res.data;
 
-                    if (count == 1) {
-                        console.log("data: ", data);
-                        this.GyFirstCheckEmpList = data;
-                        this.GyFirstCheckEmpNameList = Array.from(data).map((e) => e["鑱屽憳鍚嶇О"]);
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鍒濆鍖栨楠屽憳澶辫触: ${Message}`,
-                        });
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鍒濆鍖栨楠屽憳澶辫触: ${err}`,
-                    });
-                }
-            },
-            async HFirstCheckEmpChange(e) {
-                console.log("閫変腑妫�楠屽憳: ", e);
-                let index = this.GyFirstCheckEmpList.findIndex((elem) => elem["鑱屽憳鍚嶇О"] == e);
-                if (index == -1) {
-                    this.hform.HFirstCheckEmp = 0;
-                    this.hform.HFirstCheckEmpName = "";
-                    return;
-                }
+					if (count != 1) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇鍙栨牱鍗� 閿欒: ${Message}`,
+						});
+						return;
+					}
+					this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
+					this.hform.HProcExchInterID = data[0].HProcExchInterID;
+					this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
+					this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+					this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
+					this.hform.HICMOInterID = data[0].HICMOInterID;
+					this.hform.HICMOQty = data[0].HICMOQty;
+					this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
+					this.hform.HSourceID = data[0].HSourceID;
+					this.hform.HMaterID = data[0].HMaterID;
+					this.hform.HMaterName = data[0].浜у搧鍚嶇О;
+					this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+					this.hform.HMainSourceBillType = data[0].HBillType;
+					this.hform.HMainSourceInterID = data[0].HInterID;
+					this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+					this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+					this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+					this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+					this.hasSourceBill = true
+					this.get_CheckItem();
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇鍙栨牱鍗� 閿欒: ${err}`,
+					});
+				}
+			},
+			// 妫�楠屽憳鍒濆鍖�
+			async InitHEmp() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Gy_Employee/list",
+						data: {
+							sWhere: `  and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' order by 閮ㄩ棬浠ｇ爜`,
+							user: getUserInfo()["Czymc"],
+							Organization: uni.getStorageSync("Organization"),
+						},
+					});
 
-                this.hform.HFirstCheckEmp = this.GyFirstCheckEmpList[index]["HItemID"];
-                this.hform.HFirstCheckEmpName = this.GyFirstCheckEmpList[index]["鑱屽憳鍚嶇О"];
-            },
-            // 鐢熶骇鐝鍒濆鍖�
-            async InitHWorkShift() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Gy_ShiftsController/Get_Gy_WorkShiftList",
-                        data: {
-                            sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'')  != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync(
-              "Organization"
-            )}'`,
-                            HMaker: getUserInfo()["Czymc"],
-                        },
-                    });
+					let {
+						data,
+						Message,
+						count
+					} = res.data;
 
-                    let {
-                        data,
-                        Message,
-                        count
-                    } = res.data;
+					if (count == 1) {
+						console.log("data: ", data);
+						this.GyFirstCheckEmpList = data;
+						this.GyFirstCheckEmpNameList = Array.from(data).map((e) => e["鑱屽憳鍚嶇О"]);
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鍒濆鍖栨楠屽憳澶辫触: ${Message}`,
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鍒濆鍖栨楠屽憳澶辫触: ${err}`,
+					});
+				}
+			},
+			async HFirstCheckEmpChange(e) {
+				console.log("閫変腑妫�楠屽憳: ", e);
+				let index = this.GyFirstCheckEmpList.findIndex((elem) => elem["鑱屽憳鍚嶇О"] == e);
+				if (index == -1) {
+					this.hform.HFirstCheckEmp = 0;
+					this.hform.HFirstCheckEmpName = "";
+					return;
+				}
 
-                    if (count == 1) {
-                        console.log("data: ", data);
-                        this.GyWorkShiftList = data;
-                        this.GyWorkShiftNameList = Array.from(data).map((e) => e["鐝鍚嶇О"]);
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鍒濆鍖栫彮娆″け璐�: ${Message}`,
-                        });
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鍒濆鍖栫彮娆″け璐�: ${err}`,
-                    });
-                }
-            },
-            async HWorkShiftChange(e) {
-                console.log("閫変腑鐝: ", e);
-                let index = this.GyWorkShiftList.findIndex((elem) => elem["鐝鍚嶇О"] == e);
-                if (index == -1) {
-                    this.hform.HWorkShiftID = 0;
-                    this.hform.HWorkShiftName = "";
-                    return;
-                }
+				this.hform.HFirstCheckEmp = this.GyFirstCheckEmpList[index]["HItemID"];
+				this.hform.HFirstCheckEmpName = this.GyFirstCheckEmpList[index]["鑱屽憳鍚嶇О"];
+			},
+			// 鐢熶骇鐝鍒濆鍖�
+			async InitHWorkShift() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Gy_ShiftsController/Get_Gy_WorkShiftList",
+						data: {
+							sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'')  != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}'`,
+							HMaker: getUserInfo()["Czymc"],
+						},
+					});
 
-                this.hform.HWorkShiftID = this.GySourceList[index]["HInterID"];
-                this.hform.HWorkShiftName = this.GySourceList[index]["鐝鍚嶇О"];
-            },
-            // 鐢熶骇璧勬簮鏇存柊
-            // 鐢熶骇璧勬簮鍒濆鍖�
-            async InitHSource() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Gy_Source/list",
-                        data: {
-                            sWhere: `and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'')  != '' and HUSEORGID = '100038'`,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+					let {
+						data,
+						Message,
+						count
+					} = res.data;
 
-                    let {
-                        data,
-                        Message,
-                        count
-                    } = res.data;
+					if (count == 1) {
+						console.log("data: ", data);
+						this.GyWorkShiftList = data;
+						this.GyWorkShiftNameList = Array.from(data).map((e) => e["鐝鍚嶇О"]);
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鍒濆鍖栫彮娆″け璐�: ${Message}`,
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鍒濆鍖栫彮娆″け璐�: ${err}`,
+					});
+				}
+			},
+			async HWorkShiftChange(e) {
+				let index = this.GyWorkShiftList.findIndex((elem) => elem["鐝鍚嶇О"] == e);
+				if (index == -1) {
+					this.hform.HWorkShiftID = 0;
+					this.hform.HWorkShiftName = "";
+					return;
+				}
 
-                    if (count == 1) {
-                        this.GySourceList = data;
-                        this.GySourceNameList = Array.from(data).map((e) => e["鐢熶骇璧勬簮鍚嶇О"]);
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${Message}`,
-                        });
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${err}`,
-                    });
-                }
-            },
-            // 鐢熶骇璧勬簮鏇存柊
-            async HSourceChange(e) {
-                console.log("閫変腑鐢熶骇璧勬簮: ", e);
-                let index = this.GySourceList.findIndex((elem) => elem["鐢熶骇璧勬簮鍚嶇О"] == e);
-                if (index == -1) {
-                    this.hform.HSourceID = 0;
-                    this.hform.HSourceName = "";
-                    return;
-                }
+				this.hform.HWorkShiftID = this.GySourceList[index]["HInterID"];
+				this.hform.HWorkShiftName = this.GySourceList[index]["鐝鍚嶇О"];
+			},
+			// 鐢熶骇璧勬簮鍒濆鍖�
+			async InitHSource() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Gy_Source/list",
+						data: {
+							sWhere: `and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'')  != '' and HUSEORGID = '100038'`,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                this.hform.HSourceID = this.GySourceList[index]["HItemID"];
-                this.hform.HSourceName = this.GySourceList[index]["鐢熶骇璧勬簮鍚嶇О"];
+					let {
+						data,
+						Message,
+						count
+					} = res.data;
 
-                this.get_ICMOBillStatusList();
-                this.get_QC_TakeSampleCheckBillList();
-                this.GetCheckItemID();
-            },
-            // 鏄剧ず寮圭獥
-            async showSelectorModule(item, index) {
-                this.currentChechItemIDCache = item.num || 0; // 0 琛ㄧず娌℃湁浠讳綍瀛愯〃琚�変腑
-                this.enablePopupModule = this.PopupModuleNameList[index];
-                console.log("this.$refs: ", this.$refs);
-                await this.$nextTick();
-                if (index == 7) {
-                    // 妫�楠屾柟妗堥渶瑕侀澶栦紶閫掑伐搴忓拰鐗╂枡鍚嶇О涓や釜鍙傛暟
-                    this.$refs.listPopup.setRequiredInfo(item.HMaterName, item.HProcName);
-                }
+					if (count == 1) {
+						this.GySourceList = data;
+						this.GySourceNameList = Array.from(data).map((e) => e["鐢熶骇璧勬簮鍚嶇О"]);
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${Message}`,
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${err}`,
+					});
+				}
+			},
+			// 鐢熶骇璧勬簮鏇存柊
+			async HSourceChange(e) {
+				console.log("閫変腑鐢熶骇璧勬簮: ", e);
+				let index = this.GySourceList.findIndex((elem) => elem["鐢熶骇璧勬簮鍚嶇О"] == e);
+				if (index == -1) {
+					this.hform.HSourceID = 0;
+					this.hform.HSourceName = "";
+					return;
+				}
 
-                this.$refs.listPopup.showPopup();
-            },
-            getAnalysisMethodDisplay(val) {
-                console.log("AnalysisMethod: ", val);
-                if (val) {
-                    return this.arrayAnalysisMethod.find((e) => e.value == val).name;
-                }
-                return "";
-            },
-            checkResultChange(event) {
-                console.log("event: ", event);
-            },
-            // 妫�楠岄」鐩柊澧炶
-            addCheckItem(resource) {
-                let ordinal = this.getObjLength(this.checkItems) + 1;
-                let checkItem = {
-                    num: ordinal,
-                    HInterID: this.hform.HInterID,
-                    HQCCheckItemID: "",
-                    HQCCheckItemNumber: "",
-                    HQCCheckItemName: "",
-                    HInspectInstruMentID: "0",
-                    HInspectInstruMentNumber: "",
-                    HInspectInstruMentName: "",
-                    HQCStd: "",
-                    HUnit: "",
-                    HQCNote: "",
-                    HAnalysisMethod: "",
-                    HResult: 1,
-                    HMax: "",
-                    HMin: "",
-                    HAvg: "",
-                    HRemark: "",
-                    HKeyInspect: false,
-                    HStatus: 1,
-                    HSampleSchemeID: "",
-                    HUnitID: 0,
-                    HInspectVal: "",
-                    HTargetVal: "",
-                    HUpLimit: "",
-                    HDownLimit: "",
-                    HUpOffSet: "",
-                    HDownOffSet: "",
-                    HSampleDamageQty: 0,
-                    HSampleSchemeName: "",
-                    HSampleQty: 0,
-                    HAcceptQty: 0,
-                    HInspectionLevel: "",
-                    HRejectQty: 0,
-                    HStrictness: "",
-                    HSampleUnRightQty: 0,
-                    HAQL: "",
-                    HSamplingType: "",
-                    HInspectResultToSee: "",
-                };
-                if (resource) {
-                    // 閫氳繃涓昏〃妫�楠屾柟妗堝甫鍑虹殑妫�楠岄」鐩�
-                    Object.assign(checkItem, resource);
-                }
-                this.$set(this.checkItems, ordinal, checkItem);
-                this.$nextTick(() => {
-                    // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
-                    this.setInspectValModule(this.checkItems[ordinal]);
-                });
-            },
-            // 妫�楠岄」鐩垹闄よ
-            removeCheckItem(item) {
-                uni.showModal({
-                    title: "娓╅Θ鎻愮ず",
-                    content: `纭瑕佸垹闄ょ${item.num}琛屽悧锛熷垹闄ゅ悗涓嶈兘鎭㈠`,
-                    success: (res) => {
-                        if (res.confirm) {
-                            this.$delete(this.checkItems, item.num);
-                            this.$delete(this.subTabs, `_${item.num}`);
-                            this.$forceUpdate();
-                            this.refreshCheckItemNum();
-                        }
-                    },
-                });
-            },
-            async refreshCheckItemNum() {
-                await this.$nextTick();
-                // 閲嶆帓搴忓彿
-                let num = 1;
-                let checkItemsCache = {};
-                for (let s in this.checkItems) {
-                    checkItemsCache[num] = this.checkItems[s];
-                    checkItemsCache[num].num = num;
-                    num++;
-                }
-                this.checkItems = checkItemsCache;
-            },
-            getObjLength(obj) {
-                return Object.keys(obj).length;
-            },
-            // 缁撹淇敼
-            HResultChange(id, e) {
-                console.log("e: ", e);
-                this.checkItems[id]["HResult"] = e.detail.value ? 1 : 2;
+				this.hform.HSourceID = this.GySourceList[index]["HItemID"];
+				this.hform.HSourceName = this.GySourceList[index]["鐢熶骇璧勬簮鍚嶇О"];
 
-                this.HCheckLastResult();
-            },
-            // 姣忔妫�楠岄」鐩殑缁撹鏇存柊锛岄兘瑕佸垽鏂渶缁堢粨璁�
-            HCheckLastResult() {
-                let unPassNum = 0;
-                for (var key in this.checkItems) {
-                    if (!(this.checkItems[key]["HResult"] == 1)) {
-                        unPassNum++;
-                    }
-                }
+				this.get_ICMOBillStatusList();
+				this.get_QC_TakeSampleCheckBillList();
+				this.GetCheckItemID();
+			},
+			// 鏄剧ず寮圭獥
+			async showSelectorModule(item, index) {
+				this.currentChechItemIDCache = item.num || 0; // 0 琛ㄧず娌℃湁浠讳綍瀛愯〃琚�変腑
+				this.enablePopupModule = this.PopupModuleNameList[index];
+				console.log("this.$refs: ", this.$refs);
+				await this.$nextTick();
+				if (index == 7) {
+					// 妫�楠屾柟妗堥渶瑕侀澶栦紶閫掑伐搴忓拰鐗╂枡鍚嶇О涓や釜鍙傛暟
+					this.$refs.listPopup.setRequiredInfo(item.HMaterName, item.HProcName);
+				}
 
-                if (unPassNum > 0) {
-                    this.hform.HLastResult = false;
-                    return;
-                }
-                this.hform.HLastResult = true;
-            },
-            // 妫�楠屾柟妗堜慨鏀�
-            HAnalysisMethodChange(id, e) {
-                console.log("e: ", e);
-                this.checkItems[id]["HAnalysisMethod"] = this.arrayAnalysisMethod[e.detail.value][
-                    "value"
-                ];
+				this.$refs.listPopup.showPopup();
+			},
+			getAnalysisMethodDisplay(val) {
+				console.log("AnalysisMethod: ", val);
+				if (val) {
+					return this.arrayAnalysisMethod.find((e) => e.value == val).name;
+				}
+				return "";
+			},
+			checkResultChange(event) {
+				console.log("event: ", event);
+			},
+			// 妫�楠岄」鐩柊澧炶
+			addCheckItem(resource) {
+				let ordinal = this.getObjLength(this.checkItems) + 1;
+				let checkItem = {
+					num: ordinal,
+					HInterID: this.hform.HInterID,
+					HQCCheckItemID: "",
+					HQCCheckItemNumber: "",
+					HQCCheckItemName: "",
+					HInspectInstruMentID: "0",
+					HInspectInstruMentNumber: "",
+					HInspectInstruMentName: "",
+					HQCStd: "",
+					HUnit: "",
+					HQCNote: "",
+					HAnalysisMethod: "",
+					HResult: 1,
+					HMax: "",
+					HMin: "",
+					HAvg: "",
+					HRemark: "",
+					HKeyInspect: false,
+					HStatus: 1,
+					HSampleSchemeID: "",
+					HUnitID: 0,
+					HInspectVal: "",
+					HTargetVal: "",
+					HUpLimit: "",
+					HDownLimit: "",
+					HUpOffSet: "",
+					HDownOffSet: "",
+					HSampleDamageQty: 0,
+					HSampleSchemeName: "",
+					HSampleQty: 0,
+					HAcceptQty: 0,
+					HInspectionLevel: "",
+					HRejectQty: 0,
+					HStrictness: "",
+					HSampleUnRightQty: 0,
+					HAQL: "",
+					HSamplingType: "",
+					HInspectResultToSee: "",
+				};
+				if (resource) {
+					// 閫氳繃涓昏〃妫�楠屾柟妗堝甫鍑虹殑妫�楠岄」鐩�
+					Object.assign(checkItem, resource);
+				}
+				this.$set(this.checkItems, ordinal, checkItem);
+				this.$nextTick(() => {
+					// 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
+					this.setInspectValModule(this.checkItems[ordinal]);
+				});
+			},
+			// 妫�楠岄」鐩垹闄よ
+			removeCheckItem(item) {
+				uni.showModal({
+					title: "娓╅Θ鎻愮ず",
+					content: `纭瑕佸垹闄ょ${item.num}琛屽悧锛熷垹闄ゅ悗涓嶈兘鎭㈠`,
+					success: (res) => {
+						if (res.confirm) {
+							this.$delete(this.checkItems, item.num);
+							this.$delete(this.subTabs, `_${item.num}`);
+							this.$forceUpdate();
+							this.refreshCheckItemNum();
+						}
+					},
+				});
+			},
+			async refreshCheckItemNum() {
+				await this.$nextTick();
+				// 閲嶆帓搴忓彿
+				let num = 1;
+				let checkItemsCache = {};
+				for (let s in this.checkItems) {
+					checkItemsCache[num] = this.checkItems[s];
+					checkItemsCache[num].num = num;
+					num++;
+				}
+				this.checkItems = checkItemsCache;
+			},
+			getObjLength(obj) {
+				return Object.keys(obj).length;
+			},
+			// 缁撹淇敼
+			HResultChange(id, e) {
+				console.log("e: ", e);
+				this.checkItems[id]["HResult"] = e.detail.value ? 1 : 2;
 
-                // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
-                this.setInspectValModule(this.checkItems[id]);
-            },
-            // 閲嶇偣妫�鏌ヤ慨鏀�
-            HKeyInspectChange(id, e) {
-                console.log("e: ", e);
-                this.checkItems[id]["HKeyInspect"] = e.detail.value;
-            },
-            // 妫�楠岄」鐩繑鍥�
-            async CheckItemComplete(e) {
-                console.log("CheckItemRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.checkItems[key], {
-                        HQCCheckItemID: data["HItemID"],
-                        HQCCheckItemNumber: data["浠ｇ爜"],
-                        HQCCheckItemName: data["鍚嶇О"],
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                }
-            },
-            // 妫�楠屾柟妗堣繑鍥�
-            async SampleSchemeComplete(e) {
-                console.log("SampleSchemeRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.checkItems[key], {
-                        HSampleSchemeID: data["hmainid"],
-                        HSampleSchemeNumber: data["鎶芥牱鏂规浠ｇ爜"],
-                        HSampleSchemeName: data["鎶芥牱鏂规鍚嶇О"],
-                        HSampleQty: data["鏍锋湰閲�"] || 0,
-                        HAcceptQty: data["鍏佽鏁�"] || 0,
-                        HInspectionLevel: data["妫�楠屾按骞�"],
-                        HRejectQty: data["鎷掔粷鏁�"] || 0,
-                        HStrictness: data["涓ユ牸搴�"],
-                        HSampleUnRightQty: data["鏍锋湰涓嶅悎鏍兼暟"] || 0,
-                        HAQL: data["AQL"],
-                        HSamplingType: data["鎶芥牱绫诲瀷"],
-                        HInspectResultToSee: data["妫�楠岀粨鏋�"],
-                        HUpLimit: data["涓婇檺鍊�"] || 0,
-                        HDownLimit: data["涓嬮檺鍊�"] || 0,
-                        HSampleDamageQty: data["鏍锋湰鐮村潖鏁�"] || 0,
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    this.setInspectValModule(this.checkItems[key]);
+				this.HCheckLastResult();
+			},
+			// 姣忔妫�楠岄」鐩殑缁撹鏇存柊锛岄兘瑕佸垽鏂渶缁堢粨璁�
+			HCheckLastResult() {
+				let unPassNum = 0;
+				for (var key in this.checkItems) {
+					if (!(this.checkItems[key]["HResult"] == 1)) {
+						unPassNum++;
+					}
+				}
 
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                }
-            },
-            // 妫�楠屼华鍣ㄨ繑鍥�
-            async InspectMentComplete(e) {
-                console.log("InspectInstruMentRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.checkItems[key], {
-                        HInspectInstruMentID: data["HItemID"],
-                        HInspectInstruMentNumber: data["妫�楠屼华鍣ㄤ唬鐮�"],
-                        HInspectInstruMentName: data["妫�楠屼华鍣ㄥ悕绉�"],
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                }
-            },
-            // 浜у搧浠ｇ爜杩斿洖
-            async MaterComplete(e) {
-                console.log("MaterRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.hform, {
-                        HMaterNumber: data["鐗╂枡浠ｇ爜"],
-                        HMaterName: data["鐗╂枡鍚嶇О"],
-                        HMaterID: data["HItemID"],
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                    this.GetCheckItemID();
-                }
-            },
-            // 浠诲姟鍗曡繑鍥�
-            async ICMOBillComplete(e) {
-                console.log("ICMOBillRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.hform, {
-                        HICMOInterID: data.hmainid,
-                        HICMOEntryID: data.HEntryID || 1,
-                        HICMOBillNo: data.鍗曟嵁鍙�,
-                        HMaterNumber: data.浜у搧浠ｇ爜,
-                        HMaterName: data.浜у搧鍚嶇О,
-                        HMaterID: data.HMaterID,
-                        HICMOQty: data.鐢熶骇浠诲姟鍗曟暟閲�,
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                }
-            },
-            // 娴佽浆鍗¤繑鍥�
-            async ProcExchBillComplete(e) {
-                console.log("ProcExchBillRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.hform, {
-                        HProcExchInterID: data.hmainid,
-                        HProcExchEntryID: data.hsubid,
-                        HProcExchBillNo: data.鍗曟嵁鍙�,
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                }
-            },
-            // 妫�楠屾柟妗�(涓昏〃)杩斿洖
-            async HQCSchemeComplete(e) {
-                console.log("HQCSchemeRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.hform, {
-                        HQCSchemeID: data.hmainid,
-                        HQCSchemeName: data.妫�楠屾柟妗堝悕绉�,
-                    });
-                    await this.get_CheckItem();
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                }
-            },
-            // 宸ュ簭杩斿洖
-            async HProcComplete(e) {
-                console.log(" HProcRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.hform, {
-                        HProcName: data["宸ュ簭鍚嶇О"],
-                        HProcID: data["HItemID"],
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                    await this.GetCheckItemID();
-                    await this.get_ICMOBillStatusList();
-                    await this.get_QC_TakeSampleCheckBillList();
-                }
-            },
-            async get_QC_TakeSampleCheckBillList() {
-                // 鍙栨牱鍗曟煡璇�
-                let HProcID = this.hform.HProcID;
-                let HProcExchInterId = this.hform.HProcExchInterID;
-                let sWhere = "";
+				if (unPassNum > 0) {
+					this.hform.HLastResult = false;
+					return;
+				}
+				this.hform.HLastResult = true;
+			},
+			// 妫�楠屾柟妗堜慨鏀�
+			HAnalysisMethodChange(id, e) {
+				console.log("e: ", e);
+				this.checkItems[id]["HAnalysisMethod"] = this.arrayAnalysisMethod[e.detail.value][
+					"value"
+				];
 
-                if (HProcID == "0" || HProcID == "") {
-                    CommonUtils.showTips({
-                        message: "璇烽�夋嫨宸ュ簭",
-                    });
-                    return;
-                }
+				// 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
+				this.setInspectValModule(this.checkItems[id]);
+			},
+			// 閲嶇偣妫�鏌ヤ慨鏀�
+			HKeyInspectChange(id, e) {
+				console.log("e: ", e);
+				this.checkItems[id]["HKeyInspect"] = e.detail.value;
+			},
+			// 妫�楠岄」鐩繑鍥�
+			async CheckItemComplete(e) {
+				console.log("CheckItemRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.checkItems[key], {
+						HQCCheckItemID: data["HItemID"],
+						HQCCheckItemNumber: data["浠ｇ爜"],
+						HQCCheckItemName: data["鍚嶇О"],
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+				}
+			},
+			// 妫�楠屾柟妗堣繑鍥�
+			async SampleSchemeComplete(e) {
+				console.log("SampleSchemeRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.checkItems[key], {
+						HSampleSchemeID: data["hmainid"],
+						HSampleSchemeNumber: data["鎶芥牱鏂规浠ｇ爜"],
+						HSampleSchemeName: data["鎶芥牱鏂规鍚嶇О"],
+						HSampleQty: data["鏍锋湰閲�"] || 0,
+						HAcceptQty: data["鍏佽鏁�"] || 0,
+						HInspectionLevel: data["妫�楠屾按骞�"],
+						HRejectQty: data["鎷掔粷鏁�"] || 0,
+						HStrictness: data["涓ユ牸搴�"],
+						HSampleUnRightQty: data["鏍锋湰涓嶅悎鏍兼暟"] || 0,
+						HAQL: data["AQL"],
+						HSamplingType: data["鎶芥牱绫诲瀷"],
+						HInspectResultToSee: data["妫�楠岀粨鏋�"],
+						HUpLimit: data["涓婇檺鍊�"] || 0,
+						HDownLimit: data["涓嬮檺鍊�"] || 0,
+						HSampleDamageQty: data["鏍锋湰鐮村潖鏁�"] || 0,
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					this.setInspectValModule(this.checkItems[key]);
 
-                sWhere = " and 宸ュ簭娴佽浆鍗′富鍐呯爜='" + HProcExchInterID + "' and HProcID=" + HProcID;
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+				}
+			},
+			// 妫�楠屼华鍣ㄨ繑鍥�
+			async InspectMentComplete(e) {
+				console.log("InspectInstruMentRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.checkItems[key], {
+						HInspectInstruMentID: data["HItemID"],
+						HInspectInstruMentNumber: data["妫�楠屼华鍣ㄤ唬鐮�"],
+						HInspectInstruMentName: data["妫�楠屼华鍣ㄥ悕绉�"],
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+				}
+			},
+			// 浜у搧浠ｇ爜杩斿洖
+			async MaterComplete(e) {
+				console.log("MaterRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.hform, {
+						HMaterNumber: data["鐗╂枡浠ｇ爜"],
+						HMaterName: data["鐗╂枡鍚嶇О"],
+						HMaterID: data["HItemID"],
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+					this.GetCheckItemID();
+				}
+			},
+			// 浠诲姟鍗曡繑鍥�
+			async ICMOBillComplete(e) {
+				console.log("ICMOBillRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.hform, {
+						HICMOInterID: data.hmainid,
+						HICMOEntryID: data.HEntryID || 1,
+						HICMOBillNo: data.鍗曟嵁鍙�,
+						HMaterNumber: data.浜у搧浠ｇ爜,
+						HMaterName: data.浜у搧鍚嶇О,
+						HMaterID: data.HMaterID,
+						HICMOQty: data.鐢熶骇浠诲姟鍗曟暟閲�,
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+				}
+			},
+			// 娴佽浆鍗¤繑鍥�
+			async ProcExchBillComplete(e) {
+				console.log("ProcExchBillRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.hform, {
+						HProcExchInterID: data.hmainid,
+						HProcExchEntryID: data.hsubid,
+						HProcExchBillNo: data.鍗曟嵁鍙�,
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+				}
+			},
+			// 妫�楠屾柟妗�(涓昏〃)杩斿洖
+			async HQCSchemeComplete(e) {
+				console.log("HQCSchemeRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.hform, {
+						HQCSchemeID: data.hmainid,
+						HQCSchemeName: data.妫�楠屾柟妗堝悕绉�,
+					});
+					await this.get_CheckItem();
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+				}
+			},
+			// 宸ュ簭杩斿洖
+			async HProcComplete(e) {
+				console.log(" HProcRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.hform, {
+						HProcName: data["宸ュ簭鍚嶇О"],
+						HProcID: data["HItemID"],
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+					await this.GetCheckItemID();
+					await this.get_ICMOBillStatusList();
+					await this.get_QC_TakeSampleCheckBillList();
+				}
+			},
+			async get_QC_TakeSampleCheckBillList() {
+				// 鍙栨牱鍗曟煡璇�
+				let HProcID = this.hform.HProcID;
+				let HProcExchInterId = this.hform.HProcExchInterID;
+				let sWhere = "";
 
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "//QC_TakeSampleCheckBill/QC_TakeSampleCheckBillMainList",
-                        data: {
-                            sWhere: sWhere,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+				if (HProcID == "0" || HProcID == "") {
+					CommonUtils.showTips({
+						message: "璇烽�夋嫨宸ュ簭",
+					});
+					return;
+				}
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data;
-                    if (count != 1) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${Message}`,
-                        });
-                    }
+				sWhere = " and 宸ュ簭娴佽浆鍗′富鍐呯爜='" + HProcExchInterID + "' and HProcID=" + HProcID;
 
-                    this.hform.HTakeSampleCheckBillID = data[0]["hmainid"];
-                    this.hform.HTakeSampleCheckBillNo = data[0]["鍗曟嵁鍙�"];
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${err}`,
-                    });
-                }
-            },
-            async get_ICMOBillStatusList() {
-                let sWhere = "";
-                let HProcID = this.hform.HProcID;
-                let HSourceID = this.hform.HSourceID;
-                let HProcExchInterId = this.hform.HProcExchInterID;
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "//QC_TakeSampleCheckBill/QC_TakeSampleCheckBillMainList",
+						data: {
+							sWhere: sWhere,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                if (HProcID != "0") {
-                    sWhere += " and HProcID=" + HProcID;
-                }
-                if (HSourceID != "0") {
-                    sWhere += " and HSourceID=" + HSourceID;
-                }
+					let {
+						data,
+						count,
+						Message
+					} = res.data;
+					if (count != 1) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${Message}`,
+						});
+					}
 
-                sWhere += " and HSourceInterID=" + HProcExchInterID;
+					this.hform.HTakeSampleCheckBillID = data[0]["hmainid"];
+					this.hform.HTakeSampleCheckBillNo = data[0]["鍗曟嵁鍙�"];
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${err}`,
+					});
+				}
+			},
+			async get_ICMOBillStatusList() {
+				let sWhere = "";
+				let HProcID = this.hform.HProcID;
+				let HSourceID = this.hform.HSourceID;
+				let HProcExchInterId = this.hform.HProcExchInterID;
 
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/CheckBill/GetICMOBillStatusList",
-                        data: {
-                            sWhere: sWhere,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+				if (HProcID != "0") {
+					sWhere += " and HProcID=" + HProcID;
+				}
+				if (HSourceID != "0") {
+					sWhere += " and HSourceID=" + HSourceID;
+				}
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data;
-                    if (count != 1) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${Message}`,
-                        });
-                    }
+				sWhere += " and HSourceInterID=" + HProcExchInterID;
 
-                    this.hform.HProcID = data[0]["HProcID"];
-                    this.hform.HProcName = data[0]["宸ュ簭"];
-                    this.hform.HSourceID = data[0]["HSourceID"];
-                    this.hform.HSourceName = data[0]["鐢熶骇璧勬簮"];
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${err}`,
-                    });
-                }
-            },
-            setInspectValModule(checkItem) {
-                console.log("checkItem: ", checkItem);
-                if (!checkItem.HAnalysisMethod || !checkItem.HSampleSchemeID) {
-                    return;
-                }
-                // 鍖哄垎妫�楠屽�奸〉绛惧拰闈欐�侀〉绛撅紝妫�楠屽�奸〉绛剧殑id浠寮�澶�
-                this.$set(this.InspectModules, `_${checkItem.num}`, {
-                    id: `_${checkItem.num}`,
-                    checkItemId: checkItem.num,
-                });
-                console.log(" this.arrayAnalysisMethod: ", checkItem.HAnalysisMethod);
-                let analysisMethodName = this.arrayAnalysisMethod.find(
-                    (e) => e.value == checkItem.HAnalysisMethod
-                ).name;
-                this.$set(this.subTabs, `_${checkItem.num}`, {
-                    id: `_${checkItem.num}`,
-                    name: `${analysisMethodName}-${checkItem.HQCCheckItemName}`,
-                });
-            },
-            InspectValueUpdate(e) {
-                console.log("e: ", e);
-                let {
-                    data,
-                    list
-                } = e;
-                this.checkItems[data.num] = Object.assign(this.checkItems[data.num], data);
-                this.$set(this.InspectValues, `${data.num}`, list);
-            },
-            // 甯﹀嚭妫�楠岄」鐩�
-            async get_CheckItem() {
-                // 棣栧厛娓呯┖妫�楠岄」鐩� 鍜� 妫�楠屽��
-                this.checkItems = {}
-                for (let key in this.subTabs) {
-                    if (key.substring(1) == "_") {
-                        this.$delete(this.subTabs, key)
-                    }
-                }
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Web/GetCheckItemByCheckProjectID_Sec",
-                        data: {
-                            CheckProjectID: this.hform.HQCSchemeID || 0,
-                            HBatchQty: this.hform.HProcExchQty || 0,
-                            HMaterID: this.hform.HMaterID,
-                            HBillType: '鐢熶骇鍏ュ簱妫�鏂规'
-                        },
-                    });
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/CheckBill/GetICMOBillStatusList",
+						data: {
+							sWhere: sWhere,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data;
+					let {
+						data,
+						count,
+						Message
+					} = res.data;
+					if (count != 1) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${Message}`,
+						});
+					}
 
-                    if (count == 1) {
-                        for (var i = 0; i < data.length; i++) {
-                            let checkItem = {
-                                HQCCheckItemID: data[i]["HQCCheckItemID"],
-                                HQCCheckItemNumber: data[i]["妫�楠岄」鐩唬鐮�"],
-                                HQCCheckItemName: data[i]["妫�楠岄」鐩�"],
-                                HInspectInstruMentID: data[i]["HInspectInstruMentID"],
-                                HInspectInstruMentNumber: data[i]["妫�楠屼华鍣ㄤ唬鐮�"],
-                                HInspectInstruMentName: data[i]["妫�楠屼华鍣�"],
-                                HQCStd: data[i]["HQCStd"],
-                                HUnit: data[i]["鍗曚綅鍚嶇О"],
-                                HQCNote: "",
-                                HAnalysisMethod: data[i]["鍒嗘瀽鏂规硶"],
-                                HResult: data[i]["榛樿缁撹"],
-                                HMax: "",
-                                HMin: "",
-                                HAvg: "",
-                                HRemark: "",
-                                HKeyInspect: data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false,
-                                HStatus: 0,
-                                HSampleSchemeID: data[i]["HSampleSchemeID"],
-                                HUnitID: data[i]["HUnitID"],
-                                HInspectVal: "",
-                                HTargetVal: "",
-                                HUpLimit: data[i].涓婇檺鍊�,
-                                HDownLimit: data[i].涓嬮檺鍊�,
-                                HUpOffSet: "",
-                                HDownOffSet: "",
-                                HSampleDamageQty: "0",
-                                HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
-                                HSampleQty: data[i].鏍锋湰閲�,
-                                HAcceptQty: data[i].鍏佽鏁�,
-                                HInspectionLevel: data[i].妫�楠屾按骞�,
-                                HRejectQty: data[i].鎷掔粷鏁�,
-                                HStrictness: data[i].涓ユ牸搴�,
-                                HSampleUnRightQty: 0,
-                                HAQL: data[i].AQL,
-                                HSamplingType: data[i].鎶芥牱绫诲瀷,
-                                HCompareSymbol: data[i].姣旇緝绗�,
-                                HTargetVal: data[i].鐩爣鍊� || 0,
-                            };
+					this.hform.HProcID = data[0]["HProcID"];
+					this.hform.HProcName = data[0]["宸ュ簭"];
+					this.hform.HSourceID = data[0]["HSourceID"];
+					this.hform.HSourceName = data[0]["鐢熶骇璧勬簮"];
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${err}`,
+					});
+				}
+			},
+			setInspectValModule(checkItem) {
+				console.log("checkItem: ", checkItem);
+				if (!checkItem.HAnalysisMethod || !checkItem.HSampleSchemeID) {
+					return;
+				}
+				// 鍖哄垎妫�楠屽�奸〉绛惧拰闈欐�侀〉绛撅紝妫�楠屽�奸〉绛剧殑id浠寮�澶�
+				this.$set(this.InspectModules, `_${checkItem.num}`, {
+					id: `_${checkItem.num}`,
+					checkItemId: checkItem.num,
+				});
+				console.log(" this.arrayAnalysisMethod: ", checkItem.HAnalysisMethod);
+				let analysisMethodName = this.arrayAnalysisMethod.find(
+					(e) => e.value == checkItem.HAnalysisMethod
+				).name;
+				this.$set(this.subTabs, `_${checkItem.num}`, {
+					id: `_${checkItem.num}`,
+					name: `${analysisMethodName}-${checkItem.HQCCheckItemName}`,
+				});
+			},
+			InspectValueUpdate(e) {
+				console.log("e: ", e);
+				let {
+					data,
+					list
+				} = e;
+				this.checkItems[data.num] = Object.assign(this.checkItems[data.num], data);
+				this.$set(this.InspectValues, `${data.num}`, list);
+			},
+			// 甯﹀嚭妫�楠岄」鐩�
+			async get_CheckItem() {
+				// 棣栧厛娓呯┖妫�楠岄」鐩� 鍜� 妫�楠屽��
+				this.checkItems = {}
+				for (let key in this.subTabs) {
+					if (key.substring(1) == "_") {
+						this.$delete(this.subTabs, key)
+					}
+				}
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Web/GetCheckItemByCheckProjectID_Sec",
+						data: {
+							CheckProjectID: this.hform.HQCSchemeID || 0,
+							HBatchQty: this.hform.HProcExchQty || 0,
+							HMaterID: this.hform.HMaterID,
+							HBillType: '棣栦欢妫�鏂规'
+						},
+					});
 
-                            this.addCheckItem(checkItem);
-                        }
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${Message} `,
-                        });
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${err} `,
-                    });
-                }
-            },
-            async getMaxBillNo() {
-                try {
-                    let res = await CommonUtils.doRequest2Sync({
-                        url: "/Web/GetMAXNum",
-                        data: {
-                            HBillType: "7505",
-                        },
-                    });
+					let {
+						data,
+						count,
+						Message
+					} = res.data;
 
-                    if (!res) {
-                        return;
-                    }
+					if (count == 1) {
+						for (var i = 0; i < data.length; i++) {
+							let checkItem = {
+								HQCCheckItemID: data[i]["HQCCheckItemID"],
+								HQCCheckItemNumber: data[i]["妫�楠岄」鐩唬鐮�"],
+								HQCCheckItemName: data[i]["妫�楠岄」鐩�"],
+								HInspectInstruMentID: data[i]["HInspectInstruMentID"],
+								HInspectInstruMentNumber: data[i]["妫�楠屼华鍣ㄤ唬鐮�"],
+								HInspectInstruMentName: data[i]["妫�楠屼华鍣�"],
+								HQCStd: data[i]["HQCStd"],
+								HUnit: data[i]["鍗曚綅鍚嶇О"],
+								HQCNote: "",
+								HAnalysisMethod: data[i]["鍒嗘瀽鏂规硶"],
+								HResult: data[i]["HResult"],
+								HMax: "",
+								HMin: "",
+								HAvg: "",
+								HRemark: "",
+								HKeyInspect: data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false,
+								HStatus: 0,
+								HSampleSchemeID: data[i]["HSampleSchemeID"],
+								HUnitID: data[i]["HUnitID"],
+								HInspectVal: "",
+								HTargetVal: "",
+								HUpLimit: data[i].涓婇檺鍊�,
+								HDownLimit: data[i].涓嬮檺鍊�,
+								HUpOffSet: "",
+								HDownOffSet: "",
+								HSampleDamageQty: "0",
+								HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
+								HSampleQty: data[i].鏍锋湰閲�,
+								HAcceptQty: data[i].鍏佽鏁�,
+								HInspectionLevel: data[i].妫�楠屾按骞�,
+								HRejectQty: data[i].鎷掔粷鏁�,
+								HStrictness: data[i].涓ユ牸搴�,
+								HSampleUnRightQty: 0,
+								HAQL: data[i].AQL,
+								HSamplingType: data[i].鎶芥牱绫诲瀷,
+								HCompareSymbol: data[i].姣旇緝绗�,
+								HTargetVal: data[i].鐩爣鍊� || 0,
+							};
 
-                    let {
-                        data,
-                        Message,
-                        count
-                    } = res.data;
-                    if (count == 1) {
-                        this.hform.HInterID = data[0].HInterID;
-                        this.hform.HBillNo = data[0].HBillNo;
-                    } else {
-                        throw Message;
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: "鑾峰彇鍗曟嵁鍙峰紓甯�: " + err,
-                    });
-                }
-            },
-            // 妫�楠屽�艰繑鍥炲��
-            InspectValueComplete(e) {
-                console.log("e: ", e);
-                let key = e.num;
-                e.HStatus = e.HStatus ? 1 : 0
-                if (e.HResult2 == '') {
-                    e.HResult2 = this.checkItems[key].HResult
-                }
-                Object.assign(this.checkItems[key], e);
-                this.checkItems[key].HInspectResultToSee = this.checkItems[key].HResult2;
-                this.checkItems[key].HResult = this.checkItems[key].HResult2 == '鍚堟牸' ? 1 : 2;
+							this.addCheckItem(checkItem);
+						}
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${Message} `,
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${err} `,
+					});
+				}
+			},
+			async getMaxBillNo() {
+				try {
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Web/GetMAXNum",
+						data: {
+							HBillType: "7505",
+						},
+					});
 
-                this.HCheckLastResult();
+					if (!res) {
+						return;
+					}
 
-            },
-            checkSubmitValidate() {
-                // if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
-                // 	CommonUtils.showTips({
-                // 		message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
-                // 	});
-                // 	return false;
-                // }
+					let {
+						data,
+						Message,
+						count
+					} = res.data;
+					if (count == 1) {
+						this.hform.HInterID = data[0].HInterID;
+						this.hform.HBillNo = data[0].HBillNo;
+					} else {
+						throw Message;
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鑾峰彇鍗曟嵁鍙峰紓甯�: " + err,
+					});
+				}
+			},
+			// 妫�楠屽�艰繑鍥炲��
+			InspectValueComplete(e) {
+				console.log("e: ", e);
+				let key = e.num;
+				e.HStatus = e.HStatus ? 1 : 0
+				if (e.HResult2 == '') {
+					e.HResult2 = this.checkItems[key].HResult
+				}
+				Object.assign(this.checkItems[key], e);
+				this.checkItems[key].HInspectResultToSee = this.checkItems[key].HResult2;
+				this.checkItems[key].HResult = this.checkItems[key].HResult2 == '鍚堟牸' ? 1 : 2;
 
-                if (this.hform.HFirstCheckEmp == 0) {
-                    CommonUtils.showTips({
-                        message: "妫�楠屽憳鏈�夋嫨锛�",
-                    });
-                    return false;
-                }
+				this.HCheckLastResult();
 
-                for (let key in this.checkItems) {
-                    if (!this.checkItems[key].HQCCheckItemID) {
-                        CommonUtils.showTips({
-                            message: `绗�${this.checkItems[key].num}琛屾楠岄」鐩笉鑳戒负绌�!`,
-                        });
-                        return false;
-                    }
+			},
+			checkSubmitValidate() {
+				// if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
+				// 	CommonUtils.showTips({
+				// 		message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
+				// 	});
+				// 	return false;
+				// }
 
-                    if (
-                        this.checkItems[key].HSampleSchemeID == "" ||
-                        this.checkItems[key].HSampleSchemeID == null
-                    ) {
-                        this.checkItems[key].HSampleSchemeID = 0;
-                    }
-                    if (
-                        this.checkItems[key].HSampleQty == "" ||
-                        this.checkItems[key].HSampleQty == null
-                    ) {
-                        this.checkItems[key].HSampleQty = 0;
-                    }
-                    if (
-                        this.checkItems[key].HSampleDamageQty == "" ||
-                        this.checkItems[key].HSampleDamageQty == null
-                    ) {
-                        this.checkItems[key].HSampleDamageQty = 0;
-                    }
-                    if (
-                        this.checkItems[key].HAcceptQty == "" ||
-                        this.checkItems[key].HAcceptQty == null
-                    ) {
-                        this.checkItems[key].HAcceptQty = 0;
-                    }
-                    if (
-                        this.checkItems[key].HRejectQty == "" ||
-                        this.checkItems[key].HRejectQty == null
-                    ) {
-                        this.checkItems[key].HRejectQty = 0;
-                    }
-                    if (
-                        this.checkItems[key].HSampleUnRightQty == "" ||
-                        this.checkItems[key].HSampleUnRightQty == 0
-                    ) {
-                        this.checkItems[key].HSampleUnRightQty = 0;
-                    }
-                    if (this.checkItems[key].HUnitID == "") {
-                        this.checkItems[key].HUnitID = 0;
-                    }
-                }
+				if (this.hform.HFirstCheckEmp == 0) {
+					CommonUtils.showTips({
+						message: "妫�楠屽憳鏈�夋嫨锛�",
+					});
+					return false;
+				}
 
-                return true;
-            },
-            async submit() {
-                if (!this.checkSubmitValidate()) {
-                    return;
-                }
-                try {
-                    console.log('this.$refs: ', this.$refs);
-                    // 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
-                    if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules
-                        .length > 0) {
-                        // 鍔犺浇鏈夋楠屽�兼ā鍧�
-                        await this.$refs.InspectValueModules[0].set_SaveValue();
-                        this.InspectValues[0] = this.$refs.InspectValueModules[0].InSpectValues;
-                        await this.InspectValueComplete(this.$refs.InspectValueModules[0].checkData)
-                    }
-                    let InspectValuesTrans = [];
-                    let HInterID = this.hform.HInterID;
-                    for (let key in this.InspectValues) {
-                        let HEntryID = key;
+				for (let key in this.checkItems) {
+					if (!this.checkItems[key].HQCCheckItemID) {
+						CommonUtils.showTips({
+							message: `绗�${this.checkItems[key].num}琛屾楠岄」鐩笉鑳戒负绌�!`,
+						});
+						return false;
+					}
 
-                        InspectValuesTrans.push(
-                            `${JSON.stringify(this.InspectValues[key])}`
-                        );
-                    }
-                    let checkItemsArray = [];
-                    for (var key in this.checkItems) {
-                        let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]))
-                        delete checkItem.data
-                        checkItemsArray.push(checkItem);
-                    }
-                    console.log('checkItemsArray: ', checkItemsArray);
-                    let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(
-          checkItemsArray
-        )};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0]}`;
-                    console.log("this.checkItems: ", this.checkItems);
+					if (
+						this.checkItems[key].HSampleSchemeID == "" ||
+						this.checkItems[key].HSampleSchemeID == null
+					) {
+						this.checkItems[key].HSampleSchemeID = 0;
+					}
+					if (
+						this.checkItems[key].HSampleQty == "" ||
+						this.checkItems[key].HSampleQty == null
+					) {
+						this.checkItems[key].HSampleQty = 0;
+					}
+					if (
+						this.checkItems[key].HSampleDamageQty == "" ||
+						this.checkItems[key].HSampleDamageQty == null
+					) {
+						this.checkItems[key].HSampleDamageQty = 0;
+					}
+					if (
+						this.checkItems[key].HAcceptQty == "" ||
+						this.checkItems[key].HAcceptQty == null
+					) {
+						this.checkItems[key].HAcceptQty = 0;
+					}
+					if (
+						this.checkItems[key].HRejectQty == "" ||
+						this.checkItems[key].HRejectQty == null
+					) {
+						this.checkItems[key].HRejectQty = 0;
+					}
+					if (
+						this.checkItems[key].HSampleUnRightQty == "" ||
+						this.checkItems[key].HSampleUnRightQty == 0
+					) {
+						this.checkItems[key].HSampleUnRightQty = 0;
+					}
+					if (this.checkItems[key].HUnitID == "") {
+						this.checkItems[key].HUnitID = 0;
+					}
+				}
 
-                    let res = await CommonUtils.doRequest2Sync({
-                        url: "/QC_FirstPieceCheckBill/set_SaveBill",
-                        data: {
-                            sMainSub: sMainSub,
-                        },
-                        method: "POST",
-                    });
+				return true;
+			},
+			async submit() {
+				if (!this.checkSubmitValidate()) {
+					return;
+				}
+				try {
+					console.log('this.$refs: ', this.$refs);
+					// 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
+					if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules
+						.length > 0) {
+						// 鍔犺浇鏈夋楠屽�兼ā鍧�
+						await this.$refs.InspectValueModules[0].set_SaveValue();
+						this.InspectValues[0] = this.$refs.InspectValueModules[0].InSpectValues;
+						await this.InspectValueComplete(this.$refs.InspectValueModules[0].checkData)
+					}
+					let InspectValuesTrans = [];
+					let HInterID = this.hform.HInterID;
+					for (let key in this.InspectValues) {
+						let HEntryID = key;
 
-                    if (!res) {
-                        return;
-                    }
+						InspectValuesTrans.push(
+							`${JSON.stringify(this.InspectValues[key])}`
+						);
+					}
+					let checkItemsArray = [];
+					for (var key in this.checkItems) {
+						let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]))
+						delete checkItem.data
+						checkItemsArray.push(checkItem);
+					}
+					console.log('checkItemsArray: ', checkItemsArray);
+					let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(checkItemsArray)};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0]}`;
+					console.log("this.checkItems: ", this.checkItems);
 
-                    let {
-                        count,
-                        Message,
-                        data
-                    } = res.data;
-                    if (count == 1) {
-                        uni.showModal({
-                            title: "鎻愮ず",
-                            content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
-                            success: (res) => {
-                                if (res.confirm) {
-                                    console.log("鐢ㄦ埛鐐瑰嚮纭畾");
-                                    uni.redirectTo({
-                                        url: "/pages/ZLGL/shoujianjianyan/form?operationType=1",
-                                    });
-                                } else if (res.cancel) {
-                                    console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
-                                    // setTimeout(() => {
-                                    //     uni.navigateBack();
-                                    // }, 50)
-                                }
-                            },
-                        });
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `棣栦欢妫�楠屽崟淇濆瓨閿欒: ${Message}`,
-                        });
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `棣栦欢妫�楠屽崟淇濆瓨閿欒: ${err}`,
-                    });
-                }
-            },
-            addNew() {
-                uni.redirectTo({
-                    url: "/pages/ZLGL/shoujianjianyan/firstCheckBill?operationType=1",
-                });
-            },
-            goBack() {
-                uni.navigateBack();
-            },
-            async RoadBillMain() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBill_Edit",
-                        data: {
-                            sWhere: ` and hmainid=${this.hform.HInterID}`,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/QC_FirstPieceCheckBill/set_SaveBill",
+						data: {
+							sMainSub: sMainSub,
+						},
+						method: "POST",
+					});
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data;
+					if (!res) {
+						return;
+					}
 
-                    if (count == 1) {
-                        console.log("RoadBillMain: : ", data);
-                        Object.assign(this.hform, {
-                            HInterID: data[0].hmainid,
-                            HBillNo: data[0].鍗曟嵁鍙�,
-                            HDate: dayjs(data[0].鏃ユ湡).format("YYYY-MM-DD"),
-                            HSourceID: data[0].HSourceID,
-                            HSourceName: data[0].鐢熶骇璧勬簮鍚嶇О,
-                            HICMOBillNo: data[0].浠诲姟鍗曞彿,
-                            HICMOQty: data[0].浠诲姟鍗曟暟閲�,
-                            HICMOInterID: data[0].HICMOInterID,
-                            HICMOEntryID: data[0].HICMOEntryID || 1,
-                            HMaterID: data[0].HMaterID,
-                            HMaterName: data[0].鐗╂枡鍚嶇О,
-                            HMaterNumber: data[0].鐗╂枡浠ｇ爜,
-                            HProcID: data[0].HProcID,
-                            HProcName: data[0].HProcName,
-                            HProcExchQty: data[0].HProcExchQty || 0,
-                            HProcExchBillNo: data[0].HProcExchBillNo,
-                            HProcExchInterID: data[0].HProcExchInterID,
-                            HProcExchEntryID: data[0].HProcExchEntryID || 0,
-                            HFirstCheckEmp: data[0].HFirstCheckEmp,
-                            HFirstCheckEmpName: data[0].璐ㄦ鍛樺悕绉�,
-                            HQCSchemeID: data[0].妫�楠屾柟妗圛D,
-                            HQCSchemeName: data[0].妫�楠屾柟妗堝悕绉�,
-                            HRemark: data[0].琛ㄥご澶囨敞,
-                            HMaker: data[0].鍒跺崟浜�,
-                            HMakeDate: data[0].鍒跺崟鏃ユ湡,
-                            HChecker: data[0].瀹℃牳浜�,
-                            HCheckDate: data[0].瀹℃牳鏃ユ湡,
-                            HCloseMan: data[0].鍏抽棴浜�,
-                            HCloseDate: data[0].鍏抽棴鏃ユ湡,
-                            HUpDateDate: data[0].淇敼鏃ユ湡,
-                            HDeleteDate: data[0].浣滃簾鏃ユ湡,
-                            HSampleSchemeID: data[0].HSampleSchemeID,
-                            HSampleSchemeName: data[0].鎶芥牱鏂规鍚嶇О,
-                            HSampleQty: data[0].鏍锋湰閲�,
-                            HSampleQty2: data[0].鏍锋湰閲�,
-                            HSampleDamageQty: data[0].鏍锋湰鐮村潖鏁�,
-                            HSamplingType: data[0].鎶芥牱绫诲瀷,
-                            HAcceptQty: data[0].鍏佽鏁�,
-                            HInspectionLevel: data[0].妫�楠屾按骞�,
-                            HRejectQty: data[0].鎷掔粷鏁�,
-                            HStrictness: data[0].涓ユ牸搴�,
-                            HSampleUnRightQty: data[0].鏍锋湰涓嶅悎鏍兼暟 || 0,
-                            HSampleUnRightQty2: data[0].鏍锋湰涓嶅悎鏍兼暟,
-                            HAQL: data[0].AQL,
-                            HUnitID: data[0].HUnitID,
-                            HUnit: data[0].鍗曚綅,
-                            HInspectValB: data[0].妫�娴嬪�煎熀纭�璧勬枡,
-                            HInspectVal: data[0].妫�娴嬪��,
-                            HTargetValB: data[0].鐩爣鍊煎熀纭�璧勬枡,
-                            HTargetVal: data[0].鐩爣鍊�,
-                            HUpLimit: data[0].涓婇檺鍊�,
-                            HDownLimit: data[0].涓嬮檺鍊�,
-                            HUpOffSet: data[0].涓婂亸宸�,
-                            HDownOffSet: data[0].涓嬪亸宸�,
-                            HEntryID: data[0].hsubid,
-                            HQCCheckItemName: data[0].妫�楠岄」鐩悕绉�,
-                            HQCCheckItemID: data[0].HQCCheckItemID,
-                            HShiftsID: data[0].HShiftsID,
-                            HShiftsName: data[0].鐝鍚嶇О,
-                            HErrTreatment: data[0].寮傚父涓存椂澶勭悊鏂规,
-                            HBatchNo: data[0].鎵瑰彿,
-                            HLastResult: data[0].鍒ゅ畾缁撹 == "鍚堟牸" ? true : false,
-                            HTakeSampleCheckBillID: data[0].HTakeSampleCheckBillID,
-                            HTakeSampleCheckBillNo: data[0].HTakeSampleCheckBillNo,
-                            HAnalysisMethod: function() {
-                                if (data[0].HAnalysisMethod == 1) {
-                                    return '瀹氭�ф楠�'
-                                } else if (data[0].HAnalysisMethod == 2) {
-                                    return '瀹氶噺妫�楠�'
-                                } else {
-                                    return '鍏朵粬妫�楠�'
-                                }
-                            }(),
-                        });
+					let {
+						count,
+						Message,
+						data
+					} = res.data;
+					if (count == 1) {
+						uni.showModal({
+							title: "鎻愮ず",
+							content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
+							success: (res) => {
+								if (res.confirm) {
+									console.log("鐢ㄦ埛鐐瑰嚮纭畾");
+									uni.redirectTo({
+										url: "/pages/ZLGL/shoujianjianyan/form?operationType=1",
+									});
+								} else if (res.cancel) {
+									console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
+									// setTimeout(() => {
+									//     uni.navigateBack();
+									// }, 50)
+								}
+							},
+						});
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `棣栦欢妫�楠屽崟淇濆瓨閿欒: ${Message}`,
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `棣栦欢妫�楠屽崟淇濆瓨閿欒: ${err}`,
+					});
+				}
+			},
+			addNew() {
+				uni.redirectTo({
+					url: "/pages/ZLGL/shoujianjianyan/firstCheckBill?operationType=1",
+				});
+			},
+			goBack() {
+				uni.navigateBack();
+			},
+			async RoadBillMain() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBill_Edit",
+						data: {
+							sWhere: ` and hmainid=${this.hform.HInterID}`,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                        for (let i = 0; i < data.length; i++) {
-                            this.addCheckItem({
-                                HQCCheckItemID: data[i].HQCCheckItemID,
-                                HQCCheckItemNumber: data[i].妫�楠岄」鐩唬鐮�,
-                                HQCCheckItemName: data[i].妫�楠岄」鐩悕绉�,
-                                HInspectInstruMentID: data[i].HInspectInstruMentID,
-                                HInspectInstruMentNumber: data[i].妫�楠屼华鍣ㄤ唬鐮�,
-                                HInspectInstruMentName: data[i].妫�楠屼华鍣ㄥ悕绉�,
-                                HQCStd: data[i].妫�楠屾爣鍑�,
-                                HUnit: data[i].鍗曚綅鍚嶇О,
-                                HQCNote: data[i].妫�楠岃褰�,
-                                HResult: data[i].缁撹 == "鍚堟牸" ? 1 : 0,
-                                HMax: data[i].鏈�澶у��,
-                                HMin: data[i].鏈�灏忓��,
-                                HAvg: data[i].骞冲潎鍊�,
-                                HRemark: data[i].琛ㄤ綋澶囨敞,
-                                HAnalysisMethod: data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ?
-                                    1 : data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ?
-                                    2 : 3,
-                                HKeyInspect: data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
-                                HSampleSchemeID: data[i].HSampleSchemeID,
-                                HUnitID: data[i].HUnitID,
-                                HInspectVal: data[i].妫�娴嬪��,
-                                HTargetVal: data[i].鐩爣鍊�,
-                                HUpLimit: data[i].涓婇檺鍊�,
-                                HDownLimit: data[i].涓嬮檺鍊�,
-                                HUpOffSet: data[i].涓婂亸宸�,
-                                HDownOffSet: data[i].涓嬪亸宸�,
-                                HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
-                                HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
-                                HSampleQty: data[i].鏍锋湰閲�,
-                                HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
-                                HAcceptQty: data[i].鍏佽鏁�,
-                                HInspectionLevel: 0,
-                                HRejectQty: data[i].鎷掔粷鏁�,
-                                HStrictness: 0,
-                                HSampleUnRightQty: data[i].鏍锋湰涓嶅悎鏍兼暟,
-                                HAQL: data[i].AQL,
-                                HSamplingType: 0,
-                                HSamplingType: data[i].鎶芥牱绫诲瀷,
-                                HStrictness: data[i].涓ユ牸搴�,
-                                HInspectResultToSee: data[i].妫�楠岀粨鏋�
-                            });
-                        }
+					let {
+						data,
+						count,
+						Message
+					} = res.data;
 
-                        this.hasSourceBill = true
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鍔犺浇鍗曟嵁澶辫触: ${Message}`,
-                        });
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鍔犺浇鍗曟嵁澶辫触: ${err}`,
-                    });
-                }
-            },
-        },
-        async onLoad(e) {
-            this.operationType = e.operationType || 1;
-            this.hform.HInterID = e.linterid || 0;
-            if (this.operationType == 1) {
-                await this.getMaxBillNo();
-            } else if (this.operationType == 2) {} else if (this.operationType == 3) {
-                await this.RoadBillMain();
-            }
+					if (count == 1) {
+						console.log("RoadBillMain: : ", data);
+						Object.assign(this.hform, {
+							HInterID: data[0].hmainid,
+							HBillNo: data[0].鍗曟嵁鍙�,
+							HDate: dayjs(data[0].鏃ユ湡).format("YYYY-MM-DD"),
+							HSourceID: data[0].HSourceID,
+							HSourceName: data[0].鐢熶骇璧勬簮鍚嶇О,
+							HICMOBillNo: data[0].浠诲姟鍗曞彿,
+							HICMOQty: data[0].浠诲姟鍗曟暟閲�,
+							HICMOInterID: data[0].HICMOInterID,
+							HICMOEntryID: data[0].HICMOEntryID || 1,
+							HMaterID: data[0].HMaterID,
+							HMaterName: data[0].鐗╂枡鍚嶇О,
+							HMaterNumber: data[0].鐗╂枡浠ｇ爜,
+							HProcID: data[0].HProcID,
+							HProcName: data[0].HProcName,
+							HProcExchQty: data[0].HProcExchQty || 0,
+							HProcExchBillNo: data[0].HProcExchBillNo,
+							HProcExchInterID: data[0].HProcExchInterID,
+							HProcExchEntryID: data[0].HProcExchEntryID || 0,
+							HFirstCheckEmp: data[0].HFirstCheckEmp,
+							HFirstCheckEmpName: data[0].璐ㄦ鍛樺悕绉�,
+							HQCSchemeID: data[0].妫�楠屾柟妗圛D,
+							HQCSchemeName: data[0].妫�楠屾柟妗堝悕绉�,
+							HRemark: data[0].琛ㄥご澶囨敞,
+							HMaker: data[0].鍒跺崟浜�,
+							HMakeDate: data[0].鍒跺崟鏃ユ湡,
+							HChecker: data[0].瀹℃牳浜�,
+							HCheckDate: data[0].瀹℃牳鏃ユ湡,
+							HCloseMan: data[0].鍏抽棴浜�,
+							HCloseDate: data[0].鍏抽棴鏃ユ湡,
+							HUpDateDate: data[0].淇敼鏃ユ湡,
+							HDeleteDate: data[0].浣滃簾鏃ユ湡,
+							HSampleSchemeID: data[0].HSampleSchemeID,
+							HSampleSchemeName: data[0].鎶芥牱鏂规鍚嶇О,
+							HSampleQty: data[0].鏍锋湰閲�,
+							HSampleQty2: data[0].鏍锋湰閲�,
+							HSampleDamageQty: data[0].鏍锋湰鐮村潖鏁�,
+							HSamplingType: data[0].鎶芥牱绫诲瀷,
+							HAcceptQty: data[0].鍏佽鏁�,
+							HInspectionLevel: data[0].妫�楠屾按骞�,
+							HRejectQty: data[0].鎷掔粷鏁�,
+							HStrictness: data[0].涓ユ牸搴�,
+							HSampleUnRightQty: data[0].鏍锋湰涓嶅悎鏍兼暟 || 0,
+							HSampleUnRightQty2: data[0].鏍锋湰涓嶅悎鏍兼暟,
+							HAQL: data[0].AQL,
+							HUnitID: data[0].HUnitID,
+							HUnit: data[0].鍗曚綅,
+							HInspectValB: data[0].妫�娴嬪�煎熀纭�璧勬枡,
+							HInspectVal: data[0].妫�娴嬪��,
+							HTargetValB: data[0].鐩爣鍊煎熀纭�璧勬枡,
+							HTargetVal: data[0].鐩爣鍊�,
+							HUpLimit: data[0].涓婇檺鍊�,
+							HDownLimit: data[0].涓嬮檺鍊�,
+							HUpOffSet: data[0].涓婂亸宸�,
+							HDownOffSet: data[0].涓嬪亸宸�,
+							HEntryID: data[0].hsubid,
+							HQCCheckItemName: data[0].妫�楠岄」鐩悕绉�,
+							HQCCheckItemID: data[0].HQCCheckItemID,
+							HShiftsID: data[0].HShiftsID,
+							HShiftsName: data[0].鐝鍚嶇О,
+							HErrTreatment: data[0].寮傚父涓存椂澶勭悊鏂规,
+							HBatchNo: data[0].鎵瑰彿,
+							HLastResult: data[0].鍒ゅ畾缁撹 == "鍚堟牸" ? true : false,
+							HTakeSampleCheckBillID: data[0].HTakeSampleCheckBillID,
+							HTakeSampleCheckBillNo: data[0].HTakeSampleCheckBillNo,
+							HAnalysisMethod: function() {
+								if (data[0].HAnalysisMethod == 1) {
+									return '瀹氭�ф楠�'
+								} else if (data[0].HAnalysisMethod == 2) {
+									return '瀹氶噺妫�楠�'
+								} else {
+									return '鍏朵粬妫�楠�'
+								}
+							}(),
+						});
 
-            await this.InitHSource();
-            await this.InitHWorkShift();
-            await this.InitHEmp();
+						for (let i = 0; i < data.length; i++) {
+							this.addCheckItem({
+								HQCCheckItemID: data[i].HQCCheckItemID,
+								HQCCheckItemNumber: data[i].妫�楠岄」鐩唬鐮�,
+								HQCCheckItemName: data[i].妫�楠岄」鐩悕绉�,
+								HInspectInstruMentID: data[i].HInspectInstruMentID,
+								HInspectInstruMentNumber: data[i].妫�楠屼华鍣ㄤ唬鐮�,
+								HInspectInstruMentName: data[i].妫�楠屼华鍣ㄥ悕绉�,
+								HQCStd: data[i].妫�楠屾爣鍑�,
+								HUnit: data[i].鍗曚綅鍚嶇О,
+								HQCNote: data[i].妫�楠岃褰�,
+								HResult: data[i].缁撹 == "鍚堟牸" ? 1 : 0,
+								HMax: data[i].鏈�澶у��,
+								HMin: data[i].鏈�灏忓��,
+								HAvg: data[i].骞冲潎鍊�,
+								HRemark: data[i].琛ㄤ綋澶囨敞,
+								HAnalysisMethod: data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ?
+									1 : data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ?
+									2 : 3,
+								HKeyInspect: data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
+								HSampleSchemeID: data[i].HSampleSchemeID,
+								HUnitID: data[i].HUnitID,
+								HInspectVal: data[i].妫�娴嬪��,
+								HTargetVal: data[i].鐩爣鍊�,
+								HUpLimit: data[i].涓婇檺鍊�,
+								HDownLimit: data[i].涓嬮檺鍊�,
+								HUpOffSet: data[i].涓婂亸宸�,
+								HDownOffSet: data[i].涓嬪亸宸�,
+								HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
+								HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
+								HSampleQty: data[i].鏍锋湰閲�,
+								HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
+								HAcceptQty: data[i].鍏佽鏁�,
+								HInspectionLevel: 0,
+								HRejectQty: data[i].鎷掔粷鏁�,
+								HStrictness: 0,
+								HSampleUnRightQty: data[i].鏍锋湰涓嶅悎鏍兼暟,
+								HAQL: data[i].AQL,
+								HSamplingType: 0,
+								HSamplingType: data[i].鎶芥牱绫诲瀷,
+								HStrictness: data[i].涓ユ牸搴�,
+								HInspectResultToSee: data[i].妫�楠岀粨鏋�
+							});
+						}
+
+						this.hasSourceBill = true
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鍔犺浇鍗曟嵁澶辫触: ${Message}`,
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鍔犺浇鍗曟嵁澶辫触: ${err}`,
+					});
+				}
+			},
+		},
+		async onLoad(e) {
+			this.operationType = e.operationType || 1;
+			if (this.operationType == 1) {
+				await this.getMaxBillNo();
+			} else if (this.operationType == 2) {
+				//鏈夋簮鍗曚笅鎺�
+				await this.getMaxBillNo();
+				
+				if(e.HSouceBillType=="7521"){
+					if (uni.getStorageSync('Organization')  == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
+						this.HSourceBillType = "鍙栨牱鍗�"; // 鏄剧ず鍚嶇О
+						this.hform.HSourceBillType = "7521"; // 瀵瑰簲鐨勫��
+					}
+					this.hform.HTakeSampleCheckBillNo=e.HBillNo;
+					this.hform.HTakeSampleCheckBillID=e.linterid;
+					//鍙栨牱鍗曟煡璇㈡暟鎹�
+					await this.LoadingInformation_TakeSampleCheckBill(e.linterid);
+				}
+			} else if (this.operationType == 3) {
+				this.hform.HInterID = e.linterid || 0;
+				await this.RoadBillMain();
+			}
+
+			await this.InitHSource();
+			await this.InitHWorkShift();
+			await this.InitHEmp();
 			await this.loadCache();
-        },
-    };
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-    input {
-        width: inherit;
-        font-size: 26rpx;
-    }
-
-    .uni-input {
-        padding: 0;
-    }
-
-    .bill-main-tabs,
-    .bill-sub-tabs {
-        box-sizing: border-box;
-        width: 730rpx;
-        display: flex;
-        flex-direction: row;
-        flex-wrap: nowrap;
-        gap: 20rpx;
-        flex-shrink: 0;
-        overflow-x: auto;
-        border-bottom: 1px solid #ddd;
-        padding: 20rpx 10rpx;
-        white-space: nowrap;
-
-        view {
-            width: auto;
-            font-size: 26rpx;
-            color: #555;
-            text-align: center;
-            padding: 16rpx 0;
-        }
-
-        .selected {
-            color: #3a78ff;
-            font-weight: bold;
-            border-bottom: 3px solid #3a78ff;
-        }
-    }
-
-    .bill-main-content,
-    .bill-sub-content {
-        box-sizing: border-box;
-        padding: 0 30rpx 0 30rpx;
-        display: flex;
-        flex-direction: column;
-
-        .form-item {
-            width: 100%;
-            display: flex;
-            align-items: center;
-            font-size: 26rpx;
-            padding: 6rpx 0;
-
-            .left {
-                width: 208rpx;
-
-                text {
-                    color: red;
-                    font-weight: bold;
-                }
-            }
-
-            .right {
-                // width: 450rpx;
-                padding: 8rpx 20rpx;
-                font-size: 26rpx;
-                flex: 1;
-                border-radius: 22rpx;
-                border: 1px solid #acacac;
-
-                .uni-combox {
-                    padding: 0;
-                    height: auto;
-
-                    .uni-input-placeholder,
-                    .uni-input-input {
-                        font-size: 26rpx;
-                    }
-                }
-
-                .uni-combox::v-deep input {
-                    height: inherit;
-                    font-size: 26rpx;
-                }
-            }
-
-            .disabled {
-                border: 1px solid #e4e4e4;
-                background-color: #e4e4e4;
-            }
-
-            .none-border {
-                border: none;
-            }
-        }
-    }
-
-    .bottom-btn {
-        box-sizing: border-box;
-        width: 100%;
-        height: 120rpx;
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        background-color: #fff;
-        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
-        padding: 30rpx 40rpx 40rpx 40rpx;
-        display: flex;
-        flex-direction: row;
-        gap: 10rpx;
-
-        button {
-            border-radius: 50rpx;
-            width: 180rpx;
-            height: 66rpx;
-            line-height: 66rpx;
-            font-size: 28rpx;
-        }
-
-        .btn-a {
-            background-color: #3a78ff;
-            color: #fff;
-        }
-
-        .btn-b {
-            background-color: #41a863;
-            color: #fff;
-        }
-
-        .btn-c {
-            background-color: #acacac;
-            color: #fff;
-            // position: absolute;
-            // right: 120rpx;
-        }
-
-        .btn-d {
-            background-color: #ff8901;
-            color: #fff;
-        }
-    }
-
-    .buttons {
-        box-sizing: border-box;
-        width: 100%;
-        display: flex;
-        justify-content: center;
-        padding: 10rpx 0;
-
-        button {
-            border-radius: 50rpx;
-            width: 180rpx;
-            height: 66rpx;
-            line-height: 66rpx;
-            font-size: 26rpx;
-        }
-
-        .btn-a {
-            background-color: #acacac;
-            color: #fff;
-        }
-
-        .btn-b {
-            background-color: #41a863;
-            color: #fff;
-        }
-
-        .btn-c {
-            background-color: #3a78ff;
-            color: #fff;
-        }
-    }
-
-    .list {
-        width: 100%;
-
-        .card-detail {
-            width: 100%;
-            display: flex;
-            flex-wrap: wrap;
-            justify-content: space-between;
-            align-items: center;
-            line-height: 120%;
-            gap: 10rpx 0;
-
-            input {
-                font-size: 26rpx;
-            }
-
-            .detail {
-                // width: 50%;
-                box-sizing: border-box;
-                font-size: 26rpx;
-                color: #555;
-                padding-right: 20rpx;
-
-                text {
-                    color: #999;
-                    font-size: 26rpx;
-                }
-            }
-
-            .editable {
-                width: 50%;
-                display: inline-flex;
-                flex-direction: row;
-                align-items: center;
-
-                text {
-                    flex-shrink: 0;
-                }
-
-                .editable-input {
-                    border: 1px solid #acacac;
-                    border-radius: 5rpx;
-                    padding: 0 12rpx;
-                }
-            }
-        }
-    }
-
-    .icon-wrapper {
-        background-color: #3a78ff;
-        border-radius: 100%;
-        width: 40rpx;
-        height: 40rpx;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        flex-shrink: 0;
-
-        .uni-icons {
-            color: #fff !important;
-        }
-    }
-
-    .icon-wrapper-big {
-        background-color: #3a78ff;
-        border-radius: 100%;
-        width: 50rpx;
-        height: 50rpx;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        flex-shrink: 0;
-        margin-left: 20rpx;
-
-        .uni-icons {
-            color: #fff !important;
-        }
-    }
-
-    .more {
-        color: #888;
-        font-size: 22rpx;
-        display: flex;
-        border-top: 1px solid #eee;
-        padding-top: 10rpx;
-
-        .part {
-            width: 100%;
-            text-align: center;
-        }
-    }
-
-    .pass-background {
-        background-color: #cee3f2;
-        border: none;
-    }
-
-    .unpass-background {
-        background-color: #f0d6e3;
-        border: none;
-    }
-	.enable-icon-button {
-	    background-color: #3a78ff;
-	    padding: 6rpx;
-	    color: #fff;
-	    border-radius: 100%;
+	input {
+		width: inherit;
+		font-size: 26rpx;
 	}
-	
+
+	.uni-input {
+		padding: 0;
+	}
+
+	.bill-main-tabs,
+	.bill-sub-tabs {
+		box-sizing: border-box;
+		width: 730rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		gap: 20rpx;
+		flex-shrink: 0;
+		overflow-x: auto;
+		border-bottom: 1px solid #ddd;
+		padding: 20rpx 10rpx;
+		white-space: nowrap;
+
+		view {
+			width: auto;
+			font-size: 26rpx;
+			color: #555;
+			text-align: center;
+			padding: 16rpx 0;
+		}
+
+		.selected {
+			color: #3a78ff;
+			font-weight: bold;
+			border-bottom: 3px solid #3a78ff;
+		}
+	}
+
+	.bill-main-content,
+	.bill-sub-content {
+		box-sizing: border-box;
+		padding: 0 30rpx 0 30rpx;
+		display: flex;
+		flex-direction: column;
+
+		.form-item {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			font-size: 26rpx;
+			padding: 6rpx 0;
+
+			.left {
+				width: 208rpx;
+
+				text {
+					color: red;
+					font-weight: bold;
+				}
+			}
+
+			.right {
+				// width: 450rpx;
+				padding: 8rpx 20rpx;
+				font-size: 26rpx;
+				flex: 1;
+				border-radius: 22rpx;
+				border: 1px solid #acacac;
+
+				.uni-combox {
+					padding: 0;
+					height: auto;
+
+					.uni-input-placeholder,
+					.uni-input-input {
+						font-size: 26rpx;
+					}
+				}
+
+				.uni-combox::v-deep input {
+					height: inherit;
+					font-size: 26rpx;
+				}
+			}
+
+			.disabled {
+				border: 1px solid #e4e4e4;
+				background-color: #e4e4e4;
+			}
+
+			.none-border {
+				border: none;
+			}
+		}
+	}
+
+	.bottom-btn {
+		box-sizing: border-box;
+		width: 100%;
+		height: 120rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background-color: #fff;
+		box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+		padding: 30rpx 40rpx 40rpx 40rpx;
+		display: flex;
+		flex-direction: row;
+		gap: 10rpx;
+
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
+
+		.btn-a {
+			background-color: #3a78ff;
+			color: #fff;
+		}
+
+		.btn-b {
+			background-color: #41a863;
+			color: #fff;
+		}
+
+		.btn-c {
+			background-color: #acacac;
+			color: #fff;
+			// position: absolute;
+			// right: 120rpx;
+		}
+
+		.btn-d {
+			background-color: #ff8901;
+			color: #fff;
+		}
+	}
+
+	.buttons {
+		box-sizing: border-box;
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		padding: 10rpx 0;
+
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 26rpx;
+		}
+
+		.btn-a {
+			background-color: #acacac;
+			color: #fff;
+		}
+
+		.btn-b {
+			background-color: #41a863;
+			color: #fff;
+		}
+
+		.btn-c {
+			background-color: #3a78ff;
+			color: #fff;
+		}
+	}
+
+	.list {
+		width: 100%;
+
+		.card-detail {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			align-items: center;
+			line-height: 120%;
+			gap: 10rpx 0;
+
+			input {
+				font-size: 26rpx;
+			}
+
+			.detail {
+				// width: 50%;
+				box-sizing: border-box;
+				font-size: 26rpx;
+				color: #555;
+				padding-right: 20rpx;
+
+				text {
+					color: #999;
+					font-size: 26rpx;
+				}
+			}
+
+			.editable {
+				width: 50%;
+				display: inline-flex;
+				flex-direction: row;
+				align-items: center;
+
+				text {
+					flex-shrink: 0;
+				}
+
+				.editable-input {
+					border: 1px solid #acacac;
+					border-radius: 5rpx;
+					padding: 0 12rpx;
+				}
+			}
+		}
+	}
+
+	.icon-wrapper {
+		background-color: #3a78ff;
+		border-radius: 100%;
+		width: 40rpx;
+		height: 40rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-shrink: 0;
+
+		.uni-icons {
+			color: #fff !important;
+		}
+	}
+
+	.icon-wrapper-big {
+		background-color: #3a78ff;
+		border-radius: 100%;
+		width: 50rpx;
+		height: 50rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-shrink: 0;
+		margin-left: 20rpx;
+
+		.uni-icons {
+			color: #fff !important;
+		}
+	}
+
+	.more {
+		color: #888;
+		font-size: 22rpx;
+		display: flex;
+		border-top: 1px solid #eee;
+		padding-top: 10rpx;
+
+		.part {
+			width: 100%;
+			text-align: center;
+		}
+	}
+
+	.pass-background {
+		background-color: #cee3f2;
+		border: none;
+	}
+
+	.unpass-background {
+		background-color: #f0d6e3;
+		border: none;
+	}
+
+	.enable-icon-button {
+		background-color: #3a78ff;
+		padding: 6rpx;
+		color: #fff;
+		border-radius: 100%;
+	}
+
 	.disable-icon-button {
-	    background-color: lightgray;
-	    padding: 6rpx;
-	    color: #fff;
-	    border-radius: 100%;
-	    pointer-events: none;
+		background-color: lightgray;
+		padding: 6rpx;
+		color: #fff;
+		border-radius: 100%;
+		pointer-events: none;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
index ad56fad..f6327d8 100644
--- a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
+++ b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -1,2251 +1,2240 @@
 <template>
-    <view>
-        <!-- 涓昏〃鍖哄煙 -->
-        <view class="bill-main-area">
-            <!-- 涓昏〃椤电 -->
-            <view class="bill-main-tabs">
-                <view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">鍩烘湰淇℃伅</view>
-                <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍏朵粬淇℃伅</view>
-                <view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">鍒跺崟淇℃伅</view>
-            </view>
-            <!-- 涓昏〃鍐呭 -->
-            <view class="bill-main-contents">
-                <!-- 鍩烘湰淇℃伅 -->
-                <view class="bill-main-content" v-if="mainTabSelected == 1">
-                    <view class="form-item">
-                        <view class="left">鍗曟嵁鍙�</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HBillNo" disabled />
-                        </view>
-                    </view>
+	<view>
+		<!-- 涓昏〃鍖哄煙 -->
+		<view class="bill-main-area">
+			<!-- 涓昏〃椤电 -->
+			<view class="bill-main-tabs">
+				<view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">鍩烘湰淇℃伅</view>
+				<view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍏朵粬淇℃伅</view>
+				<view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">鍒跺崟淇℃伅</view>
+			</view>
+			<!-- 涓昏〃鍐呭 -->
+			<view class="bill-main-contents">
+				<!-- 鍩烘湰淇℃伅 -->
+				<view class="bill-main-content" v-if="mainTabSelected == 1">
+					<view class="form-item">
+						<view class="left">鍗曟嵁鍙�</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HBillNo" disabled />
+						</view>
+					</view>
 
-                    <view class="form-item">
-                        <view class="left">鏃ユ湡</view>
-                        <view class="right">
-                            <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HDate">
-                                <view>{{ hform.HDate }}</view>
-                            </uni-datetime-picker>
-                        </view>
-                    </view>
+					<view class="form-item">
+						<view class="left">鏃ユ湡</view>
+						<view class="right">
+							<uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HDate">
+								<view>{{ hform.HDate }}</view>
+							</uni-datetime-picker>
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">婧愬崟鍗曞彿</view>
+						<view class="right" :class="!hasSourceBill?'':'disabled'">
+							<input type="text" :disabled="hasSourceBill" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�"
+								v-model="hform.HSourceBillNo" @confirm="getSourceBillInfo(hform.HSourceBillNo)" />
+						</view>
+						<view class="icon-wrapper-big">
+							<uni-icons class="right-icon" type="scan"
+								style="background-color: #3a78ff;padding: 6rpx; color: #fff;border-radius: 100%;"
+								size="20" @click="toScanCode"></uni-icons>
+						</view>
+					</view>
 
-                    <view class="form-item">
-                        <view class="left">婧愬崟鍗曞彿</view>
-                        <view class="right" :class="!hasSourceBill?'':'disabled'">
-                            <input type="text" :disabled="hasSourceBill" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�"
-                                v-model="hform.HSourceBillNo" @confirm="getSourceBillInfo(hform.HSourceBillNo)" />
-                        </view>
-                        <view class="icon-wrapper-big">
-                            <uni-icons class="right-icon" type="scan" style="
-                  background-color: #3a78ff;
-                  padding: 6rpx;
-                  color: #fff;
-                  border-radius: 100%;
-                " size="20" @click="toScanCode"></uni-icons>
-                        </view>
-                    </view>
+					<view class="form-item">
+						<view class="left">浠诲姟鍗曞彿</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HICMOBillNo" disabled />
+						</view>
+						<view class="icon-wrapper-big"><uni-icons type="search" size="20"
+								@click="showSelectorModule(hform, 5)"></uni-icons></view>
+					</view>
+					<view class="form-item">
+						<view class="left">娴佽浆鍗″彿</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HProcExchBillNo" disabled />
+						</view>
+						<view class="icon-wrapper-big"><uni-icons type="search" size="20"
+								@click="showSelectorModule(hform, 6)"></uni-icons></view>
+					</view>
+					<view class="form-item">
+						<view class="left">浜у搧浠ｇ爜</view>
+						<view class="right disabled">
+							<input type="text" disabled :value="hform.HMaterNumber" />
+						</view>
+						<view class="icon-wrapper-big">
+							<uni-icons type="search" size="20" @click="showSelectorModule(hform, 4)"></uni-icons>
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">浜у搧鍚嶇О</view>
+						<view class="right disabled">
+							<input type="text" disabled :value="hform.HMaterName" />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">妫�楠屽憳</view>
+						<view class="right">
+							<uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="璇烽�夋嫨妫�楠屽憳"
+								v-model="hform.HFirstCheckEmpName"
+								@update:modelValue="HFirstCheckEmpChange"></uni-combox>
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">妫�楠屾柟妗�</view>
+						<view class="right disabled">
+							<input type="text" disabled :value="this.hform.HQCSchemeName" />
+						</view>
+						<view class="icon-wrapper-big"><uni-icons type="search" size="20"
+								@click="showSelectorModule(hform, 7)"></uni-icons></view>
+					</view>
 
-                    <view class="form-item">
-                        <view class="left">浠诲姟鍗曞彿</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HICMOBillNo" disabled />
-                        </view>
-                        <view class="icon-wrapper-big"><uni-icons type="search" size="20"
-                                @click="showSelectorModule(hform, 5)"></uni-icons></view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">娴佽浆鍗″彿</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HProcExchBillNo" disabled />
-                        </view>
-                        <view class="icon-wrapper-big"><uni-icons type="search" size="20"
-                                @click="showSelectorModule(hform, 6)"></uni-icons></view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">浜у搧浠ｇ爜</view>
-                        <view class="right disabled">
-                            <input type="text" disabled :value="hform.HMaterNumber" />
-                        </view>
-                        <view class="icon-wrapper-big">
-                            <uni-icons type="search" size="20" @click="showSelectorModule(hform, 4)"></uni-icons>
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">浜у搧鍚嶇О</view>
-                        <view class="right disabled">
-                            <input type="text" disabled :value="hform.HMaterName" />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">妫�楠屽憳</view>
-                        <view class="right">
-                            <uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="璇烽�夋嫨妫�楠屽憳"
-                                :v-model="hform.HFirstCheckEmpName"
-                                @update:modelValue="HFirstCheckEmpChange"></uni-combox>
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">妫�楠屾柟妗�</view>
-                        <view class="right disabled">
-                            <input type="text" disabled :value="this.hform.HQCSchemeName" />
-                        </view>
-                        <view class="icon-wrapper-big"><uni-icons type="search" size="20"
-                                @click="showSelectorModule(hform, 7)"></uni-icons></view>
-                    </view>
+					<view class="form-item">
+						<view class="left">鍒ゆ柇缁撹</view>
+						<view class="right none-border">
+							<radio-group @changer="checkResultChange">
+								<label>
+									<radio value="0" :checked="hform.HLastResult" /><text></text>
+									鍚堟牸
+								</label>
+								<view style="width: 20rpx; display: inline-block"></view>
+								<label>
+									<radio value="1" :checked="!hform.HLastResult" /><text></text>
+									涓嶅悎鏍�
+								</label>
+							</radio-group>
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">宸ュ簭</view>
+						<view class="right disabled">
+							<input type="text" disabled :value="hform.HProcName" />
+						</view>
+						<view class="icon-wrapper-big"><uni-icons type="search" size="20"
+								@click="showSelectorModule(hform, 8)"></uni-icons></view>
+					</view>
 
-                    <view class="form-item">
-                        <view class="left">鍒ゆ柇缁撹</view>
-                        <view class="right none-border">
-                            <radio-group @changer="checkResultChange">
-                                <label>
-                                    <radio value="0" :checked="hform.HLastResult" /><text></text>
-                                    鍚堟牸
-                                </label>
-                                <view style="width: 20rpx; display: inline-block"></view>
-                                <label>
-                                    <radio value="1" :checked="!hform.HLastResult" /><text></text>
-                                    涓嶅悎鏍�
-                                </label>
-                            </radio-group>
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">宸ュ簭</view>
-                        <view class="right disabled">
-                            <input type="text" disabled :value="hform.HProcName" />
-                        </view>
-                        <view class="icon-wrapper-big"><uni-icons type="search" size="20"
-                                @click="showSelectorModule(hform, 8)"></uni-icons></view>
-                    </view>
-                    
-                </view>
-                <!-- 鍏朵粬淇℃伅 -->
-                <view class="bill-main-content" v-if="mainTabSelected == 2">
-                    <view class="form-item">
-                        <view class="left">婧愬崟绫诲瀷</view>
-                        <view class="right" style="position: relative" :class="!hasSourceBill?'':'disabled'">
-                            <picker mode="selector" :range="HSourceBillTypeNameList" :disabled="hasSourceBill"
-                                @change="HSourceBillTypeNameChange">
-                                <input type="text" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" v-model="HSourceBillType" />
-                                <view class="picker-overlay"></view>
-                            </picker>
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">鐢熶骇璧勬簮</view>
-                        <view class="right">
-                            <uni-combox :candidates="GySourceNameList" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
-                                @update:modelValue="HSourceChange"></uni-combox>
-                        </view>
-                    </view>
-                    <!-- <view class="form-item">
-                            <view class="left">鐢熶骇鐝</view>
-                            <view class="right">
-                                <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
-                                    v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
-                            </view>
-                        </view>        -->
-                    <view class="form-item">
-                        <view class="left">鐢熶骇鐝</view>
-                        <view class="right">
-                            <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
-                                v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">寮傚父涓存椂澶勭悊鏂规</view>
-                        <view class="right">
-                            <input type="text" v-model="hform.HErrTreatment" value="" />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">浠诲姟鍗曟暟閲�</view>
-                        <view class="right">
-                            <input type="number" v-model="hform.HICMOQty" />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">娴佽浆鍗℃暟閲�</view>
-                        <view class="right">
-                            <input type="number" v-model="hform.HProcExchQty" />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">鎵瑰彿</view>
-                        <view class="right">
-                            <input type="text" v-model="hform.HBatchNo" />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">澶囨敞</view>
-                        <view class="right">
-                            <input type="text" v-model="hform.HRemark" value="" />
-                        </view>
-                    </view>
-                </view>
-                <!-- 鍒跺崟淇℃伅 -->
-                <view class="bill-main-content" v-if="mainTabSelected == 3">
-                    <view class="form-item">
-                        <view class="left">鍒跺崟浜�</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HMaker" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">鍒跺崟鏃ユ湡</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HMakeDate" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">瀹℃牳浜�</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HChecker" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">瀹℃牳鏃ユ湡</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HCheckDate" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">鍏抽棴浜�</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HCloseMan" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">鍏抽棴鏃ユ湡</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HCloseDate" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">淇敼浜�</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HUpDater" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">淇敼鏃ユ湡</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HUpDateDate" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">浣滃簾浜�</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HDeleteMan" disabled />
-                        </view>
-                    </view>
-                    <view class="form-item">
-                        <view class="left">浣滃簾鏃ユ湡</view>
-                        <view class="right disabled">
-                            <input type="text" :value="hform.HDeleteDate" disabled />
-                        </view>
-                    </view>
-                </view>
-            </view>
-        </view>
-        <!-- 瀛愯〃鍖哄煙 -->
-        <view class="bill-sub-area">
-            <!-- 瀛愯〃椤电 -->
-            <view class="bill-sub-tabs">
-                <view v-for="subTab in subTabs" :key="subTab.id" :class="subTab.id == subTabSelected ? 'selected' : ''"
-                    @tap="subTabSelected = subTab.id">{{ subTab.name }}</view>
-            </view>
-            <!-- 瀛愯〃鍐呭 -->
-            <view class="bill-main-contents">
-                <!-- 妫�楠岄」鐩� 鍛堢幇 -->
-                <view v-if="subTabSelected == 1">
-                    <!-- 闇�閫氳繃鏄惧紡璋冪敤蹇界暐$event鍙傛暟 -->
-                    <view class="buttons" @tap="addCheckItem()">
-                        <uni-icons type="plus" style="margin-right: 10rpx" size="22"></uni-icons>鏂板
-                    </view>
-                    <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
-                    <view class="list" v-else>
-                        <uni-card v-for="checkItem in checkItems" :key="checkItem.num">
-                            <view class="card-detail">
-                                <view class="detail"> <text>搴忓彿锛�</text>{{ checkItem.num }} </view>
-                                <view class="detail editable">
-                                    <view style="flex-shrink: 0"><text>妫�楠岄」鐩細</text></view>
-                                    <input type="text" :value="checkItem.HQCCheckItemName" disabled="" />
-                                    <view class="icon-wrapper"><uni-icons type="search" size="16"
-                                            @click="showSelectorModule(checkItem, 2)"></uni-icons></view>
-                                </view>
-                                <view class="detail editable">
-                                    <view style="flex-shrink: 0"><text>妫�楠屼华鍣細</text></view>
-                                    <input type="text" :value="checkItem.HInspectInstruMentName" disabled="" />
-                                    <view class="icon-wrapper"><uni-icons type="search" size="16"
-                                            @click="showSelectorModule(checkItem, 3)"></uni-icons></view>
-                                </view>
-                                <view class="detail editable">
-                                    <view><text>缁撹锛�</text></view>
-                                    <view style="width: 4em">
-                                        {{ checkItem.HResult == 1 ? "鍚堟牸" : "涓嶅悎鏍�" }}
-                                    </view>
-                                    <view>
-                                        <switch style="width: 2em; transform: scale(0.7)"
-                                            :checked="checkItem.HResult == 1"
-                                            @change="HResultChange(checkItem.num, $event)" />
-                                    </view>
-                                </view>
-                                <view class="detail editable" style="position: relative">
-                                    <view style="flex-shrink: 0"><text>鍒嗘瀽鏂规硶锛�</text></view>
-                                    <picker :range="arrayAnalysisMethod" range-key="name"
-                                        @change="HAnalysisMethodChange(checkItem.num, $event)">
-                                        <input disabled :value="getAnalysisMethodDisplay(checkItem.HAnalysisMethod)"
-                                            placeholder="璇烽�夋嫨" />
-                                        <view class="picker-overlay"></view>
-                                    </picker>
-                                </view>
-                                <view class="detail editable">
-                                    <view style="flex-shrink: 0"><text>閲嶇偣妫�鏌ワ細</text></view>
-                                    <view>
-                                        <switch type="checkbox" style="transform: scale(0.7)"
-                                            :checked="checkItem.HKeyInspect"
-                                            @change="HKeyInspectChange(checkItem, $event)" />
-                                    </view>
-                                </view>
-                                <view class="detail" v-if="checkItem.HQCStd">
-                                    <text>妫�楠屾爣鍑嗭細</text>{{ checkItem.HQCStd }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HUnit">
-                                    <text>鍗曚綅锛�</text>{{ checkItem.HUnit }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HQCStd">
-                                    <text>妫�楠屽�硷細</text>{{ checkItem.HQCStd }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HQCNote">
-                                    <text>妫�楠岃褰曪細</text>{{ checkItem.HQCNote }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HTargetVal">
-                                    <text>鐩爣鍊硷細</text>{{ checkItem.HTargetVal }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HUpLimit">
-                                    <text>涓婇檺鍊硷細</text>{{ checkItem.HUpLimit }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HDownLimit">
-                                    <text>涓嬮檺鍊硷細</text>{{ checkItem.HDownLimit }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HMax">
-                                    <text>鏈�澶у�硷細</text>{{ checkItem.HMax }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HMin">
-                                    <text>鏈�灏忓�硷細</text>{{ checkItem.HMin }}
-                                </view>
-                                <view class="detail" v-if="checkItem.HAvg">
-                                    <text>骞冲潎鍊硷細</text>{{ checkItem.HAvg }}
-                                </view>
-                            </view>
-                            <view style="height: 20rpx"></view>
-                            <view class="more">
-                                <view class="part" style="color: #da0000" @tap.stop="removeCheckItem(checkItem)">
-                                    <uni-icons type="trash" style="color: #da0000; margin-right: 10rpx"
-                                        size="18"></uni-icons>鍒犻櫎
-                                </view>
-                            </view>
-                        </uni-card>
-                    </view>
-                </view>
-                <!-- 鎶芥牱妫�楠� 鍛堢幇 -->
-                <view v-if="subTabSelected == 2">
-                    <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
-                    <view class="list" v-else>
-                        <uni-card v-for="SamplingItem in checkItems" :key="SamplingItem.num">
-                            <view class="card-detail">
-                                <view class="detail"> <text>搴忓彿锛�</text>{{ SamplingItem.num }} </view>
-                                <view class="detail editable">
-                                    <text>妫�楠岄」鐩細</text>{{ SamplingItem.HQCCheckItemName }}
-                                </view>
-                                <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
-                                <view class="detail editable" style="width: 100%">
-                                    <view style="flex-shrink: 0"><text>鎶芥牱鏂规锛�</text></view>
-                                    <input type="text" :value="SamplingItem.HSampleSchemeName" disabled />
-                                    <view class="icon-wrapper"><uni-icons type="search" size="16"
-                                            @click="showSelectorModule(SamplingItem, 1)"></uni-icons></view>
-                                </view>
-                                <view class="detail editable">
-                                    <text>鎶芥牱绫诲瀷锛�</text>{{ SamplingItem.HSamplingType }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>妫�楠屾按骞筹細</text>{{ SamplingItem.HInspectionLevel }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>涓ユ牸搴︼細</text>{{ SamplingItem.HStrictness }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>AQL锛�</text>{{ SamplingItem.HAQL }}
-                                </view>
-                                <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
-                                <view class="detail editable">
-                                    <text>鏍锋湰閲忥細</text>{{ SamplingItem.HSampleQty }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>鍏佽鏁帮細</text>{{ SamplingItem.HAcceptQty }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>鎷掔粷鏁帮細</text>{{ SamplingItem.HRejectQty }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>鏍锋湰涓嶅悎鏍兼暟锛�</text>{{ SamplingItem.HSampleUnRightQty }}
-                                </view>
-                                <view class="detail editable">
-                                    <text>鏍锋湰鐮村潖鏁帮細</text>
-                                    <view class="sampleDestory">
-                                        <input type="number" v-model="SamplingItem.HSampleDamageQty" />
-                                    </view>
-                                </view>
-                                <view class="detail editable">
-                                    <text>妫�楠岀粨鏋滐細</text>
-                                    <view style="border-radius: 15%; padding: 0 10rpx" :class="
+				</view>
+				<!-- 鍏朵粬淇℃伅 -->
+				<view class="bill-main-content" v-if="mainTabSelected == 2">
+					<view class="form-item">
+						<view class="left">婧愬崟绫诲瀷</view>
+						<view class="right" style="position: relative" :class="!hasSourceBill?'':'disabled'">
+							<picker mode="selector" :range="HSourceBillTypeNameList" :disabled="hasSourceBill"
+								@change="HSourceBillTypeNameChange">
+								<input type="text" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" v-model="HSourceBillType" />
+								<view class="picker-overlay"></view>
+							</picker>
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">鐢熶骇璧勬簮</view>
+						<view class="right">
+							<uni-combox :candidates="GySourceNameList" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
+								@update:modelValue="HSourceChange"></uni-combox>
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">鐢熶骇鐝</view>
+						<view class="right">
+							<uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
+								v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">寮傚父涓存椂澶勭悊鏂规</view>
+						<view class="right">
+							<input type="text" v-model="hform.HErrTreatment" value="" />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">浠诲姟鍗曟暟閲�</view>
+						<view class="right">
+							<input type="number" v-model="hform.HICMOQty" />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">娴佽浆鍗℃暟閲�</view>
+						<view class="right">
+							<input type="number" v-model="hform.HProcExchQty" />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">鎵瑰彿</view>
+						<view class="right">
+							<input type="text" v-model="hform.HBatchNo" />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">澶囨敞</view>
+						<view class="right">
+							<input type="text" v-model="hform.HRemark" value="" />
+						</view>
+					</view>
+				</view>
+				<!-- 鍒跺崟淇℃伅 -->
+				<view class="bill-main-content" v-if="mainTabSelected == 3">
+					<view class="form-item">
+						<view class="left">鍒跺崟浜�</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HMaker" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">鍒跺崟鏃ユ湡</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HMakeDate" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">瀹℃牳浜�</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HChecker" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">瀹℃牳鏃ユ湡</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HCheckDate" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">鍏抽棴浜�</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HCloseMan" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">鍏抽棴鏃ユ湡</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HCloseDate" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">淇敼浜�</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HUpDater" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">淇敼鏃ユ湡</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HUpDateDate" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">浣滃簾浜�</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HDeleteMan" disabled />
+						</view>
+					</view>
+					<view class="form-item">
+						<view class="left">浣滃簾鏃ユ湡</view>
+						<view class="right disabled">
+							<input type="text" :value="hform.HDeleteDate" disabled />
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 瀛愯〃鍖哄煙 -->
+		<view class="bill-sub-area">
+			<!-- 瀛愯〃椤电 -->
+			<view class="bill-sub-tabs">
+				<view v-for="subTab in subTabs" :key="subTab.id" :class="subTab.id == subTabSelected ? 'selected' : ''"
+					@tap="subTabSelected = subTab.id">{{ subTab.name }}</view>
+			</view>
+			<!-- 瀛愯〃鍐呭 -->
+			<view class="bill-main-contents">
+				<!-- 妫�楠岄」鐩� 鍛堢幇 -->
+				<view v-if="subTabSelected == 1">
+					<!-- 闇�閫氳繃鏄惧紡璋冪敤蹇界暐$event鍙傛暟 -->
+					<view class="buttons" @tap="addCheckItem()">
+						<uni-icons type="plus" style="margin-right: 10rpx" size="22"></uni-icons>鏂板
+					</view>
+					<view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
+					<view class="list" v-else>
+						<uni-card v-for="checkItem in checkItems" :key="checkItem.num">
+							<view class="card-detail">
+								<view class="detail"> <text>搴忓彿锛�</text>{{ checkItem.num }} </view>
+								<view class="detail editable">
+									<view style="flex-shrink: 0"><text>妫�楠岄」鐩細</text></view>
+									<input type="text" :value="checkItem.HQCCheckItemName" disabled="" />
+									<view class="icon-wrapper"><uni-icons type="search" size="16"
+											@click="showSelectorModule(checkItem, 2)"></uni-icons></view>
+								</view>
+								<view class="detail editable">
+									<view style="flex-shrink: 0"><text>妫�楠屼华鍣細</text></view>
+									<input type="text" :value="checkItem.HInspectInstruMentName" disabled="" />
+									<view class="icon-wrapper"><uni-icons type="search" size="16"
+											@click="showSelectorModule(checkItem, 3)"></uni-icons></view>
+								</view>
+								<view class="detail editable">
+									<view><text>缁撹锛�</text></view>
+									<view style="width: 4em">
+										{{ checkItem.HResult == 1 ? "鍚堟牸" : "涓嶅悎鏍�" }}
+									</view>
+									<view>
+										<switch style="width: 2em; transform: scale(0.7)"
+											:checked="checkItem.HResult == 1"
+											@change="HResultChange(checkItem.num, $event)" />
+									</view>
+								</view>
+								<view class="detail editable" style="position: relative">
+									<view style="flex-shrink: 0"><text>鍒嗘瀽鏂规硶锛�</text></view>
+									<picker :range="arrayAnalysisMethod" range-key="name"
+										@change="HAnalysisMethodChange(checkItem.num, $event)">
+										<input disabled :value="getAnalysisMethodDisplay(checkItem.HAnalysisMethod)"
+											placeholder="璇烽�夋嫨" />
+										<view class="picker-overlay"></view>
+									</picker>
+								</view>
+								<view class="detail editable">
+									<view style="flex-shrink: 0"><text>閲嶇偣妫�鏌ワ細</text></view>
+									<view>
+										<switch type="checkbox" style="transform: scale(0.7)"
+											:checked="checkItem.HKeyInspect"
+											@change="HKeyInspectChange(checkItem, $event)" />
+									</view>
+								</view>
+								<view class="detail" v-if="checkItem.HQCStd">
+									<text>妫�楠屾爣鍑嗭細</text>{{ checkItem.HQCStd }}
+								</view>
+								<view class="detail" v-if="checkItem.HUnit">
+									<text>鍗曚綅锛�</text>{{ checkItem.HUnit }}
+								</view>
+								<view class="detail" v-if="checkItem.HQCStd">
+									<text>妫�楠屽�硷細</text>{{ checkItem.HQCStd }}
+								</view>
+								<view class="detail" v-if="checkItem.HQCNote">
+									<text>妫�楠岃褰曪細</text>{{ checkItem.HQCNote }}
+								</view>
+								<view class="detail" v-if="checkItem.HTargetVal">
+									<text>鐩爣鍊硷細</text>{{ checkItem.HTargetVal }}
+								</view>
+								<view class="detail" v-if="checkItem.HUpLimit">
+									<text>涓婇檺鍊硷細</text>{{ checkItem.HUpLimit }}
+								</view>
+								<view class="detail" v-if="checkItem.HDownLimit">
+									<text>涓嬮檺鍊硷細</text>{{ checkItem.HDownLimit }}
+								</view>
+								<view class="detail" v-if="checkItem.HMax">
+									<text>鏈�澶у�硷細</text>{{ checkItem.HMax }}
+								</view>
+								<view class="detail" v-if="checkItem.HMin">
+									<text>鏈�灏忓�硷細</text>{{ checkItem.HMin }}
+								</view>
+								<view class="detail" v-if="checkItem.HAvg">
+									<text>骞冲潎鍊硷細</text>{{ checkItem.HAvg }}
+								</view>
+							</view>
+							<view style="height: 20rpx"></view>
+							<view class="more">
+								<view class="part" style="color: #da0000" @tap.stop="removeCheckItem(checkItem)">
+									<uni-icons type="trash" style="color: #da0000; margin-right: 10rpx"
+										size="18"></uni-icons>鍒犻櫎
+								</view>
+							</view>
+						</uni-card>
+					</view>
+				</view>
+				<!-- 鎶芥牱妫�楠� 鍛堢幇 -->
+				<view v-if="subTabSelected == 2">
+					<view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
+					<view class="list" v-else>
+						<uni-card v-for="SamplingItem in checkItems" :key="SamplingItem.num">
+							<view class="card-detail">
+								<view class="detail"> <text>搴忓彿锛�</text>{{ SamplingItem.num }} </view>
+								<view class="detail editable">
+									<text>妫�楠岄」鐩細</text>{{ SamplingItem.HQCCheckItemName }}
+								</view>
+								<view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
+								<view class="detail editable" style="width: 100%">
+									<view style="flex-shrink: 0"><text>鎶芥牱鏂规锛�</text></view>
+									<input type="text" :value="SamplingItem.HSampleSchemeName" disabled />
+									<view class="icon-wrapper"><uni-icons type="search" size="16"
+											@click="showSelectorModule(SamplingItem, 1)"></uni-icons></view>
+								</view>
+								<view class="detail editable">
+									<text>鎶芥牱绫诲瀷锛�</text>{{ SamplingItem.HSamplingType }}
+								</view>
+								<view class="detail editable">
+									<text>妫�楠屾按骞筹細</text>{{ SamplingItem.HInspectionLevel }}
+								</view>
+								<view class="detail editable">
+									<text>涓ユ牸搴︼細</text>{{ SamplingItem.HStrictness }}
+								</view>
+								<view class="detail editable">
+									<text>AQL锛�</text>{{ SamplingItem.HAQL }}
+								</view>
+								<view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
+								<view class="detail editable">
+									<text>鏍锋湰閲忥細</text>{{ SamplingItem.HSampleQty }}
+								</view>
+								<view class="detail editable">
+									<text>鍏佽鏁帮細</text>{{ SamplingItem.HAcceptQty }}
+								</view>
+								<view class="detail editable">
+									<text>鎷掔粷鏁帮細</text>{{ SamplingItem.HRejectQty }}
+								</view>
+								<view class="detail editable">
+									<text>鏍锋湰涓嶅悎鏍兼暟锛�</text>{{ SamplingItem.HSampleUnRightQty }}
+								</view>
+								<view class="detail editable">
+									<text>鏍锋湰鐮村潖鏁帮細</text>
+									<view class="sampleDestory">
+										<input type="number" v-model="SamplingItem.HSampleDamageQty" />
+									</view>
+								</view>
+								<view class="detail editable">
+									<text>妫�楠岀粨鏋滐細</text>
+									<view style="border-radius: 15%; padding: 0 10rpx" :class="
                                         SamplingItem.HInspectResultToSee == '鍚堟牸'
                                         ? 'pass-background'
                                         : SamplingItem.HInspectResultToSee == '涓嶅悎鏍�'
                                         ? 'unpass-background'
                                         : ''
                                     ">
-                                        {{ SamplingItem.HInspectResultToSee }}
-                                    </view>
-                                </view>
-                            </view>
-                        </uni-card>
-                    </view>
-                </view>
-                <!-- 妫�娴嬪�� 鍛堢幇 -->
-                <view v-else v-for="item in InspectModules" :key="item.id">
-                    <view v-if="subTabSelected == item.id">
-                        <InspectValueTemplateVue ref="InspectValueModules" :bind-key="item.id"
-                            @syncCheckData="InspectValueComplete" :bind-data="{
+										{{ SamplingItem.HInspectResultToSee }}
+									</view>
+								</view>
+							</view>
+						</uni-card>
+					</view>
+				</view>
+				<!-- 妫�娴嬪�� 鍛堢幇 -->
+				<view v-else v-for="item in InspectModules" :key="item.id">
+					<view v-if="subTabSelected == item.id">
+						<InspectValueTemplateVue ref="InspectValueModules" :bind-key="item.id"
+							@syncCheckData="InspectValueComplete" :bind-data="{
                 data: checkItems[item.checkItemId],
                 list: InspectValues[item.checkItemId],
                 mode: 2 // 宸℃妫�楠屽�兼ā鍧�
               }">
-                        </InspectValueTemplateVue>
-                    </view>
-                </view>
-            </view>
-        </view>
-        <view style="height: 120rpx"></view>
-        <view class="bottom-btn">
-            <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-            <view style="flex: 1"></view>
-            <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
-            <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
-        </view>
-        <SampleSchemePopupVue v-if="enablePopupModule == PopupModuleNameList[1]" ref="listPopup"
-            @update="SampleSchemeComplete" :bindKey="currentChechItemIDCache">
-        </SampleSchemePopupVue>
-        <CheckItemPopupVue v-if="enablePopupModule == PopupModuleNameList[2]" ref="listPopup"
-            @update="CheckItemComplete" :bindKey="currentChechItemIDCache">
-        </CheckItemPopupVue>
-        <InspectMentPopupVue v-if="enablePopupModule == PopupModuleNameList[3]" ref="listPopup"
-            @update="InspectMentComplete" :bindKey="currentChechItemIDCache">
-        </InspectMentPopupVue>
-        <MaterialPopupVue v-if="enablePopupModule == PopupModuleNameList[4]" ref="listPopup" @update="MaterComplete"
-            :bindKey="0">
-        </MaterialPopupVue>
-        <ICMOBillPopupVue v-if="enablePopupModule == PopupModuleNameList[5]" ref="listPopup" @update="ICMOBillComplete"
-            :bindKey="0"></ICMOBillPopupVue>
-        <ProcExchBillPopupVue v-if="enablePopupModule == PopupModuleNameList[6]" ref="listPopup"
-            @update="ProcExchBillComplete" :bindKey="0"></ProcExchBillPopupVue>
-        <ProcessPopupVue v-if="enablePopupModule == PopupModuleNameList[8]" ref="listPopup" @update="HProcComplete"
-            :bindKey="0"></ProcessPopupVue>
-        <CheckProjectPopupVue v-if="enablePopupModule == PopupModuleNameList[7]" ref="listPopup"
-            @update="HQCSchemeComplete" :bindKey="0"></CheckProjectPopupVue>
-    </view>
+						</InspectValueTemplateVue>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view style="height: 120rpx"></view>
+		<view class="bottom-btn">
+			<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			<view style="flex: 1"></view>
+			<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+			<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+		</view>
+		<SampleSchemePopupVue v-if="enablePopupModule == PopupModuleNameList[1]" ref="listPopup"
+			@update="SampleSchemeComplete" :bindKey="currentChechItemIDCache">
+		</SampleSchemePopupVue>
+		<CheckItemPopupVue v-if="enablePopupModule == PopupModuleNameList[2]" ref="listPopup"
+			@update="CheckItemComplete" :bindKey="currentChechItemIDCache">
+		</CheckItemPopupVue>
+		<InspectMentPopupVue v-if="enablePopupModule == PopupModuleNameList[3]" ref="listPopup"
+			@update="InspectMentComplete" :bindKey="currentChechItemIDCache">
+		</InspectMentPopupVue>
+		<MaterialPopupVue v-if="enablePopupModule == PopupModuleNameList[4]" ref="listPopup" @update="MaterComplete"
+			:bindKey="0">
+		</MaterialPopupVue>
+		<ICMOBillPopupVue v-if="enablePopupModule == PopupModuleNameList[5]" ref="listPopup" @update="ICMOBillComplete"
+			:bindKey="0"></ICMOBillPopupVue>
+		<ProcExchBillPopupVue v-if="enablePopupModule == PopupModuleNameList[6]" ref="listPopup"
+			@update="ProcExchBillComplete" :bindKey="0"></ProcExchBillPopupVue>
+		<ProcessPopupVue v-if="enablePopupModule == PopupModuleNameList[8]" ref="listPopup" @update="HProcComplete"
+			:bindKey="0"></ProcessPopupVue>
+		<CheckProjectPopupVue v-if="enablePopupModule == PopupModuleNameList[7]" ref="listPopup"
+			@update="HQCSchemeComplete" :bindKey="0"></CheckProjectPopupVue>
+	</view>
 </template>
 
 <script>
-    import dayjs from "dayjs";
-    import {
-        CommonUtils
-    } from "../../../utils/common";
-    import InspectValueTemplateVue from "@/components/ZLGL/InspectValueTemplate.vue";
-    import SampleSchemePopupVue from "@/components/ZLGL/SampleSchemePopup.vue";
-    import CheckItemPopupVue from "@/components/ZLGL/CheckItemPopup.vue";
-    import InspectMentPopupVue from "../../../components/ZLGL/InspectMentPopup.vue";
-    import MaterialPopupVue from "../../../components/ZLGL/MaterialPopup.vue";
-    import ICMOBillPopupVue from "../../../components/ZLGL/ICMOBillPopup.vue";
-    import ProcExchBillPopupVue from "../../../components/ZLGL/ProcExchBillPopup.vue";
-    import ProcessPopupVue from "../../../components/ZLGL/ProcessPopup.vue";
-    import CheckProjectPopupVue from "../../../components/ZLGL/CheckProjectPopup.vue";
-    import {
-        getUserInfo
-    } from "../../../utils/auth";
-    import {
-        MpaasScan
-    } from "../../../utils/mpaasScan";
-    export default {
-        components: {
-            InspectValueTemplateVue,
-            SampleSchemePopupVue,
-            CheckItemPopupVue,
-            InspectMentPopupVue,
-            MaterialPopupVue,
-            ICMOBillPopupVue,
-            ProcExchBillPopupVue,
-            ProcessPopupVue,
-            CheckProjectPopupVue,
-        },
-        computed: {
-            judgeConclusion: {
-                get() {
-                    return true;
-                },
-            },
-        },
-        data() {
-            return {
-                operationType: 1,
+	import dayjs from "dayjs";
+	import {
+		CommonUtils
+	} from "../../../utils/common";
+	import InspectValueTemplateVue from "@/components/ZLGL/InspectValueTemplate.vue";
+	import SampleSchemePopupVue from "@/components/ZLGL/SampleSchemePopup.vue";
+	import CheckItemPopupVue from "@/components/ZLGL/CheckItemPopup.vue";
+	import InspectMentPopupVue from "../../../components/ZLGL/InspectMentPopup.vue";
+	import MaterialPopupVue from "../../../components/ZLGL/MaterialPopup.vue";
+	import ICMOBillPopupVue from "../../../components/ZLGL/ICMOBillPopup.vue";
+	import ProcExchBillPopupVue from "../../../components/ZLGL/ProcExchBillPopup.vue";
+	import ProcessPopupVue from "../../../components/ZLGL/ProcessPopup.vue";
+	import CheckProjectPopupVue from "../../../components/ZLGL/CheckProjectPopup.vue";
+	import {
+		getUserInfo
+	} from "../../../utils/auth";
+	import {
+		MpaasScan
+	} from "../../../utils/mpaasScan";
+	export default {
+		components: {
+			InspectValueTemplateVue,
+			SampleSchemePopupVue,
+			CheckItemPopupVue,
+			InspectMentPopupVue,
+			MaterialPopupVue,
+			ICMOBillPopupVue,
+			ProcExchBillPopupVue,
+			ProcessPopupVue,
+			CheckProjectPopupVue,
+		},
+		computed: {
+			judgeConclusion: {
+				get() {
+					return true;
+				},
+			},
+		},
+		data() {
+			return {
+				operationType: 1,
 
-                mainTabSelected: 1,
-                subTabSelected: 1,
+				mainTabSelected: 1,
+				subTabSelected: 1,
 
-                // 婧愬崟鐘舵�佹帶鍒�
-                hasSourceBill: false,
+				// 婧愬崟鐘舵�佹帶鍒�
+				hasSourceBill: false,
 
-                // 鎺у埗褰撳墠鏄剧ず鐨勫脊绐楁ā鍧�
-                enablePopupModule: "",
-                PopupModuleNameList: [
-                    "",
-                    "SampleScheme",
-                    "CheckItem",
-                    "InspectMent",
-                    "Material",
-                    "ICMOBill",
-                    "ProcExchBill",
-                    "QCScheme",
-                    "Process",
-                ],
-                // 褰撳墠鎿嶄綔鐨勬楠屽崟ID缂撳瓨
-                currentChechItemIDCache: -1,
+				// 鎺у埗褰撳墠鏄剧ず鐨勫脊绐楁ā鍧�
+				enablePopupModule: "",
+				PopupModuleNameList: [
+					"",
+					"SampleScheme",
+					"CheckItem",
+					"InspectMent",
+					"Material",
+					"ICMOBill",
+					"ProcExchBill",
+					"QCScheme",
+					"Process",
+				],
+				// 褰撳墠鎿嶄綔鐨勬楠屽崟ID缂撳瓨
+				currentChechItemIDCache: -1,
 
-                // uni-combox 閫夋嫨鍣ㄤ娇鐢�
-                // 鐢熶骇璧勬簮
-                GySourceList: [],
-                GySourceNameList: [],
-                // 鐝
-                GyWorkShiftList: [],
-                GyWorkShiftNameList: [],
-                // 妫�楠屽憳
-                GyFirstCheckEmpList: [],
-                GyFirstCheckEmpNameList: [],
+				// uni-combox 閫夋嫨鍣ㄤ娇鐢�
+				// 鐢熶骇璧勬簮
+				GySourceList: [],
+				GySourceNameList: [],
+				// 鐝
+				GyWorkShiftList: [],
+				GyWorkShiftNameList: [],
+				// 妫�楠屽憳
+				GyFirstCheckEmpList: [],
+				GyFirstCheckEmpNameList: [],
 
-                // 妫�楠屾柟妗�
-                arrayAnalysisMethod: [{
-                        value: 1,
-                        name: "瀹氭�у垎鏋�",
-                    },
-                    {
-                        value: 2,
-                        name: "瀹氶噺鍒嗘瀽",
-                    },
-                    {
-                        value: 3,
-                        name: "鍏朵粬鍒嗘瀽",
-                    },
-                ],
-                ArrayAnalysisMethodValue: [1, 2, 3],
-                // 瀛愯〃 椤电淇℃伅
-                subTabs: {
-                    1: {
-                        id: "1",
-                        name: "妫�楠岄」鐩�",
-                    },
-                    2: {
-                        id: "2",
-                        name: "鎶芥牱妫�楠�",
-                    },
-                },
+				// 妫�楠屾柟妗�
+				arrayAnalysisMethod: [{
+						value: 1,
+						name: "瀹氭�у垎鏋�",
+					},
+					{
+						value: 2,
+						name: "瀹氶噺鍒嗘瀽",
+					},
+					{
+						value: 3,
+						name: "鍏朵粬鍒嗘瀽",
+					},
+				],
+				ArrayAnalysisMethodValue: [1, 2, 3],
+				// 瀛愯〃 椤电淇℃伅
+				subTabs: {
+					1: {
+						id: "1",
+						name: "妫�楠岄」鐩�",
+					},
+					2: {
+						id: "2",
+						name: "鎶芥牱妫�楠�",
+					},
+				},
 
-                // 婧愬崟绫诲瀷
-                HSourceBillType: "宸ュ簭杩涚珯鎺ユ敹鍗�",
-                HSourceBillTypeValueList: ["3790", "3793", "3710", "3772"],
-                HSourceBillTypeNameList: [
-                    "宸ュ簭杩涚珯鎺ユ敹鍗�",
-                    "宸ュ簭濮斿鎺ユ敹鍗�",
-                    "鐢熶骇璁㈠崟",
-                    "宸ュ簭娴佽浆鍗�",
-                ],
-                // 涓昏〃灞炴��
-                hform: {
-                    HSourceBillType: "3790",
-                    HSourceBillNo: "",
-                    HBillNo: "",
-                    HInterID: "0",
-                    HDate: dayjs(new Date()).format("YYYY-MM-DD"),
-                    HSourceName: "",
-                    HSourceID: "0",
-                    HShiftsName: "",
-                    HShiftsID: "0",
-                    HICMOBillNo: "",
-                    HICMOInterID: "0",
-                    HICMOEntryID: "1",
-                    HICMOQty: "0",
-                    HProcExchBillNo: "",
-                    HProcExchInterID: "0",
-                    HProcExchEntryID: "0",
-                    HProcExchQty: "0",
-                    HMaterNumber: "",
-                    HMaterID: "0",
-                    HMaterName: "",
-                    HFirstCheckEmpName: "",
-                    HFirstCheckEmp: 0,
-                    HQCSchemeName: "",
-                    HQCSchemeID: "0",
-                    HBatchNo: "",
-                    HLastResult: true, // 榛樿鍚堟牸
-                    HProcName: "",
-                    HProcID: "0",
-                    HTakeSampleCheckBillNo: "", // 鍙栨牱鍗�
-                    HTakeSampleCheckBillID: "0",
-                    HRemark: "",
-                    HErrTreatment: "", // 寮傚父涓存椂澶勭悊鏂规
-                    HMaker: getUserInfo()["Czymc"] || "",
-                    HChecker: "",
-                    HCloseMan: "",
-                    HMakeDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
-                    HCheckDate: "",
-                    HCloseDate: "",
-                    HUpDater: "",
-                    HDeleteMan: "",
-                    HUpDateDate: "",
-                    HDeleteDate: "",
-                    HResult: 1,
-                    HAnalysisMethod: "",
+				// 婧愬崟绫诲瀷
+				HSourceBillType: "宸ュ簭杩涚珯鎺ユ敹鍗�",
+				HSourceBillTypeValueList: ["3790", "3793", "3710", "3772"],
+				HSourceBillTypeNameList: [
+					"宸ュ簭杩涚珯鎺ユ敹鍗�",
+					"宸ュ簭濮斿鎺ユ敹鍗�",
+					"鐢熶骇璁㈠崟",
+					"宸ュ簭娴佽浆鍗�",
+				],
+				// 涓昏〃灞炴��
+				hform: {
+					HSourceBillType: "3790",
+					HSourceBillNo: "",
+					HBillNo: "",
+					HInterID: "0",
+					HDate: dayjs(new Date()).format("YYYY-MM-DD"),
+					HSourceName: "",
+					HSourceID: "0",
+					HShiftsName: "",
+					HShiftsID: "0",
+					HICMOBillNo: "",
+					HICMOInterID: "0",
+					HICMOEntryID: "1",
+					HICMOQty: "0",
+					HProcExchBillNo: "",
+					HProcExchInterID: "0",
+					HProcExchEntryID: "0",
+					HProcExchQty: "0",
+					HMaterNumber: "",
+					HMaterID: "0",
+					HMaterName: "",
+					HFirstCheckEmpName: getUserInfo().HEmpName,
+					HFirstCheckEmp: getUserInfo().HEmpID,
+					HQCSchemeName: "",
+					HQCSchemeID: "0",
+					HBatchNo: "",
+					HLastResult: true, // 榛樿鍚堟牸
+					HProcName: "",
+					HProcID: "0",
+					HTakeSampleCheckBillNo: "", // 鍙栨牱鍗�
+					HTakeSampleCheckBillID: "0",
+					HRemark: "",
+					HErrTreatment: "", // 寮傚父涓存椂澶勭悊鏂规
+					HMaker: getUserInfo()["Czymc"] || "",
+					HChecker: "",
+					HCloseMan: "",
+					HMakeDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
+					HCheckDate: "",
+					HCloseDate: "",
+					HUpDater: "",
+					HDeleteMan: "",
+					HUpDateDate: "",
+					HDeleteDate: "",
+					HResult: 1,
+					HAnalysisMethod: "",
 
-                    HResDec: "",
-                    HStatus: 1,
+					HResDec: "",
+					HStatus: 1,
 
-                    HMainSourceBillType: "",
-                    HMainSourceInterID: "0",
-                    HMainSourceEntryID: "1",
-                    HMainSourceBillNo: "",
-                },
-                // 妫�楠岄」鐩拰鎶芥牱妫�楠� 鍊�
-                checkItems: {},
-                // 妫�娴嬪�兼ā鍧�
-                InspectModules: {},
-                // 妫�娴嬪��
-                InspectValues: {},
-            };
-        },
-        methods: {
-            // 婧愬崟绫诲瀷閫夋嫨
-            HSourceBillTypeNameChange(e) {
-                this.HSourceBillType = this.HSourceBillTypeNameList[e.detail.value];
-                this.hform.HSourceBillType = this.HSourceBillTypeValueList[e.detail.value];
-            },
-            toScanCode() {
-                MpaasScan.scanCode((res) => {
-                    if (res) {
-                        this.getSourceBillInfo(res);
-                    }
-                });
-            },
-            async getSourceBillInfo(HBarCode) {
-                console.log('HBarCode: ', HBarCode);
-                // 鏍规嵁鍗曟嵁绫诲瀷锛岃皟鐢ㄤ笉鍚岀殑涓嬫帹鍑芥暟
-                if (this.hform.HSourceBillType == 3790) {
-                    // 宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
-                    await this.LoadingInformation_StationInBill(HBarCode);
-                    if (
-                        (uni.getStorageSync("OrganizationID") == "7667152" &&
-                            uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
-                        (uni.getStorageSync("OrganizationID") == "100199" &&
-                            uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
-                    ) {
-                        await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
-                    }
-                    return;
-                }
-                if (this.hform.HSourceBillType == 3793) {
-                    // 宸ュ簭濮斿鎺ユ敹鍗曞垪琛ㄩ妫�
-                    await this.LoadingInformation_StationEntrustOutBill(HBarCode);
-                    if (
-                        (uni.getStorageSync("OrganizationID") == "7667152" &&
-                            uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
-                        (uni.getStorageSync("OrganizationID") == "100199" &&
-                            uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
-                    ) {
-                        await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
-                    }
-                    return;
-                }
-                if (this.hform.HSourceBillType == 3710) {
-                    // 鐢熶骇璁㈠崟鍒楄〃棣栨
-                    await this.LoadingInformation_ICMO(HBarCode);
-                    if (
-                        (uni.getStorageSync("OrganizationID") == "7667152" &&
-                            uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
-                        (uni.getStorageSync("OrganizationID") == "100199" &&
-                            uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
-                    ) {
-                        await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
-                    }
-                    return;
-                }
-                if (this.hform.HSourceBillType == 3772) {
-                    // 宸ュ簭娴佽浆鍗″垪琛ㄩ妫�
-                    await this.LoadingInformation_ProcExchange(HBarCode);
-                    if (
-                        (uni.getStorageSync("OrganizationID") == "7667152" &&
-                            uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
-                        (uni.getStorageSync("OrganizationID") == "100199" &&
-                            uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
-                    ) {
-                        await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
-                    }
-                    return;
-                }
-            },
-            async GetCheckItemID() {
-                if (!this.hform.HMaterName && !this.hform.HProcName) {
-                    try {
-                        let res = await CommonUtils.doRequest2Async({
-                            url: "/Web/GetCheckItemID",
-                            data: {
-                                HName: this.hform.HMaterName,
-                                HProName: this.hform.HProcName,
-                                HSourceID: this.hform.HSourceID,
-                            },
-                        });
+					HMainSourceBillType: "",
+					HMainSourceInterID: "0",
+					HMainSourceEntryID: "1",
+					HMainSourceBillNo: "",
+				},
+				// 妫�楠岄」鐩拰鎶芥牱妫�楠� 鍊�
+				checkItems: {},
+				// 妫�娴嬪�兼ā鍧�
+				InspectModules: {},
+				// 妫�娴嬪��
+				InspectValues: {},
+			};
+		},
+		methods: {
+			// 婧愬崟绫诲瀷閫夋嫨
+			HSourceBillTypeNameChange(e) {
+				this.HSourceBillType = this.HSourceBillTypeNameList[e.detail.value];
+				this.hform.HSourceBillType = this.HSourceBillTypeValueList[e.detail.value];
+			},
+			toScanCode() {
+				MpaasScan.scanCode((res) => {
+					if (res) {
+						this.getSourceBillInfo(res);
+					}
+				});
+			},
+			async getSourceBillInfo(HBarCode) {
+				console.log('HBarCode: ', HBarCode);
+				// 鏍规嵁鍗曟嵁绫诲瀷锛岃皟鐢ㄤ笉鍚岀殑涓嬫帹鍑芥暟
+				if (this.hform.HSourceBillType == 3790) {
+					// 宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
+					await this.LoadingInformation_StationInBill(HBarCode);
+					if (
+						(uni.getStorageSync("OrganizationID") == "7667152" &&
+							uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
+						(uni.getStorageSync("OrganizationID") == "100199" &&
+							uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
+					) {
+						await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+					}
+					return;
+				}
+				if (this.hform.HSourceBillType == 3793) {
+					// 宸ュ簭濮斿鎺ユ敹鍗曞垪琛ㄩ妫�
+					await this.LoadingInformation_StationEntrustOutBill(HBarCode);
+					if (
+						(uni.getStorageSync("OrganizationID") == "7667152" &&
+							uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
+						(uni.getStorageSync("OrganizationID") == "100199" &&
+							uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
+					) {
+						await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+					}
+					return;
+				}
+				if (this.hform.HSourceBillType == 3710) {
+					// 鐢熶骇璁㈠崟鍒楄〃棣栨
+					await this.LoadingInformation_ICMO(HBarCode);
+					if (
+						(uni.getStorageSync("OrganizationID") == "7667152" &&
+							uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
+						(uni.getStorageSync("OrganizationID") == "100199" &&
+							uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
+					) {
+						await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+					}
+					return;
+				}
+				if (this.hform.HSourceBillType == 3772) {
+					// 宸ュ簭娴佽浆鍗″垪琛ㄩ妫�
+					await this.LoadingInformation_ProcExchange(HBarCode);
+					if (
+						(uni.getStorageSync("OrganizationID") == "7667152" &&
+							uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
+						(uni.getStorageSync("OrganizationID") == "100199" &&
+							uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
+					) {
+						await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+					}
+					return;
+				}
+			},
+			async GetCheckItemID() {
+				if (!this.hform.HMaterName && !this.hform.HProcName) {
+					try {
+						let res = await CommonUtils.doRequest2Async({
+							url: "/Web/GetCheckItemID",
+							data: {
+								HName: this.hform.HMaterName,
+								HProName: this.hform.HProcName,
+								HSourceID: this.hform.HSourceID,
+							},
+						});
 
-                        let {
-                            count,
-                            Message,
-                            data
-                        } = res.data;
+						let {
+							count,
+							Message,
+							data
+						} = res.data;
 
-                        if (count != 1) {
-                            CommonUtils.showTips({
-                                title: "娓╅Θ鎻愮ず",
-                                message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${Message}`,
-                            });
-                            return;
-                        }
+						if (count != 1) {
+							CommonUtils.showTips({
+								title: "娓╅Θ鎻愮ず",
+								message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${Message}`,
+							});
+							return;
+						}
 
-                        this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
-                        this.hform.HQCSchemeID = data[0].hmainid;
+						this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+						this.hform.HQCSchemeID = data[0].hmainid;
 
-                        this.get_CheckItem();
-                    } catch (err) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${err}`,
-                        });
-                    }
-                }
-            },
-            async LoadingInformation_ProcExchange(HBarCode) {
-                // 宸ュ簭娴佽浆鍗�
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/CheckBill/get_ProcessExchangeBill_ByBillNo",
-                        data: {
-                            HBillNo: HBarCode,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+						this.get_CheckItem();
+					} catch (err) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${err}`,
+						});
+					}
+				}
+			},
+			async LoadingInformation_ProcExchange(HBarCode) {
+				// 宸ュ簭娴佽浆鍗�
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/CheckBill/get_ProcessExchangeBill_ByBillNo",
+						data: {
+							HBillNo: HBarCode,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                    let {
-                        count,
-                        Message,
-                        data
-                    } = res.data;
+					let {
+						count,
+						Message,
+						data
+					} = res.data;
 
-                    if (count != 1) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${Message}`,
-                        });
-                        return;
-                    }
-                    this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
-                    this.hform.HProcExchInterID = data[0].HProcExchInterID;
-                    this.hform.HProcExchEntryID = data[0].HProcExchEntryID || 0;
-                    this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
-                    this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
-                    this.hform.HICMOInterID = data[0].HICMOInterID;
-                    this.hform.HICMOQty = data[0].HICMOQty || 0;
-                    this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
-                    this.hform.HSourceID = data[0].HSourceID || 0;
-                    this.hform.HMaterID = data[0].HMaterID;
-                    this.hform.HMaterName = data[0].浜у搧鍚嶇О;
-                    this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
-                    this.hform.HMainSourceBillType = data[0].HBillType;
-                    this.hform.HMainSourceInterID = data[0].HInterID;
-                    this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
-                    this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
-                    this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
-                    this.hform.HProcName = data[0].褰撳墠宸ュ簭;
-                    this.hform.HBatchNo = data[0].鎵瑰彿;
+					if (count != 1) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${Message}`,
+						});
+						return;
+					}
+					this.hform.HProcExchBillNo = data[0].鍗曟嵁鍙�;
+					this.hform.HProcExchInterID = data[0].HProcExchInterID;
+					this.hform.HProcExchEntryID = data[0].HProcExchEntryID || 0;
+					this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+					this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
+					this.hform.HICMOInterID = data[0].HICMOInterID;
+					this.hform.HICMOQty = data[0].HICMOQty || 0;
+					this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
+					this.hform.HSourceID = data[0].HSourceID || 0;
+					this.hform.HMaterID = data[0].HMaterID;
+					this.hform.HMaterNumber = data[0].浜у搧浠ｇ爜;
+					this.hform.HMaterName = data[0].浜у搧鍚嶇О;
+					this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+					this.hform.HMainSourceBillType = data[0].HBillType;
+					this.hform.HMainSourceInterID = data[0].HInterID;
+					this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+					this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+					this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+					this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+					this.hform.HBatchNo = data[0].鎵瑰彿;
 
-                    this.hasSourceBill = true
-                    this.get_CheckItem();
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${err}`,
-                    });
-                }
-            },
-            async LoadingInformation_ICMO(HBarCode) {
-                // 鐢熶骇璁㈠崟
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/QC_FirstPieceCheckBill/get_ICMOBill_ByBillNo",
-                        data: {
-                            HBillNo: HBarCode,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+					this.hasSourceBill = true
+					this.get_CheckItem();
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${err}`,
+					});
+				}
+			},
+			async LoadingInformation_ICMO(HBarCode) {
+				// 鐢熶骇璁㈠崟
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/QC_FirstPieceCheckBill/get_ICMOBill_ByBillNo",
+						data: {
+							HBillNo: HBarCode,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                    let {
-                        count,
-                        Message,
-                        data
-                    } = res.data;
+					let {
+						count,
+						Message,
+						data
+					} = res.data;
 
-                    if (count != 1) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${Message}`,
-                        });
-                        return;
-                    }
-                    this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
-                    this.hform.HProcExchInterID = data[0].HProcExchInterID;
-                    this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
-                    this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
-                    this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
-                    this.hform.HICMOInterID = data[0].HICMOInterID;
-                    this.hform.HICMOQty = data[0].HICMOQty;
-                    this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
-                    this.hform.HSourceID = data[0].HSourceID;
-                    this.hform.HMaterID = data[0].HMaterID;
-                    this.hform.HMaterName = data[0].浜у搧鍚嶇О;
-                    this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
-                    this.hform.HMainSourceBillType = data[0].HBillType;
-                    this.hform.HMainSourceInterID = data[0].HInterID;
-                    this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
-                    this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
-                    this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
-                    this.hform.HProcName = data[0].褰撳墠宸ュ簭;
-                    this.hasSourceBill = true
-                    this.get_CheckItem();
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${err}`,
-                    });
-                }
-            },
-            async LoadingInformation_StationEntrustOutBill(HBarCode) {
-                // 宸ュ簭濮斿鎺ユ敹鍗�
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Cj_StationEntrustOutBill/list",
-                        data: {
-                            sWhere: ` and HBillNo = '${HBarCode}'`,
-                        },
-                    });
+					if (count != 1) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${Message}`,
+						});
+						return;
+					}
+					this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
+					this.hform.HProcExchInterID = data[0].HProcExchInterID;
+					this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
+					this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+					this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
+					this.hform.HICMOInterID = data[0].HICMOInterID;
+					this.hform.HICMOQty = data[0].HICMOQty;
+					this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
+					this.hform.HSourceID = data[0].HSourceID;
+					this.hform.HMaterID = data[0].HMaterID;
+					this.hform.HMaterName = data[0].浜у搧鍚嶇О;
+					this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+					this.hform.HMainSourceBillType = data[0].HBillType;
+					this.hform.HMainSourceInterID = data[0].HInterID;
+					this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+					this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+					this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+					this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+					this.hasSourceBill = true
+					this.get_CheckItem();
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${err}`,
+					});
+				}
+			},
+			async LoadingInformation_StationEntrustOutBill(HBarCode) {
+				// 宸ュ簭濮斿鎺ユ敹鍗�
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Cj_StationEntrustOutBill/list",
+						data: {
+							sWhere: ` and HBillNo = '${HBarCode}'`,
+						},
+					});
 
-                    let {
-                        count,
-                        Message,
-                        data
-                    } = res.data;
+					let {
+						count,
+						Message,
+						data
+					} = res.data;
 
-                    if (count != 1) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${Message}`,
-                        });
-                        return;
-                    }
+					if (count != 1) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${Message}`,
+						});
+						return;
+					}
 
-                    HProcExchBillNo = data[0].娴佽浆鍗″彿;
-                    HProcExchInterID = data[0].HProcExchInterID;
-                    HProcExchEntryID = data[0].HProcExchEntryID;
-                    HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
-                    HICMOBillNo = data[0].鐢熶骇璁㈠崟鍙�;
-                    HICMOInterID = data[0].HICMOInterID;
-                    HICMOQty = data[0].HICMOQty;
-                    HSourceName = data[0].鐢熶骇璧勬簮;
-                    HSourceID = data[0].HSourceID;
-                    HMaterID = data[0].HMaterID;
-                    HMaterName = data[0].浜у搧鍚嶇О;
-                    HMainSourceBillNo = data[0].鍗曟嵁鍙�;
-                    HMainSourceBillType = data[0].HBillType;
-                    HMainSourceInterID = data[0].HInterID;
-                    HICMOEntryID = data[0].HICMOEntryID || 1;
-                    this.hasSourceBill = true
-                    this.get_CheckItem();
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${err}`,
-                    });
-                }
-            },
-            async LoadingInformation_StationInBill(HBarCode) {
-                // 杩涚珯鎺ユ敹鍗�
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/QC_FirstPieceCheckBill/get_StationInBill_ByHBillNo",
-                        data: {
-                            HBillNo: HBarCode,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+					HProcExchBillNo = data[0].娴佽浆鍗″彿;
+					HProcExchInterID = data[0].HProcExchInterID;
+					HProcExchEntryID = data[0].HProcExchEntryID;
+					HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+					HICMOBillNo = data[0].鐢熶骇璁㈠崟鍙�;
+					HICMOInterID = data[0].HICMOInterID;
+					HICMOQty = data[0].HICMOQty;
+					HSourceName = data[0].鐢熶骇璧勬簮;
+					HSourceID = data[0].HSourceID;
+					HMaterID = data[0].HMaterID;
+					HMaterName = data[0].浜у搧鍚嶇О;
+					HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+					HMainSourceBillType = data[0].HBillType;
+					HMainSourceInterID = data[0].HInterID;
+					HICMOEntryID = data[0].HICMOEntryID || 1;
+					this.hasSourceBill = true
+					this.get_CheckItem();
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${err}`,
+					});
+				}
+			},
+			async LoadingInformation_StationInBill(HBarCode) {
+				// 杩涚珯鎺ユ敹鍗�
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/QC_FirstPieceCheckBill/get_StationInBill_ByHBillNo",
+						data: {
+							HBillNo: HBarCode,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                    let {
-                        count,
-                        Message,
-                        data
-                    } = res.data;
+					let {
+						count,
+						Message,
+						data
+					} = res.data;
 
-                    if (count != 1) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇杩涚珯鎺ユ敹鍗� 閿欒: ${Message}`,
-                        });
-                        return;
-                    }
-                    this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
-                    this.hform.HProcExchInterID = data[0].HProcExchInterID;
-                    this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
-                    this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
-                    this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
-                    this.hform.HICMOInterID = data[0].HICMOInterID;
-                    this.hform.HICMOQty = data[0].HICMOQty;
-                    this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
-                    this.hform.HSourceID = data[0].HSourceID;
-                    this.hform.HMaterID = data[0].HMaterID;
-                    this.hform.HMaterName = data[0].浜у搧鍚嶇О;
-                    this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
-                    this.hform.HMainSourceBillType = data[0].HBillType;
-                    this.hform.HMainSourceInterID = data[0].HInterID;
-                    this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
-                    this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
-                    this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
-                    this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+					if (count != 1) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇杩涚珯鎺ユ敹鍗� 閿欒: ${Message}`,
+						});
+						return;
+					}
+					this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
+					this.hform.HProcExchInterID = data[0].HProcExchInterID;
+					this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
+					this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+					this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
+					this.hform.HICMOInterID = data[0].HICMOInterID;
+					this.hform.HICMOQty = data[0].HICMOQty;
+					this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
+					this.hform.HSourceID = data[0].HSourceID;
+					this.hform.HMaterID = data[0].HMaterID;
+					this.hform.HMaterName = data[0].浜у搧鍚嶇О;
+					this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+					this.hform.HMainSourceBillType = data[0].HBillType;
+					this.hform.HMainSourceInterID = data[0].HInterID;
+					this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+					this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+					this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+					this.hform.HProcName = data[0].褰撳墠宸ュ簭;
 
-                    for (let i = 0; i < data.length; i++) {
-                        this.addCheckItem(data[i])
-                    }
+					for (let i = 0; i < data.length; i++) {
+						this.addCheckItem(data[i])
+					}
 
-                    this.hasSourceBill = true
-                    this.get_CheckItem();
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇杩涚珯鎺ユ敹鍗� 閿欒: ${err}`,
-                    });
-                }
-            },
-            // 妫�楠屽憳鍒濆鍖�
-            async InitHEmp() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Gy_Employee/list",
-                        data: {
-                            sWhere: `  and 缁勭粐鍚嶇О = '${uni.getStorageSync(
-              "Organization"
-            )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' `,
-                            user: getUserInfo()["Czymc"],
-                            Organization: uni.getStorageSync("Organization"),
-                        },
-                    });
+					this.hasSourceBill = true
+					this.get_CheckItem();
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇杩涚珯鎺ユ敹鍗� 閿欒: ${err}`,
+					});
+				}
+			},
+			// 妫�楠屽憳鍒濆鍖�
+			async InitHEmp() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Gy_Employee/list",
+						data: {
+							sWhere: `  and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' order by 閮ㄩ棬浠ｇ爜`,
+							user: getUserInfo()["Czymc"],
+							Organization: uni.getStorageSync("Organization"),
+						},
+					});
 
-                    let {
-                        data,
-                        Message,
-                        count
-                    } = res.data;
+					let {
+						data,
+						Message,
+						count
+					} = res.data;
 
-                    if (count == 1) {
-                        console.log("data: ", data);
-                        this.GyFirstCheckEmpList = data;
-                        this.GyFirstCheckEmpNameList = Array.from(data).map((e) => e["鑱屽憳鍚嶇О"]);
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鍒濆鍖栨楠屽憳澶辫触: ${Message}`,
-                        });
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鍒濆鍖栨楠屽憳澶辫触: ${err}`,
-                    });
-                }
-            },
-            async HFirstCheckEmpChange(e) {
-                console.log("閫変腑妫�楠屽憳: ", e);
-                let index = this.GyFirstCheckEmpList.findIndex((elem) => elem["鑱屽憳鍚嶇О"] == e);
-                if (index == -1) {
-                    this.hform.HFirstCheckEmp = 0;
-                    this.hform.HFirstCheckEmpName = "";
-                    return;
-                }
+					if (count == 1) {
+						this.GyFirstCheckEmpList = data;
+						this.GyFirstCheckEmpNameList = Array.from(data).map((e) => e["鑱屽憳鍚嶇О"]);
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鍒濆鍖栨楠屽憳澶辫触: ${Message}`,
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鍒濆鍖栨楠屽憳澶辫触: ${err}`,
+					});
+				}
+			},
+			async HFirstCheckEmpChange(e) {
+				console.log("閫変腑妫�楠屽憳: ", e);
+				let index = this.GyFirstCheckEmpList.findIndex((elem) => elem["鑱屽憳鍚嶇О"] == e);
+				if (index == -1) {
+					this.hform.HFirstCheckEmp = 0;
+					this.hform.HFirstCheckEmpName = "";
+					return;
+				}
 
-                this.hform.HFirstCheckEmp = this.GyFirstCheckEmpList[index]["HItemID"];
-                this.hform.HFirstCheckEmpName = this.GyFirstCheckEmpList[index]["鑱屽憳鍚嶇О"];
-            },
-            // 鐢熶骇鐝鍒濆鍖�
-            async InitHWorkShift() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Gy_ShiftsController/Get_Gy_WorkShiftList",
-                        data: {
-                            sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'')  != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync(
-              "Organization"
-            )}'`,
-                            HMaker: getUserInfo()["Czymc"],
-                        },
-                    });
+				this.hform.HFirstCheckEmp = this.GyFirstCheckEmpList[index]["HItemID"];
+				this.hform.HFirstCheckEmpName = this.GyFirstCheckEmpList[index]["鑱屽憳鍚嶇О"];
+			},
+			// 鐢熶骇鐝鍒濆鍖�
+			async InitHWorkShift() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Gy_ShiftsController/Get_Gy_WorkShiftList",
+						data: {
+							sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'')  != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}'`,
+							HMaker: getUserInfo()["Czymc"],
+						},
+					});
 
-                    let {
-                        data,
-                        Message,
-                        count
-                    } = res.data;
+					let {
+						data,
+						Message,
+						count
+					} = res.data;
 
-                    if (count == 1) {
-                        console.log("data: ", data);
-                        this.GyWorkShiftList = data;
-                        this.GyWorkShiftNameList = Array.from(data).map((e) => e["鐝鍚嶇О"]);
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鍒濆鍖栫彮娆″け璐�: ${Message}`,
-                        });
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鍒濆鍖栫彮娆″け璐�: ${err}`,
-                    });
-                }
-            },
-            async HWorkShiftChange(e) {
-                console.log("閫変腑鐝: ", e);
-                let index = this.GyWorkShiftList.findIndex((elem) => elem["鐝鍚嶇О"] == e);
-                if (index == -1) {
-                    this.hform.HWorkShiftID = 0;
-                    this.hform.HWorkShiftName = "";
-                    return;
-                }
+					if (count == 1) {
+						console.log("data: ", data);
+						this.GyWorkShiftList = data;
+						this.GyWorkShiftNameList = Array.from(data).map((e) => e["鐝鍚嶇О"]);
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鍒濆鍖栫彮娆″け璐�: ${Message}`,
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鍒濆鍖栫彮娆″け璐�: ${err}`,
+					});
+				}
+			},
+			async HWorkShiftChange(e) {
+				console.log("閫変腑鐝: ", e);
+				let index = this.GyWorkShiftList.findIndex((elem) => elem["鐝鍚嶇О"] == e);
+				if (index == -1) {
+					this.hform.HWorkShiftID = 0;
+					this.hform.HWorkShiftName = "";
+					return;
+				}
 
-                this.hform.HWorkShiftID = this.GySourceList[index]["HInterID"];
-                this.hform.HWorkShiftName = this.GySourceList[index]["鐝鍚嶇О"];
-            },
-            // 鐢熶骇璧勬簮鏇存柊
-            // 鐢熶骇璧勬簮鍒濆鍖�
-            async InitHSource() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Gy_Source/list",
-                        data: {
-                            sWhere: `and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'')  != '' and HUSEORGID = '100038'`,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+				this.hform.HWorkShiftID = this.GySourceList[index]["HInterID"];
+				this.hform.HWorkShiftName = this.GySourceList[index]["鐝鍚嶇О"];
+			},
+			// 鐢熶骇璧勬簮鍒濆鍖�
+			async InitHSource() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Gy_Source/list",
+						data: {
+							sWhere: `and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'')  != '' and HUSEORGID = '100038'`,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                    let {
-                        data,
-                        Message,
-                        count
-                    } = res.data;
+					let {
+						data,
+						Message,
+						count
+					} = res.data;
 
-                    if (count == 1) {
-                        this.GySourceList = data;
-                        this.GySourceNameList = Array.from(data).map((e) => e["鐢熶骇璧勬簮鍚嶇О"]);
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${Message}`,
-                        });
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${err}`,
-                    });
-                }
-            },
-            // 鐢熶骇璧勬簮鏇存柊
-            async HSourceChange(e) {
-                console.log("閫変腑鐢熶骇璧勬簮: ", e);
-                let index = this.GySourceList.findIndex((elem) => elem["鐢熶骇璧勬簮鍚嶇О"] == e);
-                if (index == -1) {
-                    this.hform.HSourceID = 0;
-                    this.hform.HSourceName = "";
-                    return;
-                }
+					if (count == 1) {
+						this.GySourceList = data;
+						this.GySourceNameList = Array.from(data).map((e) => e["鐢熶骇璧勬簮鍚嶇О"]);
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${Message}`,
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${err}`,
+					});
+				}
+			},
+			// 鐢熶骇璧勬簮鏇存柊
+			async HSourceChange(e) {
+				console.log("閫変腑鐢熶骇璧勬簮: ", e);
+				let index = this.GySourceList.findIndex((elem) => elem["鐢熶骇璧勬簮鍚嶇О"] == e);
+				if (index == -1) {
+					this.hform.HSourceID = 0;
+					this.hform.HSourceName = "";
+					return;
+				}
 
-                this.hform.HSourceID = this.GySourceList[index]["HItemID"];
-                this.hform.HSourceName = this.GySourceList[index]["鐢熶骇璧勬簮鍚嶇О"];
+				this.hform.HSourceID = this.GySourceList[index]["HItemID"];
+				this.hform.HSourceName = this.GySourceList[index]["鐢熶骇璧勬簮鍚嶇О"];
 
-                this.get_ICMOBillStatusList();
-                this.get_QC_TakeSampleCheckBillList();
-                this.GetCheckItemID();
-            },
-            // 鏄剧ず寮圭獥
-            async showSelectorModule(item, index) {
-                this.currentChechItemIDCache = item.num || 0; // 0 琛ㄧず娌℃湁浠讳綍瀛愯〃琚�変腑
-                this.enablePopupModule = this.PopupModuleNameList[index];
-                console.log("this.$refs: ", this.$refs);
-                await this.$nextTick();
-                if (index == 7) {
-                    // 妫�楠屾柟妗堥渶瑕侀澶栦紶閫掑伐搴忓拰鐗╂枡鍚嶇О涓や釜鍙傛暟
-                    this.$refs.listPopup.setRequiredInfo(item.HMaterName, item.HProcName);
-                }
+				this.get_ICMOBillStatusList();
+				this.get_QC_TakeSampleCheckBillList();
+				this.GetCheckItemID();
+			},
+			// 鏄剧ず寮圭獥
+			async showSelectorModule(item, index) {
+				this.currentChechItemIDCache = item.num || 0; // 0 琛ㄧず娌℃湁浠讳綍瀛愯〃琚�変腑
+				this.enablePopupModule = this.PopupModuleNameList[index];
+				console.log("this.$refs: ", this.$refs);
+				await this.$nextTick();
+				if (index == 7) {
+					// 妫�楠屾柟妗堥渶瑕侀澶栦紶閫掑伐搴忓拰鐗╂枡鍚嶇О涓や釜鍙傛暟
+					this.$refs.listPopup.setRequiredInfo(item.HMaterName, item.HProcName);
+				}
 
-                this.$refs.listPopup.showPopup();
-            },
-            getAnalysisMethodDisplay(val) {
-                console.log("AnalysisMethodVal: ", val);
-                if (val) {
-                    return this.arrayAnalysisMethod.find((e) => e.value == val).name;
-                }
-                return "";
-            },
-            checkResultChange(event) {
-                console.log("event: ", event);
-            },
-            // 妫�楠岄」鐩柊澧炶
-            addCheckItem(resource) {
-                let ordinal = this.getObjLength(this.checkItems) + 1;
-                let checkItem = {
-                    num: ordinal,
-                    HInterID: this.hform.HInterID,
-                    HQCCheckItemID: "",
-                    HQCCheckItemNumber: "",
-                    HQCCheckItemName: "",
-                    HInspectInstruMentID: "0",
-                    HInspectInstruMentNumber: "",
-                    HInspectInstruMentName: "",
-                    HQCStd: "",
-                    HUnit: "",
-                    HQCNote: "",
-                    HAnalysisMethod: "",
-                    HResult: 1,
-                    HMax: "",
-                    HMin: "",
-                    HAvg: "",
-                    HRemark: "",
-                    HKeyInspect: false,
-                    HStatus: 1,
-                    HSampleSchemeID: "",
-                    HUnitID: 0,
-                    HInspectVal: "",
-                    HTargetVal: "",
-                    HUpLimit: "",
-                    HDownLimit: "",
-                    HUpOffSet: "",
-                    HDownOffSet: "",
-                    HSampleDamageQty: 0,
-                    HSampleSchemeName: "",
-                    HSampleQty: 0,
-                    HAcceptQty: 0,
-                    HInspectionLevel: "",
-                    HRejectQty: 0,
-                    HStrictness: "",
-                    HSampleUnRightQty: 0,
-                    HAQL: "",
-                    HSamplingType: "",
-                    HInspectResultToSee: "",
-                };
-                if (resource) {
-                    // 閫氳繃涓昏〃妫�楠屾柟妗堝甫鍑虹殑妫�楠岄」鐩�
-                    Object.assign(checkItem, resource);
-                }
-                this.$set(this.checkItems, ordinal, checkItem);
-                this.$nextTick(() => {
-                    // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
-                    this.setInspectValModule(this.checkItems[ordinal]);
-                });
-            },
-            // 妫�楠岄」鐩垹闄よ
-            removeCheckItem(item) {
-                uni.showModal({
-                    title: "娓╅Θ鎻愮ず",
-                    content: `纭瑕佸垹闄ょ${item.num}琛屽悧锛熷垹闄ゅ悗涓嶈兘鎭㈠`,
-                    success: (res) => {
-                        if (res.confirm) {
-                            this.$delete(this.checkItems, item.num);
-                            this.$delete(this.subTabs, `_${item.num}`);
-                            this.$forceUpdate();
-                            this.refreshCheckItemNum();
-                        }
-                    },
-                });
-            },
-            async refreshCheckItemNum() {
-                await this.$nextTick();
-                // 閲嶆帓搴忓彿
-                let num = 1;
-                let checkItemsCache = {};
-                for (let s in this.checkItems) {
-                    checkItemsCache[num] = this.checkItems[s];
-                    checkItemsCache[num].num = num;
-                    num++;
-                }
-                this.checkItems = checkItemsCache;
-            },
-            getObjLength(obj) {
-                return Object.keys(obj).length;
-            },
-            // 缁撹淇敼
-            HResultChange(id, e) {
-                console.log("e: ", e);
-                this.checkItems[id]["HResult"] = e.detail.value ? 1 : 2;
+				this.$refs.listPopup.showPopup();
+			},
+			getAnalysisMethodDisplay(val) {
+				console.log("AnalysisMethodVal: ", val);
+				if (val) {
+					return this.arrayAnalysisMethod.find((e) => e.value == val).name;
+				}
+				return "";
+			},
+			checkResultChange(event) {
+				console.log("event: ", event);
+			},
+			// 妫�楠岄」鐩柊澧炶
+			addCheckItem(resource) {
+				let ordinal = this.getObjLength(this.checkItems) + 1;
+				let checkItem = {
+					num: ordinal,
+					HInterID: this.hform.HInterID,
+					HQCCheckItemID: "",
+					HQCCheckItemNumber: "",
+					HQCCheckItemName: "",
+					HInspectInstruMentID: "0",
+					HInspectInstruMentNumber: "",
+					HInspectInstruMentName: "",
+					HQCStd: "",
+					HUnit: "",
+					HQCNote: "",
+					HAnalysisMethod: "",
+					HResult: 1,
+					HMax: "",
+					HMin: "",
+					HAvg: "",
+					HRemark: "",
+					HKeyInspect: false,
+					HStatus: 1,
+					HSampleSchemeID: "",
+					HUnitID: 0,
+					HInspectVal: "",
+					HTargetVal: "",
+					HUpLimit: "",
+					HDownLimit: "",
+					HUpOffSet: "",
+					HDownOffSet: "",
+					HSampleDamageQty: 0,
+					HSampleSchemeName: "",
+					HSampleQty: 0,
+					HAcceptQty: 0,
+					HInspectionLevel: "",
+					HRejectQty: 0,
+					HStrictness: "",
+					HSampleUnRightQty: 0,
+					HAQL: "",
+					HSamplingType: "",
+					HInspectResultToSee: "",
+				};
+				if (resource) {
+					// 閫氳繃涓昏〃妫�楠屾柟妗堝甫鍑虹殑妫�楠岄」鐩�
+					Object.assign(checkItem, resource);
+				}
+				this.$set(this.checkItems, ordinal, checkItem);
+				this.$nextTick(() => {
+					// 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
+					this.setInspectValModule(this.checkItems[ordinal]);
+				});
+			},
+			// 妫�楠岄」鐩垹闄よ
+			removeCheckItem(item) {
+				uni.showModal({
+					title: "娓╅Θ鎻愮ず",
+					content: `纭瑕佸垹闄ょ${item.num}琛屽悧锛熷垹闄ゅ悗涓嶈兘鎭㈠`,
+					success: (res) => {
+						if (res.confirm) {
+							this.$delete(this.checkItems, item.num);
+							this.$delete(this.subTabs, `_${item.num}`);
+							this.$forceUpdate();
+							this.refreshCheckItemNum();
+						}
+					},
+				});
+			},
+			async refreshCheckItemNum() {
+				await this.$nextTick();
+				// 閲嶆帓搴忓彿
+				let num = 1;
+				let checkItemsCache = {};
+				for (let s in this.checkItems) {
+					checkItemsCache[num] = this.checkItems[s];
+					checkItemsCache[num].num = num;
+					num++;
+				}
+				this.checkItems = checkItemsCache;
+			},
+			getObjLength(obj) {
+				return Object.keys(obj).length;
+			},
+			// 缁撹淇敼
+			HResultChange(id, e) {
+				console.log("e: ", e);
+				this.checkItems[id]["HResult"] = e.detail.value ? 1 : 2;
 
-                this.HCheckLastResult();
-            },
-            // 姣忔妫�楠岄」鐩殑缁撹鏇存柊锛岄兘瑕佸垽鏂渶缁堢粨璁�
-            HCheckLastResult() {
-                let unPassNum = 0;
-                for (var key in this.checkItems) {
-                    if (!(this.checkItems[key]["HResult"] == 1)) {
-                        unPassNum++;
-                    }
-                }
+				this.HCheckLastResult();
+			},
+			// 姣忔妫�楠岄」鐩殑缁撹鏇存柊锛岄兘瑕佸垽鏂渶缁堢粨璁�
+			HCheckLastResult() {
+				let unPassNum = 0;
+				for (var key in this.checkItems) {
+					if (!(this.checkItems[key]["HResult"] == 1)) {
+						unPassNum++;
+					}
+				}
 
-                if (unPassNum > 0) {
-                    this.hform.HLastResult = false;
-                    return;
-                }
-                this.hform.HLastResult = true;
-            },
-            // 妫�楠屾柟妗堜慨鏀�
-            HAnalysisMethodChange(id, e) {
-                console.log("e: ", e);
-                this.checkItems[id]["HAnalysisMethod"] = this.arrayAnalysisMethod[e.detail.value][
-                    "value"
-                ];
+				if (unPassNum > 0) {
+					this.hform.HLastResult = false;
+					return;
+				}
+				this.hform.HLastResult = true;
+			},
+			// 妫�楠屾柟妗堜慨鏀�
+			HAnalysisMethodChange(id, e) {
+				console.log("e: ", e);
+				this.checkItems[id]["HAnalysisMethod"] = this.arrayAnalysisMethod[e.detail.value][
+					"value"
+				];
 
-                // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
-                this.setInspectValModule(this.checkItems[id]);
-            },
-            // 閲嶇偣妫�鏌ヤ慨鏀�
-            HKeyInspectChange(id, e) {
-                console.log("e: ", e);
-                this.checkItems[id]["HKeyInspect"] = e.detail.value;
-            },
-            // 妫�楠岄」鐩繑鍥�
-            async CheckItemComplete(e) {
-                console.log("CheckItemRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.checkItems[key], {
-                        HQCCheckItemID: data["HItemID"],
-                        HQCCheckItemNumber: data["浠ｇ爜"],
-                        HQCCheckItemName: data["鍚嶇О"],
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                }
-            },
-            // 妫�楠屾柟妗堣繑鍥�
-            async SampleSchemeComplete(e) {
-                console.log("SampleSchemeRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.checkItems[key], {
-                        HSampleSchemeID: data["hmainid"],
-                        HSampleSchemeNumber: data["鎶芥牱鏂规浠ｇ爜"],
-                        HSampleSchemeName: data["鎶芥牱鏂规鍚嶇О"],
-                        HSampleQty: data["鏍锋湰閲�"] || 0,
-                        HAcceptQty: data["鍏佽鏁�"] || 0,
-                        HInspectionLevel: data["妫�楠屾按骞�"],
-                        HRejectQty: data["鎷掔粷鏁�"] || 0,
-                        HStrictness: data["涓ユ牸搴�"],
-                        HSampleUnRightQty: data["鏍锋湰涓嶅悎鏍兼暟"] || 0,
-                        HAQL: data["AQL"],
-                        HSamplingType: data["鎶芥牱绫诲瀷"],
-                        HInspectResultToSee: data["妫�楠岀粨鏋�"],
-                        HUpLimit: data["涓婇檺鍊�"] || 0,
-                        HDownLimit: data["涓嬮檺鍊�"] || 0,
-                        HSampleDamageQty: data["鏍锋湰鐮村潖鏁�"] || 0,
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    this.setInspectValModule(this.checkItems[key]);
+				// 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
+				this.setInspectValModule(this.checkItems[id]);
+			},
+			// 閲嶇偣妫�鏌ヤ慨鏀�
+			HKeyInspectChange(id, e) {
+				console.log("e: ", e);
+				this.checkItems[id]["HKeyInspect"] = e.detail.value;
+			},
+			// 妫�楠岄」鐩繑鍥�
+			async CheckItemComplete(e) {
+				console.log("CheckItemRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.checkItems[key], {
+						HQCCheckItemID: data["HItemID"],
+						HQCCheckItemNumber: data["浠ｇ爜"],
+						HQCCheckItemName: data["鍚嶇О"],
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+				}
+			},
+			// 妫�楠屾柟妗堣繑鍥�
+			async SampleSchemeComplete(e) {
+				console.log("SampleSchemeRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.checkItems[key], {
+						HSampleSchemeID: data["hmainid"],
+						HSampleSchemeNumber: data["鎶芥牱鏂规浠ｇ爜"],
+						HSampleSchemeName: data["鎶芥牱鏂规鍚嶇О"],
+						HSampleQty: data["鏍锋湰閲�"] || 0,
+						HAcceptQty: data["鍏佽鏁�"] || 0,
+						HInspectionLevel: data["妫�楠屾按骞�"],
+						HRejectQty: data["鎷掔粷鏁�"] || 0,
+						HStrictness: data["涓ユ牸搴�"],
+						HSampleUnRightQty: data["鏍锋湰涓嶅悎鏍兼暟"] || 0,
+						HAQL: data["AQL"],
+						HSamplingType: data["鎶芥牱绫诲瀷"],
+						HInspectResultToSee: data["妫�楠岀粨鏋�"],
+						HUpLimit: data["涓婇檺鍊�"] || 0,
+						HDownLimit: data["涓嬮檺鍊�"] || 0,
+						HSampleDamageQty: data["鏍锋湰鐮村潖鏁�"] || 0,
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					this.setInspectValModule(this.checkItems[key]);
 
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                }
-            },
-            // 妫�楠屼华鍣ㄨ繑鍥�
-            async InspectMentComplete(e) {
-                console.log("InspectInstruMentRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.checkItems[key], {
-                        HInspectInstruMentID: data["HItemID"],
-                        HInspectInstruMentNumber: data["妫�楠屼华鍣ㄤ唬鐮�"],
-                        HInspectInstruMentName: data["妫�楠屼华鍣ㄥ悕绉�"],
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                }
-            },
-            // 浜у搧浠ｇ爜杩斿洖
-            async MaterComplete(e) {
-                console.log("MaterRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.hform, {
-                        HMaterNumber: data["鐗╂枡浠ｇ爜"],
-                        HMaterName: data["鐗╂枡鍚嶇О"],
-                        HMaterID: data["HItemID"],
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                    this.GetCheckItemID();
-                }
-            },
-            // 浠诲姟鍗曡繑鍥�
-            async ICMOBillComplete(e) {
-                console.log("ICMOBillRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.hform, {
-                        HICMOInterID: data.hmainid,
-                        HICMOEntryID: data.HEntryID || 1,
-                        HICMOBillNo: data.鍗曟嵁鍙�,
-                        HMaterNumber: data.浜у搧浠ｇ爜,
-                        HMaterName: data.浜у搧鍚嶇О,
-                        HMaterID: data.HMaterID,
-                        HICMOQty: data.鐢熶骇浠诲姟鍗曟暟閲�,
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                }
-            },
-            // 娴佽浆鍗¤繑鍥�
-            async ProcExchBillComplete(e) {
-                console.log("ProcExchBillRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.hform, {
-                        HProcExchInterID: data.hmainid,
-                        HProcExchEntryID: data.hsubid,
-                        HProcExchBillNo: data.鍗曟嵁鍙�,
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                }
-            },
-            // 妫�楠屾柟妗�(涓昏〃)杩斿洖
-            async HQCSchemeComplete(e) {
-                console.log("HQCSchemeRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.hform, {
-                        HQCSchemeID: data.hmainid,
-                        HQCSchemeName: data.妫�楠屾柟妗堝悕绉�,
-                    });
-                    await this.get_CheckItem();
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                }
-            },
-            // 宸ュ簭杩斿洖
-            async HProcComplete(e) {
-                console.log(" HProcRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.hform, {
-                        HProcName: data["宸ュ簭鍚嶇О"],
-                        HProcID: data["HItemID"],
-                    });
-                    await this.$nextTick();
-                    this.$refs.listPopup.exit();
-                    // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick();
-                    this.enablePopupModule = this.PopupModuleNameList[0];
-                    await this.GetCheckItemID();
-                    await this.get_ICMOBillStatusList();
-                    await this.get_QC_TakeSampleCheckBillList();
-                }
-            },
-            async get_QC_TakeSampleCheckBillList() {
-                // 鍙栨牱鍗曟煡璇�
-                let HProcID = this.hform.HProcID;
-                let HProcExchInterId = this.hform.HProcExchInterID;
-                let sWhere = "";
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+				}
+			},
+			// 妫�楠屼华鍣ㄨ繑鍥�
+			async InspectMentComplete(e) {
+				console.log("InspectInstruMentRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.checkItems[key], {
+						HInspectInstruMentID: data["HItemID"],
+						HInspectInstruMentNumber: data["妫�楠屼华鍣ㄤ唬鐮�"],
+						HInspectInstruMentName: data["妫�楠屼华鍣ㄥ悕绉�"],
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+				}
+			},
+			// 浜у搧浠ｇ爜杩斿洖
+			async MaterComplete(e) {
+				console.log("MaterRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.hform, {
+						HMaterNumber: data["鐗╂枡浠ｇ爜"],
+						HMaterName: data["鐗╂枡鍚嶇О"],
+						HMaterID: data["HItemID"],
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+					this.GetCheckItemID();
+				}
+			},
+			// 浠诲姟鍗曡繑鍥�
+			async ICMOBillComplete(e) {
+				console.log("ICMOBillRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.hform, {
+						HICMOInterID: data.hmainid,
+						HICMOEntryID: data.HEntryID || 1,
+						HICMOBillNo: data.鍗曟嵁鍙�,
+						HMaterNumber: data.浜у搧浠ｇ爜,
+						HMaterName: data.浜у搧鍚嶇О,
+						HMaterID: data.HMaterID,
+						HICMOQty: data.鐢熶骇浠诲姟鍗曟暟閲�,
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+				}
+			},
+			// 娴佽浆鍗¤繑鍥�
+			async ProcExchBillComplete(e) {
+				console.log("ProcExchBillRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.hform, {
+						HProcExchInterID: data.hmainid,
+						HProcExchEntryID: data.hsubid,
+						HProcExchBillNo: data.鍗曟嵁鍙�,
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+				}
+			},
+			// 妫�楠屾柟妗�(涓昏〃)杩斿洖
+			async HQCSchemeComplete(e) {
+				console.log("HQCSchemeRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.hform, {
+						HQCSchemeID: data.hmainid,
+						HQCSchemeName: data.妫�楠屾柟妗堝悕绉�,
+					});
+					await this.get_CheckItem();
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+				}
+			},
+			// 宸ュ簭杩斿洖
+			async HProcComplete(e) {
+				console.log(" HProcRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.hform, {
+						HProcName: data["宸ュ簭鍚嶇О"],
+						HProcID: data["HItemID"],
+					});
+					await this.$nextTick();
+					this.$refs.listPopup.exit();
+					// 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+					await this.$nextTick();
+					this.enablePopupModule = this.PopupModuleNameList[0];
+					await this.GetCheckItemID();
+					await this.get_ICMOBillStatusList();
+					await this.get_QC_TakeSampleCheckBillList();
+				}
+			},
+			async get_QC_TakeSampleCheckBillList() {
+				// 鍙栨牱鍗曟煡璇�
+				let HProcID = this.hform.HProcID;
+				let HProcExchInterId = this.hform.HProcExchInterID;
+				let sWhere = "";
 
-                if (HProcID == "0" || HProcID == "") {
-                    CommonUtils.showTips({
-                        message: "璇烽�夋嫨宸ュ簭",
-                    });
-                    return;
-                }
+				if (HProcID == "0" || HProcID == "") {
+					CommonUtils.showTips({
+						message: "璇烽�夋嫨宸ュ簭",
+					});
+					return;
+				}
 
-                sWhere = " and 宸ュ簭娴佽浆鍗′富鍐呯爜='" + HProcExchInterID + "' and HProcID=" + HProcID;
+				sWhere = " and 宸ュ簭娴佽浆鍗′富鍐呯爜='" + HProcExchInterID + "' and HProcID=" + HProcID;
 
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "//QC_TakeSampleCheckBill/QC_TakeSampleCheckBillMainList",
-                        data: {
-                            sWhere: sWhere,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "//QC_TakeSampleCheckBill/QC_TakeSampleCheckBillMainList",
+						data: {
+							sWhere: sWhere,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data;
-                    if (count != 1) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${Message}`,
-                        });
-                    }
+					let {
+						data,
+						count,
+						Message
+					} = res.data;
+					if (count != 1) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${Message}`,
+						});
+					}
 
-                    this.hform.HTakeSampleCheckBillID = data[0]["hmainid"];
-                    this.hform.HTakeSampleCheckBillNo = data[0]["鍗曟嵁鍙�"];
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${err}`,
-                    });
-                }
-            },
-            async get_ICMOBillStatusList() {
-                let sWhere = "";
-                let HProcID = this.hform.HProcID;
-                let HSourceID = this.hform.HSourceID;
-                let HProcExchInterId = this.hform.HProcExchInterID;
+					this.hform.HTakeSampleCheckBillID = data[0]["hmainid"];
+					this.hform.HTakeSampleCheckBillNo = data[0]["鍗曟嵁鍙�"];
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${err}`,
+					});
+				}
+			},
+			async get_ICMOBillStatusList() {
+				let sWhere = "";
+				let HProcID = this.hform.HProcID;
+				let HSourceID = this.hform.HSourceID;
+				let HProcExchInterId = this.hform.HProcExchInterID;
 
-                if (HProcID != "0") {
-                    sWhere += " and HProcID=" + HProcID;
-                }
-                if (HSourceID != "0") {
-                    sWhere += " and HSourceID=" + HSourceID;
-                }
+				if (HProcID != "0") {
+					sWhere += " and HProcID=" + HProcID;
+				}
+				if (HSourceID != "0") {
+					sWhere += " and HSourceID=" + HSourceID;
+				}
 
-                sWhere += " and HSourceInterID=" + HProcExchInterID;
+				sWhere += " and HSourceInterID=" + HProcExchInterID;
 
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/CheckBill/GetICMOBillStatusList",
-                        data: {
-                            sWhere: sWhere,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/CheckBill/GetICMOBillStatusList",
+						data: {
+							sWhere: sWhere,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data;
-                    if (count != 1) {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${Message}`,
-                        });
-                    }
+					let {
+						data,
+						count,
+						Message
+					} = res.data;
+					if (count != 1) {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${Message}`,
+						});
+					}
 
-                    this.hform.HProcID = data[0]["HProcID"];
-                    this.hform.HProcName = data[0]["宸ュ簭"];
-                    this.hform.HSourceID = data[0]["HSourceID"];
-                    this.hform.HSourceName = data[0]["鐢熶骇璧勬簮"];
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${err}`,
-                    });
-                }
-            },
-            setInspectValModule(checkItem) {
-                console.log("checkItem: ", checkItem);
-                if (!checkItem.HAnalysisMethod || !checkItem.HSampleSchemeID) {
-                    return;
-                }
-                // 鍖哄垎妫�楠屽�奸〉绛惧拰闈欐�侀〉绛撅紝妫�楠屽�奸〉绛剧殑id浠寮�澶�
-                this.$set(this.InspectModules, `_${checkItem.num}`, {
-                    id: `_${checkItem.num}`,
-                    checkItemId: checkItem.num,
-                });
-                console.log(" this.arrayAnalysisMethod: ", checkItem.HAnalysisMethod);
-                let analysisMethodName = this.arrayAnalysisMethod.find(
-                    (e) => e.value == checkItem.HAnalysisMethod
-                ).name;
-                this.$set(this.subTabs, `_${checkItem.num}`, {
-                    id: `_${checkItem.num}`,
-                    name: `${analysisMethodName}-${checkItem.HQCCheckItemName}`,
-                });
-            },
-            InspectValueUpdate(e) {
-                console.log("e: ", e);
-                let {
-                    data,
-                    list
-                } = e;
-                this.checkItems[data.num] = Object.assign(this.checkItems[data.num], data);
-                this.$set(this.InspectValues, `${data.num}`, list);
-            },
-            // 甯﹀嚭妫�楠岄」鐩�
-            async get_CheckItem() {
-                // 棣栧厛娓呯┖妫�楠岄」鐩� 鍜� 妫�楠屽��
-                this.checkItems = {}
-                for (let key in this.subTabs) {
-                    if (key.substring(1) == "_") {
-                        this.$delete(this.subTabs, key)
-                    }
-                }
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Web/GetCheckItemByCheckProjectID_Sec",
-                        data: {
-                            CheckProjectID: this.hform.HQCSchemeID || 0,
-                            HBatchQty: this.hform.HProcExchQty || 0,
-                        },
-                    });
+					this.hform.HProcID = data[0]["HProcID"];
+					this.hform.HProcName = data[0]["宸ュ簭"];
+					this.hform.HSourceID = data[0]["HSourceID"];
+					this.hform.HSourceName = data[0]["鐢熶骇璧勬簮"];
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${err}`,
+					});
+				}
+			},
+			setInspectValModule(checkItem) {
+				console.log("checkItem: ", checkItem);
+				if (!checkItem.HAnalysisMethod || !checkItem.HSampleSchemeID) {
+					return;
+				}
+				// 鍖哄垎妫�楠屽�奸〉绛惧拰闈欐�侀〉绛撅紝妫�楠屽�奸〉绛剧殑id浠寮�澶�
+				this.$set(this.InspectModules, `_${checkItem.num}`, {
+					id: `_${checkItem.num}`,
+					checkItemId: checkItem.num,
+				});
+				console.log(" this.arrayAnalysisMethod: ", checkItem.HAnalysisMethod);
+				let analysisMethodName = this.arrayAnalysisMethod.find(
+					(e) => e.value == checkItem.HAnalysisMethod
+				).name;
+				this.$set(this.subTabs, `_${checkItem.num}`, {
+					id: `_${checkItem.num}`,
+					name: `${analysisMethodName}-${checkItem.HQCCheckItemName}`,
+				});
+			},
+			InspectValueUpdate(e) {
+				console.log("e: ", e);
+				let {
+					data,
+					list
+				} = e;
+				this.checkItems[data.num] = Object.assign(this.checkItems[data.num], data);
+				this.$set(this.InspectValues, `${data.num}`, list);
+			},
+			// 甯﹀嚭妫�楠岄」鐩�
+			async get_CheckItem() {
+				// 棣栧厛娓呯┖妫�楠岄」鐩� 鍜� 妫�楠屽��
+				this.checkItems = {}
+				for (let key in this.subTabs) {
+					if (key.substring(1) == "_") {
+						this.$delete(this.subTabs, key)
+					}
+				}
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Web/GetCheckItemByCheckProjectID_Sec",
+						data: {
+							CheckProjectID: this.hform.HQCSchemeID || 0,
+							HBatchQty: this.hform.HProcExchQty || 0,
+							HMaterID: this.hform.HMaterID,
+							HBillType: '宸℃鏂规	'
+						},
+					});
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data;
+					let {
+						data,
+						count,
+						Message
+					} = res.data;
 
-                    if (count == 1) {
-                        for (var i = 0; i < data.length; i++) {
-                            let checkItem = {
-                                HQCCheckItemID: data[i]["HQCCheckItemID"],
-                                HQCCheckItemNumber: data[i]["妫�楠岄」鐩唬鐮�"],
-                                HQCCheckItemName: data[i]["妫�楠岄」鐩�"],
-                                HInspectInstruMentID: data[i]["HInspectInstruMentID"],
-                                HInspectInstruMentNumber: data[i]["妫�楠屼华鍣ㄤ唬鐮�"],
-                                HInspectInstruMentName: data[i]["妫�楠屼华鍣�"],
-                                HQCStd: data[i]["HQCStd"],
-                                HUnit: data[i]["鍗曚綅鍚嶇О"],
-                                HQCNote: "",
-                                HAnalysisMethod: data[i]["鍒嗘瀽鏂规硶"],
-                                HResult: data[i]["榛樿缁撹"],
-                                HMax: "",
-                                HMin: "",
-                                HAvg: "",
-                                HRemark: "",
-                                HKeyInspect: data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false,
-                                HStatus: 0,
-                                HSampleSchemeID: data[i]["HSampleSchemeID"],
-                                HUnitID: data[i]["HUnitID"],
-                                HInspectVal: "",
-                                HTargetVal: "",
-                                HUpLimit: data[i].涓婇檺鍊�,
-                                HDownLimit: data[i].涓嬮檺鍊�,
-                                HUpOffSet: "",
-                                HDownOffSet: "",
-                                HSampleDamageQty: "0",
-                                HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
-                                HSampleQty: data[i].鏍锋湰閲�,
-                                HAcceptQty: data[i].鍏佽鏁�,
-                                HInspectionLevel: data[i].妫�楠屾按骞�,
-                                HRejectQty: data[i].鎷掔粷鏁�,
-                                HStrictness: data[i].涓ユ牸搴�,
-                                HSampleUnRightQty: 0,
-                                HAQL: data[i].AQL,
-                                HSamplingType: data[i].鎶芥牱绫诲瀷,
-                                HCompareSymbol: data[i].姣旇緝绗�,
-                                HTargetVal: data[i].鐩爣鍊� || 0,
-                            };
+					if (count == 1) {
+						for (var i = 0; i < data.length; i++) {
+							let checkItem = {
+								HQCCheckItemID: data[i]["HQCCheckItemID"],
+								HQCCheckItemNumber: data[i]["妫�楠岄」鐩唬鐮�"],
+								HQCCheckItemName: data[i]["妫�楠岄」鐩�"],
+								HInspectInstruMentID: data[i]["HInspectInstruMentID"],
+								HInspectInstruMentNumber: data[i]["妫�楠屼华鍣ㄤ唬鐮�"],
+								HInspectInstruMentName: data[i]["妫�楠屼华鍣�"],
+								HQCStd: data[i]["HQCStd"],
+								HUnit: data[i]["鍗曚綅鍚嶇О"],
+								HQCNote: "",
+								HAnalysisMethod: data[i]["鍒嗘瀽鏂规硶"],
+								HResult: data[i]["HResult"],
+								HMax: "",
+								HMin: "",
+								HAvg: "",
+								HRemark: "",
+								HKeyInspect: data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false,
+								HStatus: 0,
+								HSampleSchemeID: data[i]["HSampleSchemeID"],
+								HUnitID: data[i]["HUnitID"],
+								HInspectVal: "",
+								HTargetVal: "",
+								HUpLimit: data[i].涓婇檺鍊�,
+								HDownLimit: data[i].涓嬮檺鍊�,
+								HUpOffSet: "",
+								HDownOffSet: "",
+								HSampleDamageQty: "0",
+								HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
+								HSampleQty: data[i].鏍锋湰閲�,
+								HAcceptQty: data[i].鍏佽鏁�,
+								HInspectionLevel: data[i].妫�楠屾按骞�,
+								HRejectQty: data[i].鎷掔粷鏁�,
+								HStrictness: data[i].涓ユ牸搴�,
+								HSampleUnRightQty: 0,
+								HAQL: data[i].AQL,
+								HSamplingType: data[i].鎶芥牱绫诲瀷,
+								HCompareSymbol: data[i].姣旇緝绗�,
+								HTargetVal: data[i].鐩爣鍊� || 0,
+							};
 
-                            this.addCheckItem(checkItem);
-                        }
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${Message} `,
-                        });
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${err} `,
-                    });
-                }
-            },
-            async getMaxBillNo() {
-                try {
-                    let res = await CommonUtils.doRequest2Sync({
-                        url: "/Web/GetMAXNum",
-                        data: {
-                            HBillType: "7520",
-                        },
-                    });
+							this.addCheckItem(checkItem);
+						}
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${Message} `,
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${err} `,
+					});
+				}
+			},
+			async getMaxBillNo() {
+				try {
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Web/GetMAXNum",
+						data: {
+							HBillType: "7520",
+						},
+					});
 
-                    if (!res) {
-                        return;
-                    }
+					if (!res) {
+						return;
+					}
 
-                    let {
-                        data,
-                        Message,
-                        count
-                    } = res.data;
-                    if (count == 1) {
-                        this.hform.HInterID = data[0].HInterID;
-                        this.hform.HBillNo = data[0].HBillNo;
-                    } else {
-                        throw Message;
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: "鑾峰彇鍗曟嵁鍙峰紓甯�: " + err,
-                    });
-                }
-            },
-            // 妫�楠屽�艰繑鍥炲��
-            InspectValueComplete(e) {
-                console.log("e: ", e);
-                let key = e.num;
-                e.HStatus = e.HStatus ? 1 : 0
-                if (e.HResult2 == '') {
-                    e.HResult2 = this.checkItems[key].HResult
-                }
-                Object.assign(this.checkItems[key], e);
-                this.checkItems[key].HInspectResultToSee = this.checkItems[key].HResult2;
-                this.checkItems[key].HResult = this.checkItems[key].HResult2 == '鍚堟牸' ? 1 : 2;
+					let {
+						data,
+						Message,
+						count
+					} = res.data;
+					if (count == 1) {
+						this.hform.HInterID = data[0].HInterID;
+						this.hform.HBillNo = data[0].HBillNo;
+					} else {
+						throw Message;
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鑾峰彇鍗曟嵁鍙峰紓甯�: " + err,
+					});
+				}
+			},
+			// 妫�楠屽�艰繑鍥炲��
+			InspectValueComplete(e) {
+				console.log("e: ", e);
+				let key = e.num;
+				e.HStatus = e.HStatus ? 1 : 0
+				if (e.HResult2 == '') {
+					e.HResult2 = this.checkItems[key].HResult
+				}
+				Object.assign(this.checkItems[key], e);
+				this.checkItems[key].HInspectResultToSee = this.checkItems[key].HResult2;
+				this.checkItems[key].HResult = this.checkItems[key].HResult2 == '鍚堟牸' ? 1 : 2;
 
-                this.HCheckLastResult();
+				this.HCheckLastResult();
 
-            },
-            checkSubmitValidate() {
-                // if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
-                //     CommonUtils.showTips({
-                //         message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
-                //     });
-                //     return false;
-                // }
+			},
+			checkSubmitValidate() {
+				// if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
+				//     CommonUtils.showTips({
+				//         message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
+				//     });
+				//     return false;
+				// }
 
-                if (this.hform.HFirstCheckEmp == 0) {
-                    CommonUtils.showTips({
-                        message: "妫�楠屽憳鏈�夋嫨锛�",
-                    });
-                    return false;
-                }
+				if (this.hform.HFirstCheckEmp == 0) {
+					CommonUtils.showTips({
+						message: "妫�楠屽憳鏈�夋嫨锛�",
+					});
+					return false;
+				}
 
-                for (let key in this.checkItems) {
-                    if (!this.checkItems[key].HQCCheckItemID) {
-                        CommonUtils.showTips({
-                            message: `绗�${this.checkItems[key].num}琛屾楠岄」鐩笉鑳戒负绌�!`,
-                        });
-                        return false;
-                    }
+				for (let key in this.checkItems) {
+					if (!this.checkItems[key].HQCCheckItemID) {
+						CommonUtils.showTips({
+							message: `绗�${this.checkItems[key].num}琛屾楠岄」鐩笉鑳戒负绌�!`,
+						});
+						return false;
+					}
 
-                    if (
-                        this.checkItems[key].HSampleSchemeID == "" ||
-                        this.checkItems[key].HSampleSchemeID == null
-                    ) {
-                        this.checkItems[key].HSampleSchemeID = 0;
-                    }
-                    if (
-                        this.checkItems[key].HSampleQty == "" ||
-                        this.checkItems[key].HSampleQty == null
-                    ) {
-                        this.checkItems[key].HSampleQty = 0;
-                    }
-                    if (
-                        this.checkItems[key].HSampleDamageQty == "" ||
-                        this.checkItems[key].HSampleDamageQty == null
-                    ) {
-                        this.checkItems[key].HSampleDamageQty = 0;
-                    }
-                    if (
-                        this.checkItems[key].HAcceptQty == "" ||
-                        this.checkItems[key].HAcceptQty == null
-                    ) {
-                        this.checkItems[key].HAcceptQty = 0;
-                    }
-                    if (
-                        this.checkItems[key].HRejectQty == "" ||
-                        this.checkItems[key].HRejectQty == null
-                    ) {
-                        this.checkItems[key].HRejectQty = 0;
-                    }
-                    if (
-                        this.checkItems[key].HSampleUnRightQty == "" ||
-                        this.checkItems[key].HSampleUnRightQty == 0
-                    ) {
-                        this.checkItems[key].HSampleUnRightQty = 0;
-                    }
-                    if (this.checkItems[key].HUnitID == "") {
-                        this.checkItems[key].HUnitID = 0;
-                    }
-                }
+					if (
+						this.checkItems[key].HSampleSchemeID == "" ||
+						this.checkItems[key].HSampleSchemeID == null
+					) {
+						this.checkItems[key].HSampleSchemeID = 0;
+					}
+					if (
+						this.checkItems[key].HSampleQty == "" ||
+						this.checkItems[key].HSampleQty == null
+					) {
+						this.checkItems[key].HSampleQty = 0;
+					}
+					if (
+						this.checkItems[key].HSampleDamageQty == "" ||
+						this.checkItems[key].HSampleDamageQty == null
+					) {
+						this.checkItems[key].HSampleDamageQty = 0;
+					}
+					if (
+						this.checkItems[key].HAcceptQty == "" ||
+						this.checkItems[key].HAcceptQty == null
+					) {
+						this.checkItems[key].HAcceptQty = 0;
+					}
+					if (
+						this.checkItems[key].HRejectQty == "" ||
+						this.checkItems[key].HRejectQty == null
+					) {
+						this.checkItems[key].HRejectQty = 0;
+					}
+					if (
+						this.checkItems[key].HSampleUnRightQty == "" ||
+						this.checkItems[key].HSampleUnRightQty == 0
+					) {
+						this.checkItems[key].HSampleUnRightQty = 0;
+					}
+					if (this.checkItems[key].HUnitID == "") {
+						this.checkItems[key].HUnitID = 0;
+					}
+				}
 
-                return true;
-            },
-            async submit() {
-                if (!this.checkSubmitValidate()) {
-                    return;
-                }
-                try {
-                    console.log('this.$refs: ', this.$refs);
-                    // 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
-                    if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules
-                        .length > 0) {
-                        // 鍔犺浇鏈夋楠屽�兼ā鍧�
-                        await this.$refs.InspectValueModules[0].set_SaveValue();
-                        this.InspectValues[0] = this.$refs.InspectValueModules[0].InSpectValues;
-                        await this.InspectValueComplete(this.$refs.InspectValueModules[0].checkData)
-                    }
-                    let InspectValuesTrans = [];
-                    let HInterID = this.hform.HInterID;
-                    for (let key in this.InspectValues) {
-                        let HEntryID = key;
+				return true;
+			},
+			async submit() {
+				if (!this.checkSubmitValidate()) {
+					return;
+				}
+				try {
+					console.log('this.$refs: ', this.$refs);
+					// 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
+					if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules
+						.length > 0) {
+						// 鍔犺浇鏈夋楠屽�兼ā鍧�
+						await this.$refs.InspectValueModules[0].set_SaveValue();
+						this.InspectValues[0] = this.$refs.InspectValueModules[0].InSpectValues;
+						await this.InspectValueComplete(this.$refs.InspectValueModules[0].checkData)
+					}
+					let InspectValuesTrans = [];
+					let HInterID = this.hform.HInterID;
+					for (let key in this.InspectValues) {
+						let HEntryID = key;
 
-                        InspectValuesTrans.push(
-                            `${JSON.stringify(this.InspectValues[key])}`
-                        );
-                    }
-                    let checkItemsArray = [];
-                    for (var key in this.checkItems) {
-                        let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]))
-                        delete checkItem.data
-                        checkItemsArray.push(checkItem);
-                    }
-                    console.log('checkItemsArray: ', checkItemsArray);
-                    let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(
+						InspectValuesTrans.push(
+							`${JSON.stringify(this.InspectValues[key])}`
+						);
+					}
+					let checkItemsArray = [];
+					for (var key in this.checkItems) {
+						let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]))
+						delete checkItem.data
+						checkItemsArray.push(checkItem);
+					}
+					console.log('checkItemsArray: ', checkItemsArray);
+					let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(
           checkItemsArray
         )};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0]}`;
-                    console.log("this.checkItems: ", this.checkItems);
+					console.log("this.checkItems: ", this.checkItems);
 
-                    let res = await CommonUtils.doRequest2Sync({
-                        url: "/QC_PatrolProcCheckOtherBill/set_SaveBill",
-                        data: {
-                            sMainSub: sMainSub,
-                        },
-                        method: "POST",
-                    });
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/QC_PatrolProcCheckOtherBill/set_SaveBill",
+						data: {
+							sMainSub: sMainSub,
+						},
+						method: "POST",
+					});
 
-                    if (!res) {
-                        return;
-                    }
+					if (!res) {
+						return;
+					}
 
-                    let {
-                        count,
-                        Message,
-                        data
-                    } = res.data;
-                    if (count == 1) {
-                        uni.showModal({
-                            title: "鎻愮ず",
-                            content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
-                            success: (res) => {
-                                if (res.confirm) {
-                                    console.log("鐢ㄦ埛鐐瑰嚮纭畾");
-                                    uni.redirectTo({
-                                        url: "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1",
-                                    });
-                                } else if (res.cancel) {
-                                    console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
-                                    // setTimeout(() => {
-                                    //     uni.navigateBack();
-                                    // }, 50)
-                                }
-                            },
-                        });
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `宸℃妫�楠屽崟淇濆瓨閿欒: ${Message}`,
-                        });
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `宸℃妫�楠屽崟淇濆瓨閿欒: ${err}`,
-                    });
-                }
-            },
-            addNew() {
-                uni.redirectTo({
-                    url: "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1",
-                });
-            },
-            goBack() {
-                uni.navigateBack();
-            },
-            async RoadBillMain() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillList_Edit",
-                        data: {
-                            sWhere: ` and hmainid=${this.hform.HInterID}`,
-                            user: getUserInfo()["Czymc"],
-                        },
-                    });
+					let {
+						count,
+						Message,
+						data
+					} = res.data;
+					if (count == 1) {
+						uni.showModal({
+							title: "鎻愮ず",
+							content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
+							success: (res) => {
+								if (res.confirm) {
+									console.log("鐢ㄦ埛鐐瑰嚮纭畾");
+									uni.redirectTo({
+										url: "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1",
+									});
+								} else if (res.cancel) {
+									console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
+									// setTimeout(() => {
+									//     uni.navigateBack();
+									// }, 50)
+								}
+							},
+						});
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `宸℃妫�楠屽崟淇濆瓨閿欒: ${Message}`,
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `宸℃妫�楠屽崟淇濆瓨閿欒: ${err}`,
+					});
+				}
+			},
+			addNew() {
+				uni.redirectTo({
+					url: "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1",
+				});
+			},
+			goBack() {
+				uni.navigateBack();
+			},
+			async RoadBillMain() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillList_Edit",
+						data: {
+							sWhere: ` and hmainid=${this.hform.HInterID}`,
+							user: getUserInfo()["Czymc"],
+						},
+					});
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data;
+					let {
+						data,
+						count,
+						Message
+					} = res.data;
 
-                    if (count == 1) {
-                        console.log("RoadBillMain: : ", data);
-                        Object.assign(this.hform, {
-                            HInterID: data[0].hmainid,
-                            HBillNo: data[0].鍗曟嵁鍙�,
-                            HDate: dayjs(data[0].鏃ユ湡).format("YYYY-MM-DD"),
-                            HSourceID: data[0].HSourceID,
-                            HSourceName: data[0].鐢熶骇璧勬簮鍚嶇О,
-                            HICMOBillNo: data[0].浠诲姟鍗曞彿,
-                            HICMOQty: data[0].浠诲姟鍗曟暟閲�,
-                            HICMOInterID: data[0].HICMOInterID,
-                            HICMOEntryID: data[0].HICMOEntryID || 1,
-                            HMaterID: data[0].HMaterID,
-                            HMaterName: data[0].鐗╂枡鍚嶇О,
-                            HMaterNumber: data[0].鐗╂枡浠ｇ爜,
-                            HProcID: data[0].HProcID,
-                            HProcName: data[0].HProcName,
-                            HProcExchQty: data[0].HProcExchQty || 0,
-                            HProcExchBillNo: data[0].HProcExchBillNo,
-                            HProcExchInterID: data[0].HProcExchInterID,
-                            HProcExchEntryID: data[0].HProcExchEntryID || 0,
-                            HFirstCheckEmp: data[0].HFirstCheckEmp,
-                            HFirstCheckEmpName: data[0].璐ㄦ鍛樺悕绉�,
-                            HQCSchemeID: data[0].妫�楠屾柟妗圛D,
-                            HQCSchemeName: data[0].妫�楠屾柟妗堝悕绉�,
-                            HRemark: data[0].琛ㄥご澶囨敞,
-                            HMaker: data[0].鍒跺崟浜�,
-                            HMakeDate: data[0].鍒跺崟鏃ユ湡,
-                            HChecker: data[0].瀹℃牳浜�,
-                            HCheckDate: data[0].瀹℃牳鏃ユ湡,
-                            HCloseMan: data[0].鍏抽棴浜�,
-                            HCloseDate: data[0].鍏抽棴鏃ユ湡,
-                            HUpDateDate: data[0].淇敼鏃ユ湡,
-                            HDeleteDate: data[0].浣滃簾鏃ユ湡,
-                            HSampleSchemeID: data[0].HSampleSchemeID,
-                            HSampleSchemeName: data[0].鎶芥牱鏂规鍚嶇О,
-                            HSampleQty: data[0].鏍锋湰閲�,
-                            HSampleQty2: data[0].鏍锋湰閲�,
-                            HSampleDamageQty: data[0].鏍锋湰鐮村潖鏁�,
-                            HSamplingType: data[0].鎶芥牱绫诲瀷,
-                            HAcceptQty: data[0].鍏佽鏁�,
-                            HInspectionLevel: data[0].妫�楠屾按骞�,
-                            HRejectQty: data[0].鎷掔粷鏁�,
-                            HStrictness: data[0].涓ユ牸搴�,
-                            HSampleUnRightQty: data[0].鏍锋湰涓嶅悎鏍兼暟 || 0,
-                            HSampleUnRightQty2: data[0].鏍锋湰涓嶅悎鏍兼暟,
-                            HAQL: data[0].AQL,
-                            HUnitID: data[0].HUnitID,
-                            HUnit: data[0].鍗曚綅,
-                            HInspectValB: data[0].妫�娴嬪�煎熀纭�璧勬枡,
-                            HInspectVal: data[0].妫�娴嬪��,
-                            HTargetValB: data[0].鐩爣鍊煎熀纭�璧勬枡,
-                            HTargetVal: data[0].鐩爣鍊�,
-                            HUpLimit: data[0].涓婇檺鍊�,
-                            HDownLimit: data[0].涓嬮檺鍊�,
-                            HUpOffSet: data[0].涓婂亸宸�,
-                            HDownOffSet: data[0].涓嬪亸宸�,
-                            HEntryID: data[0].hsubid,
-                            HQCCheckItemName: data[0].妫�楠岄」鐩悕绉�,
-                            HQCCheckItemID: data[0].HQCCheckItemID,
-                            HShiftsID: data[0].HShiftsID,
-                            HShiftsName: data[0].鐝鍚嶇О,
-                            HErrTreatment: data[0].寮傚父涓存椂澶勭悊鏂规,
-                            HBatchNo: data[0].鎵瑰彿,
-                            HLastResult: data[0].鍒ゅ畾缁撹 == "鍚堟牸" ? true : false,
-                            HTakeSampleCheckBillID: data[0].HTakeSampleCheckBillID,
-                            HTakeSampleCheckBillNo: data[0].HTakeSampleCheckBillNo,
-                            HAnalysisMethod: function() {
-                                if (data[0].HAnalysisMethod == 1) {
-                                    return '瀹氭�ф楠�'
-                                } else if (data[0].HAnalysisMethod == 2) {
-                                    return '瀹氶噺妫�楠�'
-                                } else {
-                                    return '鍏朵粬妫�楠�'
-                                }
-                            }(),
+					if (count == 1) {
+						console.log("RoadBillMain: : ", data);
+						Object.assign(this.hform, {
+							HInterID: data[0].hmainid,
+							HBillNo: data[0].鍗曟嵁鍙�,
+							HDate: dayjs(data[0].鏃ユ湡).format("YYYY-MM-DD"),
+							HSourceID: data[0].HSourceID,
+							HSourceName: data[0].鐢熶骇璧勬簮鍚嶇О,
+							HICMOBillNo: data[0].浠诲姟鍗曞彿,
+							HICMOQty: data[0].浠诲姟鍗曟暟閲�,
+							HICMOInterID: data[0].HICMOInterID,
+							HICMOEntryID: data[0].HICMOEntryID || 1,
+							HMaterID: data[0].HMaterID,
+							HMaterName: data[0].鐗╂枡鍚嶇О,
+							HMaterNumber: data[0].鐗╂枡浠ｇ爜,
+							HProcID: data[0].HProcID,
+							HProcName: data[0].HProcName,
+							HProcExchQty: data[0].HProcExchQty || 0,
+							HProcExchBillNo: data[0].HProcExchBillNo,
+							HProcExchInterID: data[0].HProcExchInterID,
+							HProcExchEntryID: data[0].HProcExchEntryID || 0,
+							HFirstCheckEmp: data[0].HFirstCheckEmp,
+							HFirstCheckEmpName: data[0].璐ㄦ鍛樺悕绉�,
+							HQCSchemeID: data[0].妫�楠屾柟妗圛D,
+							HQCSchemeName: data[0].妫�楠屾柟妗堝悕绉�,
+							HRemark: data[0].琛ㄥご澶囨敞,
+							HMaker: data[0].鍒跺崟浜�,
+							HMakeDate: data[0].鍒跺崟鏃ユ湡,
+							HChecker: data[0].瀹℃牳浜�,
+							HCheckDate: data[0].瀹℃牳鏃ユ湡,
+							HCloseMan: data[0].鍏抽棴浜�,
+							HCloseDate: data[0].鍏抽棴鏃ユ湡,
+							HUpDateDate: data[0].淇敼鏃ユ湡,
+							HDeleteDate: data[0].浣滃簾鏃ユ湡,
+							HSampleSchemeID: data[0].HSampleSchemeID,
+							HSampleSchemeName: data[0].鎶芥牱鏂规鍚嶇О,
+							HSampleQty: data[0].鏍锋湰閲�,
+							HSampleQty2: data[0].鏍锋湰閲�,
+							HSampleDamageQty: data[0].鏍锋湰鐮村潖鏁�,
+							HSamplingType: data[0].鎶芥牱绫诲瀷,
+							HAcceptQty: data[0].鍏佽鏁�,
+							HInspectionLevel: data[0].妫�楠屾按骞�,
+							HRejectQty: data[0].鎷掔粷鏁�,
+							HStrictness: data[0].涓ユ牸搴�,
+							HSampleUnRightQty: data[0].鏍锋湰涓嶅悎鏍兼暟 || 0,
+							HSampleUnRightQty2: data[0].鏍锋湰涓嶅悎鏍兼暟,
+							HAQL: data[0].AQL,
+							HUnitID: data[0].HUnitID,
+							HUnit: data[0].鍗曚綅,
+							HInspectValB: data[0].妫�娴嬪�煎熀纭�璧勬枡,
+							HInspectVal: data[0].妫�娴嬪��,
+							HTargetValB: data[0].鐩爣鍊煎熀纭�璧勬枡,
+							HTargetVal: data[0].鐩爣鍊�,
+							HUpLimit: data[0].涓婇檺鍊�,
+							HDownLimit: data[0].涓嬮檺鍊�,
+							HUpOffSet: data[0].涓婂亸宸�,
+							HDownOffSet: data[0].涓嬪亸宸�,
+							HEntryID: data[0].hsubid,
+							HQCCheckItemName: data[0].妫�楠岄」鐩悕绉�,
+							HQCCheckItemID: data[0].HQCCheckItemID,
+							HShiftsID: data[0].HShiftsID,
+							HShiftsName: data[0].鐝鍚嶇О,
+							HErrTreatment: data[0].寮傚父涓存椂澶勭悊鏂规,
+							HBatchNo: data[0].鎵瑰彿,
+							HLastResult: data[0].鍒ゅ畾缁撹 == "鍚堟牸" ? true : false,
+							HTakeSampleCheckBillID: data[0].HTakeSampleCheckBillID,
+							HTakeSampleCheckBillNo: data[0].HTakeSampleCheckBillNo,
+							HAnalysisMethod: function() {
+								if (data[0].HAnalysisMethod == 1) {
+									return '瀹氭�ф楠�'
+								} else if (data[0].HAnalysisMethod == 2) {
+									return '瀹氶噺妫�楠�'
+								} else {
+									return '鍏朵粬妫�楠�'
+								}
+							}(),
 
 
 
-                        });
+						});
 
-                        for (let i = 0; i < data.length; i++) {
-                            this.addCheckItem({
-                                HQCCheckItemID: data[i].HQCCheckItemID,
-                                HQCCheckItemNumber: data[i].妫�楠岄」鐩唬鐮�,
-                                HQCCheckItemName: data[i].妫�楠岄」鐩悕绉�,
-                                HInspectInstruMentID: data[i].HInspectInstruMentID,
-                                HInspectInstruMentNumber: data[i].妫�楠屼华鍣ㄤ唬鐮�,
-                                HInspectInstruMentName: data[i].妫�楠屼华鍣ㄥ悕绉�,
-                                HQCStd: data[i].妫�楠屾爣鍑�,
-                                HUnit: data[i].鍗曚綅鍚嶇О,
-                                HQCNote: data[i].妫�楠岃褰�,
-                                HResult: data[i].缁撹 == "鍚堟牸" ? 1 : 0,
-                                HMax: data[i].鏈�澶у��,
-                                HMin: data[i].鏈�灏忓��,
-                                HAvg: data[i].骞冲潎鍊�,
-                                HRemark: data[i].琛ㄤ綋澶囨敞,
-                                HAnalysisMethod: data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ?
-                                    1 : data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ?
-                                    2 : 3,
-                                HKeyInspect: data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
-                                HSampleSchemeID: data[i].HSampleSchemeID,
-                                HUnitID: data[i].HUnitID,
-                                HInspectVal: data[i].妫�娴嬪��,
-                                HTargetVal: data[i].鐩爣鍊�,
-                                HUpLimit: data[i].涓婇檺鍊�,
-                                HDownLimit: data[i].涓嬮檺鍊�,
-                                HUpOffSet: data[i].涓婂亸宸�,
-                                HDownOffSet: data[i].涓嬪亸宸�,
-                                HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
-                                HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
-                                HSampleQty: data[i].鏍锋湰閲�,
-                                HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
-                                HAcceptQty: data[i].鍏佽鏁�,
-                                HInspectionLevel: 0,
-                                HRejectQty: data[i].鎷掔粷鏁�,
-                                HStrictness: 0,
-                                HSampleUnRightQty: data[i].鏍锋湰涓嶅悎鏍兼暟,
-                                HAQL: data[i].AQL,
-                                HSamplingType: 0,
-                                HSamplingType: data[i].鎶芥牱绫诲瀷,
-                                HStrictness: data[i].涓ユ牸搴�,
-                                HInspectResultToSee: data[i].妫�楠岀粨鏋�
-                            });
+						for (let i = 0; i < data.length; i++) {
+							this.addCheckItem({
+								HQCCheckItemID: data[i].HQCCheckItemID,
+								HQCCheckItemNumber: data[i].妫�楠岄」鐩唬鐮�,
+								HQCCheckItemName: data[i].妫�楠岄」鐩悕绉�,
+								HInspectInstruMentID: data[i].HInspectInstruMentID,
+								HInspectInstruMentNumber: data[i].妫�楠屼华鍣ㄤ唬鐮�,
+								HInspectInstruMentName: data[i].妫�楠屼华鍣ㄥ悕绉�,
+								HQCStd: data[i].妫�楠屾爣鍑�,
+								HUnit: data[i].鍗曚綅鍚嶇О,
+								HQCNote: data[i].妫�楠岃褰�,
+								HResult: data[i].缁撹 == "鍚堟牸" ? 1 : 0,
+								HMax: data[i].鏈�澶у��,
+								HMin: data[i].鏈�灏忓��,
+								HAvg: data[i].骞冲潎鍊�,
+								HRemark: data[i].琛ㄤ綋澶囨敞,
+								HAnalysisMethod: data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ?
+									1 : data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ?
+									2 : 3,
+								HKeyInspect: data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
+								HSampleSchemeID: data[i].HSampleSchemeID,
+								HUnitID: data[i].HUnitID,
+								HInspectVal: data[i].妫�娴嬪��,
+								HTargetVal: data[i].鐩爣鍊�,
+								HUpLimit: data[i].涓婇檺鍊�,
+								HDownLimit: data[i].涓嬮檺鍊�,
+								HUpOffSet: data[i].涓婂亸宸�,
+								HDownOffSet: data[i].涓嬪亸宸�,
+								HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
+								HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
+								HSampleQty: data[i].鏍锋湰閲�,
+								HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
+								HAcceptQty: data[i].鍏佽鏁�,
+								HInspectionLevel: 0,
+								HRejectQty: data[i].鎷掔粷鏁�,
+								HStrictness: 0,
+								HSampleUnRightQty: data[i].鏍锋湰涓嶅悎鏍兼暟,
+								HAQL: data[i].AQL,
+								HSamplingType: 0,
+								HSamplingType: data[i].鎶芥牱绫诲瀷,
+								HStrictness: data[i].涓ユ牸搴�,
+								HInspectResultToSee: data[i].妫�楠岀粨鏋�
+							});
 
-                        }
+						}
 
 
-                        this.hasSourceBill = true
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: `鍔犺浇鍗曟嵁澶辫触: ${Message}`,
-                        });
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: `鍔犺浇鍗曟嵁澶辫触: ${err}`,
-                    });
-                }
-            },
-        },
-        async onLoad(e) {
-            this.operationType = e.operationType || 1;
-            this.hform.HInterID = e.linterid || 0;
-            if (this.operationType == 1) {
-                await this.getMaxBillNo();
-            } else if (this.operationType == 2) {
+						this.hasSourceBill = true
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鍔犺浇鍗曟嵁澶辫触: ${Message}`,
+						});
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鍔犺浇鍗曟嵁澶辫触: ${err}`,
+					});
+				}
+			},
+		},
+		async onLoad(e) {
+			this.operationType = e.operationType || 1;
+			this.hform.HInterID = e.linterid || 0;
+			if (this.operationType == 1) {
+				await this.getMaxBillNo();
+			} else if (this.operationType == 2) {
 
-            } else if (this.operationType == 3) {
-                await this.RoadBillMain();
-            }
-
-            await this.InitHSource();
-            await this.InitHWorkShift();
-            await this.InitHEmp();
-        },
-    };
+			} else if (this.operationType == 3) {
+				await this.RoadBillMain();
+			}
+			if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
+				this.HSourceBillType = "宸ュ簭娴佽浆鍗�"; // 鏄剧ず鍚嶇О
+				this.hform.HSourceBillType = "3772"; // 瀵瑰簲鐨勫��
+			}
+			await this.InitHSource();
+			await this.InitHWorkShift();
+			await this.InitHEmp();
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-    input {
-        width: inherit;
-        font-size: 26rpx;
-    }
+	input {
+		width: inherit;
+		font-size: 26rpx;
+	}
 
-    .uni-input {
-        padding: 0;
-    }
+	.uni-input {
+		padding: 0;
+	}
 
-    .bill-main-tabs,
-    .bill-sub-tabs {
-        box-sizing: border-box;
-        width: 730rpx;
-        display: flex;
-        flex-direction: row;
-        flex-wrap: nowrap;
-        gap: 20rpx;
-        flex-shrink: 0;
-        overflow-x: auto;
-        border-bottom: 1px solid #ddd;
-        padding: 20rpx 10rpx;
-        white-space: nowrap;
+	.bill-main-tabs,
+	.bill-sub-tabs {
+		box-sizing: border-box;
+		width: 730rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		gap: 20rpx;
+		flex-shrink: 0;
+		overflow-x: auto;
+		border-bottom: 1px solid #ddd;
+		padding: 20rpx 10rpx;
+		white-space: nowrap;
 
-        view {
-            width: auto;
-            font-size: 26rpx;
-            color: #555;
-            text-align: center;
-            padding: 16rpx 0;
-        }
+		view {
+			width: auto;
+			font-size: 26rpx;
+			color: #555;
+			text-align: center;
+			padding: 16rpx 0;
+		}
 
-        .selected {
-            color: #3a78ff;
-            font-weight: bold;
-            border-bottom: 3px solid #3a78ff;
-        }
-    }
+		.selected {
+			color: #3a78ff;
+			font-weight: bold;
+			border-bottom: 3px solid #3a78ff;
+		}
+	}
 
-    .bill-main-content,
-    .bill-sub-content {
-        box-sizing: border-box;
-        padding: 0 30rpx 0 30rpx;
-        display: flex;
-        flex-direction: column;
+	.bill-main-content,
+	.bill-sub-content {
+		box-sizing: border-box;
+		padding: 0 30rpx 0 30rpx;
+		display: flex;
+		flex-direction: column;
 
-        .form-item {
-            width: 100%;
-            display: flex;
-            align-items: center;
-            font-size: 26rpx;
-            padding: 6rpx 0;
+		.form-item {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			font-size: 26rpx;
+			padding: 6rpx 0;
 
-            .left {
-                width: 208rpx;
+			.left {
+				width: 208rpx;
 
-                text {
-                    color: red;
-                    font-weight: bold;
-                }
-            }
+				text {
+					color: red;
+					font-weight: bold;
+				}
+			}
 
-            .right {
-                // width: 450rpx;
-                padding: 8rpx 20rpx;
-                font-size: 26rpx;
-                flex: 1;
-                border-radius: 22rpx;
-                border: 1px solid #acacac;
+			.right {
+				// width: 450rpx;
+				padding: 8rpx 20rpx;
+				font-size: 26rpx;
+				flex: 1;
+				border-radius: 22rpx;
+				border: 1px solid #acacac;
 
-                .uni-combox {
-                    padding: 0;
-                    height: auto;
+				.uni-combox {
+					padding: 0;
+					height: auto;
 
-                    .uni-input-placeholder,
-                    .uni-input-input {
-                        font-size: 26rpx;
-                    }
-                }
+					.uni-input-placeholder,
+					.uni-input-input {
+						font-size: 26rpx;
+					}
+				}
 
-                .uni-combox::v-deep input {
-                    height: inherit;
-                    font-size: 26rpx;
-                }
-            }
+				.uni-combox::v-deep input {
+					height: inherit;
+					font-size: 26rpx;
+				}
+			}
 
-            .disabled {
-                border: 1px solid #e4e4e4;
-                background-color: #e4e4e4;
-            }
+			.disabled {
+				border: 1px solid #e4e4e4;
+				background-color: #e4e4e4;
+			}
 
-            .none-border {
-                border: none;
-            }
-        }
-    }
+			.none-border {
+				border: none;
+			}
+		}
+	}
 
-    .bottom-btn {
-        box-sizing: border-box;
-        width: 100%;
-        height: 120rpx;
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        background-color: #fff;
-        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
-        padding: 30rpx 40rpx 40rpx 40rpx;
-        display: flex;
-        flex-direction: row;
-        gap: 10rpx;
+	.bottom-btn {
+		box-sizing: border-box;
+		width: 100%;
+		height: 120rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background-color: #fff;
+		box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+		padding: 30rpx 40rpx 40rpx 40rpx;
+		display: flex;
+		flex-direction: row;
+		gap: 10rpx;
 
-        button {
-            border-radius: 50rpx;
-            width: 180rpx;
-            height: 66rpx;
-            line-height: 66rpx;
-            font-size: 28rpx;
-        }
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
 
-        .btn-a {
-            background-color: #3a78ff;
-            color: #fff;
-        }
+		.btn-a {
+			background-color: #3a78ff;
+			color: #fff;
+		}
 
-        .btn-b {
-            background-color: #41a863;
-            color: #fff;
-        }
+		.btn-b {
+			background-color: #41a863;
+			color: #fff;
+		}
 
-        .btn-c {
-            background-color: #acacac;
-            color: #fff;
-            // position: absolute;
-            // right: 120rpx;
-        }
+		.btn-c {
+			background-color: #acacac;
+			color: #fff;
+			// position: absolute;
+			// right: 120rpx;
+		}
 
-        .btn-d {
-            background-color: #ff8901;
-            color: #fff;
-        }
-    }
+		.btn-d {
+			background-color: #ff8901;
+			color: #fff;
+		}
+	}
 
-    .buttons {
-        box-sizing: border-box;
-        width: 100%;
-        display: flex;
-        justify-content: center;
-        padding: 10rpx 0;
+	.buttons {
+		box-sizing: border-box;
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		padding: 10rpx 0;
 
-        button {
-            border-radius: 50rpx;
-            width: 180rpx;
-            height: 66rpx;
-            line-height: 66rpx;
-            font-size: 26rpx;
-        }
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 26rpx;
+		}
 
-        .btn-a {
-            background-color: #acacac;
-            color: #fff;
-        }
+		.btn-a {
+			background-color: #acacac;
+			color: #fff;
+		}
 
-        .btn-b {
-            background-color: #41a863;
-            color: #fff;
-        }
+		.btn-b {
+			background-color: #41a863;
+			color: #fff;
+		}
 
-        .btn-c {
-            background-color: #3a78ff;
-            color: #fff;
-        }
-    }
+		.btn-c {
+			background-color: #3a78ff;
+			color: #fff;
+		}
+	}
 
-    .list {
-        width: 100%;
+	.list {
+		width: 100%;
 
-        .card-detail {
-            width: 100%;
-            display: flex;
-            flex-wrap: wrap;
-            justify-content: space-between;
-            align-items: center;
-            line-height: 120%;
-            gap: 10rpx 0;
+		.card-detail {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			align-items: center;
+			line-height: 120%;
+			gap: 10rpx 0;
 
-            input {
-                font-size: 26rpx;
-            }
+			input {
+				font-size: 26rpx;
+			}
 
-            .detail {
-                // width: 50%;
-                box-sizing: border-box;
-                font-size: 26rpx;
-                color: #555;
-                padding-right: 20rpx;
+			.detail {
+				// width: 50%;
+				box-sizing: border-box;
+				font-size: 26rpx;
+				color: #555;
+				padding-right: 20rpx;
 
-                text {
-                    color: #999;
-                    font-size: 26rpx;
-                }
-            }
+				text {
+					color: #999;
+					font-size: 26rpx;
+				}
+			}
 
-            .editable {
-                width: 50%;
-                display: inline-flex;
-                flex-direction: row;
-                align-items: center;
+			.editable {
+				width: 50%;
+				display: inline-flex;
+				flex-direction: row;
+				align-items: center;
 
-                text {
-                    flex-shrink: 0;
-                }
+				text {
+					flex-shrink: 0;
+				}
 
-                .sampleDestory {
-                    border: 1px solid #acacac;
-                    border-radius: 5rpx;
-                    padding: 0 12rpx;
-                }
-            }
-        }
-    }
+				.sampleDestory {
+					border: 1px solid #acacac;
+					border-radius: 5rpx;
+					padding: 0 12rpx;
+				}
+			}
+		}
+	}
 
-    .icon-wrapper {
-        background-color: #3a78ff;
-        border-radius: 100%;
-        width: 40rpx;
-        height: 40rpx;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        flex-shrink: 0;
+	.icon-wrapper {
+		background-color: #3a78ff;
+		border-radius: 100%;
+		width: 40rpx;
+		height: 40rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-shrink: 0;
 
-        .uni-icons {
-            color: #fff !important;
-        }
-    }
+		.uni-icons {
+			color: #fff !important;
+		}
+	}
 
-    .icon-wrapper-big {
-        background-color: #3a78ff;
-        border-radius: 100%;
-        width: 50rpx;
-        height: 50rpx;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        flex-shrink: 0;
-        margin-left: 20rpx;
+	.icon-wrapper-big {
+		background-color: #3a78ff;
+		border-radius: 100%;
+		width: 50rpx;
+		height: 50rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-shrink: 0;
+		margin-left: 20rpx;
 
-        .uni-icons {
-            color: #fff !important;
-        }
-    }
+		.uni-icons {
+			color: #fff !important;
+		}
+	}
 
-    .more {
-        color: #888;
-        font-size: 22rpx;
-        display: flex;
-        border-top: 1px solid #eee;
-        padding-top: 10rpx;
+	.more {
+		color: #888;
+		font-size: 22rpx;
+		display: flex;
+		border-top: 1px solid #eee;
+		padding-top: 10rpx;
 
-        .part {
-            width: 100%;
-            text-align: center;
-        }
-    }
+		.part {
+			width: 100%;
+			text-align: center;
+		}
+	}
 
-    .pass-background {
-        background-color: #cee3f2;
-        border: none;
-    }
+	.pass-background {
+		background-color: #cee3f2;
+		border: none;
+	}
 
-    .unpass-background {
-        background-color: #f0d6e3;
-        border: none;
-    }
+	.unpass-background {
+		background-color: #f0d6e3;
+		border: none;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/baogong/AddLineBind.vue b/pages/baogong/AddLineBind.vue
index ed7c53e..85f14cb 100644
--- a/pages/baogong/AddLineBind.vue
+++ b/pages/baogong/AddLineBind.vue
@@ -1,435 +1,434 @@
 <template>
-    <view>
-        <view class="form" :style="{height: containerHeight + 'px',overflow: 'auto'}">
-            <view class="form-item">
-                <view class="title">鐢熶骇璧勬簮:</view>
-                <view class="right">
-                    <uni-combox 
-                        :candidates="arrayHSourceName" 
-                        placeholder="璇烽�夋嫨鐢熶骇璧勬簮" 
-                        v-model="hform.HSourceName"
-                        @input="HSourceNameChange">
-                    </uni-combox>
-                </view>
-            </view>
-            
-            <view class="form-item">
-                <view class="title">璐熻矗浜�:</view>
-                <view class="right">
-                    <uni-combox 
-                        :candidates="arrayHManagerName" 
-                        placeholder="璇烽�夋嫨璐熻矗浜�" 
-                        v-model="hform.HManagerName"
-                        @input="HManagerNameChange">
-                    </uni-combox>
-                </view>
-            </view>
-            
-            <view class="form-item">
-                <view class="title">鐝粍:</view>
-                <view class="right">
-                    <uni-combox 
-                        :candidates="arrayHGroupName" 
-                        placeholder="璇烽�夋嫨鐝粍" 
-                        v-model="hform.HGroupName"
-                        @input="HGroupNameChange">
-                    </uni-combox>
-                </view>
-            </view>
-            
-            <view class="form-item">
-                <view class="title">鍒涘缓鏃ユ湡:</view>
-                <view class="righton">
-                    <input disabled v-model="hform.HCreateDate" />
-                </view>
-            </view>
-            
-            <view class="form-item">
-                <view class="title">澶囨敞:</view>
-                <view class="right">
-                    <textarea v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" auto-height />
-                </view>
-            </view>
-        </view>
-        
-        <!-- 鎿嶄綔鎸夐挳 -->
-        <view class="buttons" id="buttons">
-            <button class="btn-c" size="mini" @tap="save">淇濆瓨</button>
-            <view style="flex: 1;"></view>
-            <button class="btn-a" size="mini" @tap="goBack">杩斿洖</button>
-        </view>
-        
-    </view>
+	<view>
+		<view class="form-item">
+			<view class="title">鐢熶骇璧勬簮:</view>
+			<view class="right">
+				<uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
+					@input="HSourceNameChange">
+				</uni-combox>
+			</view>
+		</view>
+
+		<view class="form-item">
+			<view class="title">璐熻矗浜�:</view>
+			<view class="right">
+				<uni-combox :candidates="arrayHManagerName" placeholder="璇烽�夋嫨璐熻矗浜�" v-model="hform.HManagerName"
+					@input="HManagerNameChange">
+				</uni-combox>
+			</view>
+		</view>
+
+		<view class="form-item">
+			<view class="title">鐝粍:</view>
+			<view class="right">
+				<uni-combox :candidates="arrayHGroupName" placeholder="璇烽�夋嫨鐝粍" v-model="hform.HGroupName"
+					@input="HGroupNameChange">
+				</uni-combox>
+			</view>
+		</view>
+
+		<view class="form-item">
+			<view class="title">鍒涘缓鏃ユ湡:</view>
+			<view class="righton">
+				<input disabled v-model="hform.HCreateDate" />
+			</view>
+		</view>
+
+		<view class="form-item">
+			<view class="title">澶囨敞:</view>
+			<view class="right">
+				<textarea v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" auto-height />
+			</view>
+		</view>
+
+		<!-- 鎿嶄綔鎸夐挳 -->
+		<view class="buttons" id="buttons">
+			<button class="btn-c" size="mini" @tap="save">淇濆瓨</button>
+			<view style="flex: 1;"></view>
+			<button class="btn-a" size="mini" @tap="goBack">杩斿洖</button>
+		</view>
+
+	</view>
 </template>
 
 <script>
-    import dayjs from "dayjs";
-    import { CommonUtils } from "@/utils/common";
-    import { getUserInfo } from "@/utils/auth";
+	import dayjs from "dayjs";
+	import {
+		CommonUtils
+	} from "@/utils/common";
+	import {
+		getUserInfo
+	} from "@/utils/auth";
 
-    export default {
-        name: 'AddLineBind',
-        data() {
-            return {
-                // 绉婚櫎btnTop锛屾敼鐢ㄥ浐瀹氬簳閮ㄥ竷灞�
-                // 鏁版嵁鍒楄〃
-                HSourceNameList: [],
-                HManagerNameList: [],
-                HGroupNameList: [],
-                
-                // 鐢ㄤ簬uni-combox鐨勬暟缁�
-                arrayHSourceName: [],
-                arrayHManagerName: [],
-                arrayHGroupName: [],
-                
-                hform: {
-                    HUserName: getUserInfo()['Czymc'] || uni.getStorageSync('HUserName'),
-                    HSourceID: getUserInfo()['HSourceID'],
-                    HSourceName: getUserInfo()['HSource'],
-                    HManagerID: getUserInfo()['HKeeperID'],
-                    HManagerName: getUserInfo()['HKeeper'],
-                    HGroupID: getUserInfo()['HGroupID'],
-                    HGroupName: getUserInfo()['HGroup'],
-                    HCreateDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
-                    HRemark: ''
-                },
-                
-                // 鏈嶅姟鍣ㄥ湴鍧�
-                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-                
-                // 娣诲姞绐楀彛楂樺害
-                windowHeight: 0
-            };
-        },
-		onUnload() {
-		  // 椤甸潰鍏抽棴鏃惰Е鍙戝埛鏂�
-		  uni.$emit('refreshDeviceList');
+	export default {
+		name: 'AddLineBind',
+		data() {
+			return {
+				// 绉婚櫎btnTop锛屾敼鐢ㄥ浐瀹氬簳閮ㄥ竷灞�
+				// 鏁版嵁鍒楄〃
+				HSourceNameList: [],
+				HManagerNameList: [],
+				HGroupNameList: [],
+
+				// 鐢ㄤ簬uni-combox鐨勬暟缁�
+				arrayHSourceName: [],
+				arrayHManagerName: [],
+				arrayHGroupName: [],
+
+				hform: {
+					HUserName: getUserInfo()['Czymc'] || uni.getStorageSync('HUserName'),
+					HSourceID: getUserInfo()['HSourceID'],
+					HSourceName: getUserInfo()['HSource'],
+					HManagerID: getUserInfo()['HKeeperID'],
+					HManagerName: getUserInfo()['HKeeper'],
+					HGroupID: getUserInfo()['HGroupID'],
+					HGroupName: getUserInfo()['HGroup'],
+					HCreateDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+					HRemark: ''
+				},
+
+				// 鏈嶅姟鍣ㄥ湴鍧�
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+
+				// 娣诲姞绐楀彛楂樺害
+				windowHeight: 0
+			};
 		},
-        methods: {
-            // 鑾峰彇鎵�鏈夊垪琛ㄦ暟鎹�
-            async getListData() {
-                // 鑾峰彇鐢熶骇璧勬簮鍒楄〃
-                await this.getSourceList();
-                // 鑾峰彇璐熻矗浜哄垪琛紙浜哄憳鍒楄〃锛�
-                await this.getManagerList();
-                // 鑾峰彇鐝粍鍒楄〃
-                await this.getGroupList();
-            },
-            
-            // 鑾峰彇鐢熶骇璧勬簮鍒楄〃
-            async getSourceList() {
-                try {
-                    const res = await uni.request({
-                        url: this.serverUrl + '/api/newBill/getSourceList',
-                        data: {
-                            sWhere: ""
-                        }
-                    });
-                    
-                    if (res[1].data.code == 1) {
-                        this.HSourceNameList = res[1].data.data.Gy_Source || [];
-                        for (let i = 0; i < this.HSourceNameList.length; i++) {
-                            this.arrayHSourceName[i] = this.HSourceNameList[i].鐢熶骇璧勬簮;
-                        }
-                        this.$forceUpdate();
-                    } else {
-                        uni.showToast({
-                            title: '鑾峰彇鐢熶骇璧勬簮鍒楄〃澶辫触',
-                            icon: 'none'
-                        });
-                    }
-                } catch (error) {
-                    console.log(error);
-                    uni.showToast({
-                        title: '鑾峰彇鐢熶骇璧勬簮鍒楄〃澶辫触',
-                        icon: 'none'
-                    });
-                }
-            },
-            
-            // 鑾峰彇璐熻矗浜哄垪琛紙浜哄憳鍒楄〃锛�
-            async getManagerList() {
-                try {
-                    const res = await uni.request({
-                        url: this.serverUrl + '/Web/GetEmployeeList_Json',
-                        data: {
-                            Employee: '',
-                            HGroupID: 0
-                        }
-                    });
-                    
-                    if (res[1].data.count == 1) {
-                        this.HManagerNameList = res[1].data.data || [];
-                        for (let i = 0; i < this.HManagerNameList.length; i++) {
-                            this.arrayHManagerName[i] = this.HManagerNameList[i].HName;
-                        }
-                        this.$forceUpdate();
-                    } else {
-                        uni.showToast({
-                            title: '鑾峰彇璐熻矗浜哄垪琛ㄥけ璐�',
-                            icon: 'none'
-                        });
-                    }
-                } catch (error) {
-                    console.log(error);
-                    uni.showToast({
-                        title: '鑾峰彇璐熻矗浜哄垪琛ㄥけ璐�',
-                        icon: 'none'
-                    });
-                }
-            },
-            
-            // 鑾峰彇鐝粍鍒楄〃
-            async getGroupList() {
-                try {
-                    const res = await uni.request({
-                        url: this.serverUrl + '/Gy_Group/list',
-                        method: 'GET',
-                        data: {
-                            sWhere: "",
-                            user: uni.getStorageSync('HUserName')
-                        }
-                    });
-                    
-                    if (res[1].data.count == 1) {
-                        this.HGroupNameList = res[1].data.data || [];
-                        for (let i = 0; i < this.HGroupNameList.length; i++) {
-                            this.arrayHGroupName[i] = this.HGroupNameList[i].鐝粍鍚嶇О || this.HGroupNameList[i].HName;
-                        }
-                        this.$forceUpdate();
-                    } else {
-                        uni.showToast({
-                            title: '鑾峰彇鐝粍鍒楄〃澶辫触',
-                            icon: 'none'
-                        });
-                    }
-                } catch (error) {
-                    console.log(error);
-                    uni.showToast({
-                        title: '鑾峰彇鐝粍鍒楄〃澶辫触',
-                        icon: 'none'
-                    });
-                }
-            },
-            
-            // 閫夋嫨鐢熶骇璧勬簮
-            HSourceNameChange(e) {
-                for (let i = 0; i < this.HSourceNameList.length; i++) {
-                    if (this.HSourceNameList[i].鐢熶骇璧勬簮 == e) {
-                        this.hform.HSourceName = this.HSourceNameList[i].鐢熶骇璧勬簮;
-                        this.hform.HSourceID = this.HSourceNameList[i].HItemID;
-                        this.hform.HSourceCode = this.HSourceNameList[i].璧勬簮浠ｇ爜 || '';
-                        break;
-                    }
-                }
-            },
-            
-            // 閫夋嫨璐熻矗浜�
-            HManagerNameChange(e) {
-                for (let i = 0; i < this.HManagerNameList.length; i++) {
-                    if (this.HManagerNameList[i].HName == e) {
-                        this.hform.HManagerName = this.HManagerNameList[i].HName;
-                        this.hform.HManagerID = this.HManagerNameList[i].HItemID;
-                        break;
-                    }
-                }
-            },
-            
-            // 閫夋嫨鐝粍
-            HGroupNameChange(e) {
-                for (let i = 0; i < this.HGroupNameList.length; i++) {
-                    const groupName = this.HGroupNameList[i].鐝粍鍚嶇О || this.HGroupNameList[i].HName;
-                    if (groupName == e) {
-                        this.hform.HGroupName = groupName;
-                        this.hform.HGroupID = this.HGroupNameList[i].HItemID;
-                        break;
-                    }
-                }
-            },
-            
-            // 楠岃瘉琛ㄥ崟
-            validateForm() {
-                if (!this.hform.HSourceID || this.hform.HSourceID == 0) {
-                    uni.showToast({
-                        title: '璇烽�夋嫨鐢熶骇璧勬簮',
-                        icon: 'none'
-                    });
-                    return false;
-                }
-                
-                if (!this.hform.HManagerID || this.hform.HManagerID == 0) {
-                    uni.showToast({
-                        title: '璇烽�夋嫨璐熻矗浜�',
-                        icon: 'none'
-                    });
-                    return false;
-                }
-                
-                return true;
-            },
-            
-            // 淇濆瓨鏁版嵁
-            async save() {
-                if (!this.validateForm()) {
-                    return;
-                }
-                
-                uni.showLoading({
-                    title: '淇濆瓨涓�...'
-                });
-                
-                try {
-                    const res = await CommonUtils.doRequest2Sync({
-                        url: "/ReportPlatForm/SaveGetLineBindBillList",
-                        data: {
-                            HUserName: this.hform.HUserName,
-                            HSourceID: this.hform.HSourceID,
-                            HSourceName: this.hform.HSourceName,
-                            HManagerID: this.hform.HManagerID,
-                            HManagerName: this.hform.HManagerName,
-                            HGroupID: this.hform.HGroupID,
-                            HGroupName: this.hform.HGroupName,
-                            HCreateDate: this.hform.HCreateDate,
-                            HRemark: this.hform.HRemark
-                        },
-                        method: "GET"
-                    });
-                    
-                    uni.hideLoading();
-                    
-                    if (res.data.count == 1) {
-                        uni.showToast({
-                            title: '淇濆瓨鎴愬姛',
-                            icon: 'success',
-                            success: () => {
-                                setTimeout(() => {
-                                    // 淇濆瓨鎴愬姛鍚庤繑鍥炰笂涓�椤�
-                                    uni.navigateBack();
-                                }, 1500);
-                            }
-                        });
-                    } else {
-                        uni.showToast({
-                            title: res.data.Message || '淇濆瓨澶辫触',
-                            icon: 'none'
-                        });
-                    }
-                } catch (err) {
-                    uni.hideLoading();
-                    uni.showToast({
-                        title: '淇濆瓨澶辫触: ' + err,
-                        icon: 'none'
-                    });
-                }
-            },
-            
-            // 杩斿洖涓婁竴椤�
-            goBack() {
-                uni.navigateBack();
-            }
-        },
-        onLoad() {
-            // 鍒濆鍖栨暟鎹�
-            this.hform.HUserName = getUserInfo()['Czymc'] || uni.getStorageSync('HUserName');
-            // 鑾峰彇鎵�鏈夊垪琛ㄦ暟鎹�
-            this.getListData();
-            
-            // 鑾峰彇绐楀彛楂樺害
-            const systemInfo = uni.getSystemInfoSync();
-            this.windowHeight = systemInfo.windowHeight;
-        },
-        onReady() {
-            // 绉婚櫎鍘熸潵鐨勬寜閽綅缃绠楋紝浣跨敤鍥哄畾搴曢儴甯冨眬
-        }
-    }
+		onUnload() {
+			// 椤甸潰鍏抽棴鏃惰Е鍙戝埛鏂�
+			uni.$emit('refreshDeviceList');
+		},
+		methods: {
+			// 鑾峰彇鎵�鏈夊垪琛ㄦ暟鎹�
+			async getListData() {
+				// 鑾峰彇鐢熶骇璧勬簮鍒楄〃
+				await this.getSourceList();
+				// 鑾峰彇璐熻矗浜哄垪琛紙浜哄憳鍒楄〃锛�
+				await this.getManagerList();
+				// 鑾峰彇鐝粍鍒楄〃
+				await this.getGroupList();
+			},
+
+			// 鑾峰彇鐢熶骇璧勬簮鍒楄〃
+			async getSourceList() {
+				try {
+					const res = await uni.request({
+						url: this.serverUrl + '/api/newBill/getSourceList',
+						data: {
+							sWhere: ""
+						}
+					});
+
+					if (res[1].data.code == 1) {
+						this.HSourceNameList = res[1].data.data.Gy_Source || [];
+						for (let i = 0; i < this.HSourceNameList.length; i++) {
+							this.arrayHSourceName[i] = this.HSourceNameList[i].鐢熶骇璧勬簮;
+						}
+						this.$forceUpdate();
+					} else {
+						uni.showToast({
+							title: '鑾峰彇鐢熶骇璧勬簮鍒楄〃澶辫触',
+							icon: 'none'
+						});
+					}
+				} catch (error) {
+					console.log(error);
+					uni.showToast({
+						title: '鑾峰彇鐢熶骇璧勬簮鍒楄〃澶辫触',
+						icon: 'none'
+					});
+				}
+			},
+
+			// 鑾峰彇璐熻矗浜哄垪琛紙浜哄憳鍒楄〃锛�
+			async getManagerList() {
+				try {
+					const res = await uni.request({
+						url: this.serverUrl + '/Web/GetEmployeeList_Json',
+						data: {
+							Employee: '',
+							HGroupID: 0
+						}
+					});
+
+					if (res[1].data.count == 1) {
+						this.HManagerNameList = res[1].data.data || [];
+						for (let i = 0; i < this.HManagerNameList.length; i++) {
+							this.arrayHManagerName[i] = this.HManagerNameList[i].HName;
+						}
+						this.$forceUpdate();
+					} else {
+						uni.showToast({
+							title: '鑾峰彇璐熻矗浜哄垪琛ㄥけ璐�',
+							icon: 'none'
+						});
+					}
+				} catch (error) {
+					console.log(error);
+					uni.showToast({
+						title: '鑾峰彇璐熻矗浜哄垪琛ㄥけ璐�',
+						icon: 'none'
+					});
+				}
+			},
+
+			// 鑾峰彇鐝粍鍒楄〃
+			async getGroupList() {
+				try {
+					const res = await uni.request({
+						url: this.serverUrl + '/Gy_Group/list',
+						method: 'GET',
+						data: {
+							sWhere: "",
+							user: uni.getStorageSync('HUserName')
+						}
+					});
+
+					if (res[1].data.count == 1) {
+						this.HGroupNameList = res[1].data.data || [];
+						for (let i = 0; i < this.HGroupNameList.length; i++) {
+							this.arrayHGroupName[i] = this.HGroupNameList[i].鐝粍鍚嶇О || this.HGroupNameList[i].HName;
+						}
+						this.$forceUpdate();
+					} else {
+						uni.showToast({
+							title: '鑾峰彇鐝粍鍒楄〃澶辫触',
+							icon: 'none'
+						});
+					}
+				} catch (error) {
+					console.log(error);
+					uni.showToast({
+						title: '鑾峰彇鐝粍鍒楄〃澶辫触',
+						icon: 'none'
+					});
+				}
+			},
+
+			// 閫夋嫨鐢熶骇璧勬簮
+			HSourceNameChange(e) {
+				for (let i = 0; i < this.HSourceNameList.length; i++) {
+					if (this.HSourceNameList[i].鐢熶骇璧勬簮 == e) {
+						this.hform.HSourceName = this.HSourceNameList[i].鐢熶骇璧勬簮;
+						this.hform.HSourceID = this.HSourceNameList[i].HItemID;
+						this.hform.HSourceCode = this.HSourceNameList[i].璧勬簮浠ｇ爜 || '';
+						break;
+					}
+				}
+			},
+
+			// 閫夋嫨璐熻矗浜�
+			HManagerNameChange(e) {
+				for (let i = 0; i < this.HManagerNameList.length; i++) {
+					if (this.HManagerNameList[i].HName == e) {
+						this.hform.HManagerName = this.HManagerNameList[i].HName;
+						this.hform.HManagerID = this.HManagerNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+
+			// 閫夋嫨鐝粍
+			HGroupNameChange(e) {
+				for (let i = 0; i < this.HGroupNameList.length; i++) {
+					const groupName = this.HGroupNameList[i].鐝粍鍚嶇О || this.HGroupNameList[i].HName;
+					if (groupName == e) {
+						this.hform.HGroupName = groupName;
+						this.hform.HGroupID = this.HGroupNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+
+			// 楠岃瘉琛ㄥ崟
+			validateForm() {
+				if (!this.hform.HSourceID || this.hform.HSourceID == 0) {
+					uni.showToast({
+						title: '璇烽�夋嫨鐢熶骇璧勬簮',
+						icon: 'none'
+					});
+					return false;
+				}
+
+				if (!this.hform.HManagerID || this.hform.HManagerID == 0) {
+					uni.showToast({
+						title: '璇烽�夋嫨璐熻矗浜�',
+						icon: 'none'
+					});
+					return false;
+				}
+
+				return true;
+			},
+
+			// 淇濆瓨鏁版嵁
+			async save() {
+				if (!this.validateForm()) {
+					return;
+				}
+
+				uni.showLoading({
+					title: '淇濆瓨涓�...'
+				});
+
+				try {
+					const res = await CommonUtils.doRequest2Sync({
+						url: "/ReportPlatForm/SaveGetLineBindBillList",
+						data: {
+							HUserName: this.hform.HUserName,
+							HSourceID: this.hform.HSourceID,
+							HSourceName: this.hform.HSourceName,
+							HManagerID: this.hform.HManagerID,
+							HManagerName: this.hform.HManagerName,
+							HGroupID: this.hform.HGroupID,
+							HGroupName: this.hform.HGroupName,
+							HCreateDate: this.hform.HCreateDate,
+							HRemark: this.hform.HRemark
+						},
+						method: "GET"
+					});
+
+					uni.hideLoading();
+
+					if (res.data.count == 1) {
+						uni.showToast({
+							title: '淇濆瓨鎴愬姛',
+							icon: 'success',
+							success: () => {
+								setTimeout(() => {
+									// 淇濆瓨鎴愬姛鍚庤繑鍥炰笂涓�椤�
+									uni.navigateBack();
+								}, 1500);
+							}
+						});
+					} else {
+						uni.showToast({
+							title: res.data.Message || '淇濆瓨澶辫触',
+							icon: 'none'
+						});
+					}
+				} catch (err) {
+					uni.hideLoading();
+					uni.showToast({
+						title: '淇濆瓨澶辫触: ' + err,
+						icon: 'none'
+					});
+				}
+			},
+
+			// 杩斿洖涓婁竴椤�
+			goBack() {
+				uni.navigateBack();
+			}
+		},
+		onLoad() {
+			// 鍒濆鍖栨暟鎹�
+			this.hform.HUserName = getUserInfo()['Czymc'] || uni.getStorageSync('HUserName');
+			// 鑾峰彇鎵�鏈夊垪琛ㄦ暟鎹�
+			this.getListData();
+
+			// 鑾峰彇绐楀彛楂樺害
+			const systemInfo = uni.getSystemInfoSync();
+			this.windowHeight = systemInfo.windowHeight;
+		},
+		onReady() {
+			// 绉婚櫎鍘熸潵鐨勬寜閽綅缃绠楋紝浣跨敤鍥哄畾搴曢儴甯冨眬
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-    .form {
-        padding: 20rpx;
-        // 娣诲姞搴曢儴鍐呰竟璺濓紝涓哄簳閮ㄦ寜閽暀鍑虹┖闂�
-        padding-bottom: 160rpx; // 鎸夐挳楂樺害 + 棰濆闂磋窛
-    }
-    
-    .form-item {
-        display: flex;
-        align-items: center;
-        font-size: 28rpx;
-        padding: 6rpx 0;
-        margin-bottom: 20rpx;
-        
-        .title {
-            width: 180rpx;
-            flex-shrink: 0;
-        }
-        
-        .right {
-            flex: 1;
-            border-radius: 22rpx;
-            border: 1px solid #acacac;
-            padding: 0 20rpx;
-            min-height: 70rpx;
-            display: flex;
-            align-items: center;
-            
-            input, textarea {
-                width: 100%;
-                font-size: 30rpx;
-            }
-            
-            textarea {
-                padding: 20rpx 0;
-                min-height: 100rpx;
-            }
-        }
-        
-        .righton {
-            flex: 1;
-            border-radius: 22rpx;
-            border: 1px solid #e4e4e4;
-            background-color: #e4e4e4;
-            padding: 0 20rpx;
-            min-height: 70rpx;
-            display: flex;
-            align-items: center;
-            
-            input {
-                width: 100%;
-                font-size: 30rpx;
-                color: #666;
-            }
-        }
-    }
-    
-    .buttons {
-        position: fixed; // 鏀逛负鍥哄畾瀹氫綅
-        bottom: 0; // 鍥哄畾鍦ㄥ簳閮�
-        left: 0;
-        right: 0;
-        width: 100%;
-        display: flex;
-        padding: 20rpx;
-        background-color: #fff;
-        border-top: 1px solid #eee;
-        box-sizing: border-box; // 纭繚鍐呰竟璺濅笉褰卞搷瀹藉害
-        z-index: 999; // 纭繚鎸夐挳鍦ㄦ渶涓婂眰
-        
-        button {
-            border-radius: 50rpx;
-            width: 180rpx;
-            height: 66rpx;
-            line-height: 66rpx;
-            font-size: 28rpx;
-        }
-        
-        .btn-a {
-            background-color: #acacac;
-            color: #fff;
-        }
-        
-        .btn-c {
-            background-color: #3a78ff;
-            color: #fff;
-        }
-    }
+	.form {
+		padding: 20rpx;
+		// 浣跨敤 calc 璁＄畻楂樺害
+		height: calc(100vh - 160rpx);
+		/* 鍑忓幓搴曢儴鎸夐挳鍖哄煙鐨勯珮搴� */
+		overflow: auto;
+		box-sizing: border-box;
+		/* 纭繚鍐呰竟璺濅笉褰卞搷楂樺害璁＄畻 */
+	}
+
+	.form-item {
+		display: flex;
+		align-items: center;
+		font-size: 28rpx;
+		padding: 6rpx 0;
+		margin-bottom: 20rpx;
+		margin-left: 10px;
+
+		.title {
+			width: 180rpx;
+			flex-shrink: 0;
+		}
+
+		.right {
+			flex: 1;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+			padding: 0 20rpx;
+			min-height: 70rpx;
+			display: flex;
+			align-items: center;
+
+			input,
+			textarea {
+				width: 100%;
+				font-size: 30rpx;
+			}
+
+			textarea {
+				padding: 20rpx 0;
+				min-height: 100rpx;
+			}
+		}
+
+		.righton {
+			flex: 1;
+			border-radius: 22rpx;
+			border: 1px solid #e4e4e4;
+			background-color: #e4e4e4;
+			padding: 0 20rpx;
+			min-height: 70rpx;
+			display: flex;
+			align-items: center;
+
+			input {
+				width: 100%;
+				font-size: 30rpx;
+				color: #666;
+			}
+		}
+	}
+
+	.buttons {
+		position: fixed; // 鏀逛负鍥哄畾瀹氫綅
+		bottom: 0; // 鍥哄畾鍦ㄥ簳閮�
+		left: 0;
+		right: 0;
+		width: 100%;
+		display: flex;
+		padding: 20rpx;
+		background-color: #fff;
+		border-top: 1px solid #eee;
+		box-sizing: border-box; // 纭繚鍐呰竟璺濅笉褰卞搷瀹藉害
+		z-index: 999; // 纭繚鎸夐挳鍦ㄦ渶涓婂眰
+
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
+
+		.btn-a {
+			background-color: #acacac;
+			color: #fff;
+		}
+
+		.btn-c {
+			background-color: #3a78ff;
+			color: #fff;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/baogong/OA_ErrMsgBackBill.vue b/pages/baogong/OA_ErrMsgBackBill.vue
index 591952e..bd8928a 100644
--- a/pages/baogong/OA_ErrMsgBackBill.vue
+++ b/pages/baogong/OA_ErrMsgBackBill.vue
@@ -281,7 +281,6 @@
 	import {
 		getUserInfo
 	} from "../../utils/auth";
-	import "@/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss"
 	export default {
 		data() {
 			return {
@@ -367,7 +366,7 @@
 					HReTransmitMan: '', // 杞彂鑷�
 					HSourceName: '', // 鐢熶骇璧勬簮
 					HSourceID: '0', // 鐢熶骇璧勬簮ID
-					HCenterName: getUserInfo().HWorkCenter, // 杞﹂棿
+					HCenterName: getUserInfo().HWorkCenterName, // 杞﹂棿
 					HCenterID: getUserInfo().HWorkCenterID, // 杞﹂棿ID
 					HQty: 0, // 鏁伴噺
 					HDeleteMan: '', // 浣滃簾浜�
@@ -770,9 +769,10 @@
 			getShiftsList() {
 				return new Promise((resolve, reject) => {
 					uni.request({
-						url: this.serverUrl + '/Web/GetGy_ShiftsList_Json',
+						url:  this.serverUrl + '/Gy_ShiftsController/Get_Gy_WorkShiftList',
 						data: {
-							Shifts: ""
+							sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'')  != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}'`,
+							HMaker: getUserInfo()["Czymc"],
 						},
 						success: (res) => {
 							if (res.data.count == 1) {
@@ -1156,4 +1156,5 @@
 </script>
 
 <style lang="scss">
+    @import "@/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss"
 </style>
\ No newline at end of file
diff --git a/pages/index/login.vue b/pages/index/login.vue
index e5484ab..afc19a5 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -1,14 +1,14 @@
 <template>
-    <view class="content">
-        <image class="bg-img" src="../../static/login.jpg"></image>
-        <view class="container">
-            <view class="title">{{ $t("login.title") }}</view>
-            <view class="box">
-                <view class="logo">
-                    <image src="../../static/logo.png" mode=""></image>
-                </view>
-                <view class="login">
-                    <!--                     <view class="item">
+	<view class="content">
+		<image class="bg-img" src="../../static/login.jpg"></image>
+		<view class="container">
+			<view class="title">{{ $t("login.title") }}</view>
+			<view class="box">
+				<view class="logo">
+					<image src="../../static/logo.png" mode=""></image>
+				</view>
+				<view class="login">
+					<!--                     <view class="item">
                         <view class="left">褰撳墠甯愬锛�</view>
                         <picker :range="arrayDataBases" :value="DataBases" @change="DataBasesChange">
                             <view class="right" style="display: flex;align-items: center;">
@@ -17,311 +17,314 @@
                             </view>
                         </picker>
                     </view> -->
-                    <view class="item">
-                        <view class="left">{{ $t("login.Language") }}锛�</view>
-                        <picker :range="['涓枃','English']" :value="Language" @change="onLanguageChangeHandler">
-                            <view class="right" style="display: flex;align-items: center;">
-                                <input type="text" disabled v-model="Language" placeholder="璇烽�夋嫨璇█">
-                                <uni-icons type="forward" color="#808080"
-                                    style="border-left: 1px solid #aaaaaa;padding: 0 8rpx;" size="18"></uni-icons>
-                            </view>
-                        </picker>
-                    </view>
-                    <view class="item">
-                        <view class="left">{{ $t("login.CurrentOrganization") }}锛�</view>
-                        <picker :range="arrayOrganization" :value="Organization" @change="OrganizationChange">
-                            <view class="right" style="display: flex;align-items: center;">
-                                <input type="text" disabled v-model="Organization" placeholder="璇烽�夋嫨褰撳墠缁勭粐">
-                                <uni-icons type="forward" color="#808080"
-                                    style="border-left: 1px solid #aaaaaa;padding: 0 8rpx;" size="18"></uni-icons>
-                            </view>
-                        </picker>
-                    </view>
+					<view class="item">
+						<view class="left">{{ $t("login.Language") }}锛�</view>
+						<picker :range="['涓枃','English']" :value="Language" @change="onLanguageChangeHandler">
+							<view class="right" style="display: flex;align-items: center;">
+								<input type="text" disabled v-model="Language" placeholder="璇烽�夋嫨璇█">
+								<uni-icons type="forward" color="#808080"
+									style="border-left: 1px solid #aaaaaa;padding: 0 8rpx;" size="18"></uni-icons>
+							</view>
+						</picker>
+					</view>
+					<view class="item">
+						<view class="left">{{ $t("login.CurrentOrganization") }}锛�</view>
+						<picker :range="arrayOrganization" :value="Organization" @change="OrganizationChange">
+							<view class="right" style="display: flex;align-items: center;">
+								<input type="text" disabled v-model="Organization" placeholder="璇烽�夋嫨褰撳墠缁勭粐">
+								<uni-icons type="forward" color="#808080"
+									style="border-left: 1px solid #aaaaaa;padding: 0 8rpx;" size="18"></uni-icons>
+							</view>
+						</picker>
+					</view>
 
-                    <view class="item">
-                        <view class="left">{{ $t("login.UserName") }}锛�</view>
-                        <view class="right">
-                            <input type="text" v-model="UserName">
-                        </view>
-                    </view>
-                    <view class="item">
-                        <view class="left">{{ $t("login.PassWord") }}锛�</view>
-                        <view class="right">
-                            <input type="password" v-model="PassWord">
-                        </view>
-                    </view>
-                    <!--                     <view class="api">
+					<view class="item">
+						<view class="left">{{ $t("login.UserName") }}锛�</view>
+						<view class="right">
+							<input type="text" v-model="UserName">
+						</view>
+					</view>
+					<view class="item">
+						<view class="left">{{ $t("login.PassWord") }}锛�</view>
+						<view class="right">
+							<input type="password" v-model="PassWord">
+						</view>
+					</view>
+					<!--                     <view class="api">
                         褰撳墠鏈嶅姟鍣ㄥ湴鍧�锛歿{serverUrl}}
                     </view>
                     <view class="apibtn" @tap="changeApi=true">淇敼鏈嶅姟鍣ㄥ湴鍧�</view> -->
-                </view>
-            </view>
-            <uni-popup ref="popup" type="center">
-                <uni-popup-dialog :title="$t('login.ServiceSetting')" mode="input" @confirm="confirmHandler"
-                    :before-close="true" @close="close">
-                    <view class="popup-content">
-                        <input type="text" v-model="serverUrlName" placeholder="璇疯緭鍏ユ湇鍔″櫒鍚嶇О">
-                    </view>
-                </uni-popup-dialog>
-            </uni-popup>
+				</view>
+			</view>
+			<uni-popup ref="popup" type="center">
+				<uni-popup-dialog :title="$t('login.ServiceSetting')" mode="input" @confirm="confirmHandler"
+					:before-close="true" @close="close">
+					<view class="popup-content">
+						<input type="text" v-model="serverUrlName" placeholder="璇疯緭鍏ユ湇鍔″櫒鍚嶇О">
+					</view>
+				</uni-popup-dialog>
+			</uni-popup>
 
-            <view class="btn" @tap="submit">{{$t("login.Login")}}</view>
-            <view class="btn apibtn" @click="openServerSettingHandler">{{$t("login.ServiceSetting")}}</view>
+			<view class="btn" @tap="submit">{{$t("login.Login")}}</view>
+			<view class="btn apibtn" @click="openServerSettingHandler">{{$t("login.ServiceSetting")}}</view>
 
-        </view>
-    </view>
+		</view>
+	</view>
 </template>
 
 <script>
-    import {
-        setLoginData,
-        setUserInfo
-    } from "@/utils/auth.js";
-    import hFormAlert from '@/components/h-form-alert/h-form-alert.vue';
-    import {
-        CommonUtils
-    } from "../../utils/common";
-    import { getLanguagePackJson } from "../../utils/i18n";
-    import WebSocketServices from "@/utils/WebSocketServices";
-    export default {
-        components: {
-            hFormAlert
-        },
-        mounted() {
-            console.log(uni.getLocale())
-        },
-        data() {
-            return {
-                WebSocketServices,
-                CommonUtils,
-                arrayDataBases: [],
-                DataBases: '',
-                Language: '涓枃',
-                serverUrlandName: {
-                    "娴欐睙鏅轰簯杩堟��": 'http://47.96.97.237/API/',
-                    "娓╁窞娴疯瘹鍏夊": 'http://122.228.39.234:7177/API/',
-                    "瀹佹尝鎯犲悍宸ヤ笟": 'http://172.16.72.30:6699/API/',
-                    "浣欏鍏磋揪璧峰姩鍣�": 'http://121.37.133.104/API/',
-                    "鏉庢灄淇婃湰鍦版祴璇�": 'http://localhost:8082/LuBaoAPI/',
-                    "鏉窞鍑礉濂堢壒": 'http://192.168.50.253:8080/API/',
-                    "鏉窞鍑礉濂堢壒澶栫綉": 'http://erp.hzcabinet.cn:9090/API/',
-                    "缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
-                    "闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.121:81/API/',
-                    "闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.255.35:81/API/',
-                    "寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
-                    "浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
-                    // 灏忓崼鍐呭缃�
-                    "鑻忓窞鍗櫤绉戞妧-澶栫綉": 'http://221.224.60.42:8082/API_WW/',
-                    "鑻忓窞鍗櫤绉戞妧-鍐呯綉": 'http://172.16.20.233:8082/API_NW/',
-                    // 鍥涚淮灏斿唴澶栫綉
-                    "瀹佹尝鍥涚淮灏�-鍐呯綉": "http://192.168.0.236:9010/API/",
-                    "瀹佹尝鍥涚淮灏�-澶栫綉": "http://220.189.218.155:9010/API/",
-                    // 閿﹂殕
-                    "閿﹂殕-鏅鸿兘瀹跺眳": "http://192.168.1.11/API/",
-                    "閿﹂殕-鏅鸿兘瀹跺眳-澶栫綉": "http://61.174.29.234:8880/API/",
+	import {
+		setLoginData,
+		setUserInfo
+	} from "@/utils/auth.js";
+	import hFormAlert from '@/components/h-form-alert/h-form-alert.vue';
+	import {
+		CommonUtils
+	} from "../../utils/common";
+	import {
+		getLanguagePackJson
+	} from "../../utils/i18n";
+	import WebSocketServices from "@/utils/WebSocketServices";
+	import getuiUtils from "../../utils/getuiUtils";
+	export default {
+		components: {
+			hFormAlert
+		},
+		mounted() {
+			console.log(uni.getLocale())
+		},
+		data() {
+			return {
+				WebSocketServices,
+				CommonUtils,
+				arrayDataBases: [],
+				DataBases: '',
+				Language: '涓枃',
+				serverUrlandName: {
+					"娴欐睙鏅轰簯杩堟��": 'http://47.96.97.237/API/',
+					"娓╁窞娴疯瘹鍏夊": 'http://122.228.39.234:7177/API/',
+					"瀹佹尝鎯犲悍宸ヤ笟": 'http://172.16.72.30:6699/API/',
+					"浣欏鍏磋揪璧峰姩鍣�": 'http://121.37.133.104/API/',
+					"鏉庢灄淇婃湰鍦版祴璇�": 'http://localhost:8082/LuBaoAPI/',
+					"鏉窞鍑礉濂堢壒": 'http://192.168.50.253:8080/API/',
+					"鏉窞鍑礉濂堢壒澶栫綉": 'http://erp.hzcabinet.cn:9090/API/',
+					"缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
+					"闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.121:81/API/',
+					"闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.0.102:81/API/',
+					"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
+					"浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
+					// 灏忓崼鍐呭缃�
+					"鑻忓窞鍗櫤绉戞妧-澶栫綉": 'http://221.224.60.42:8082/API_WW/',
+					"鑻忓窞鍗櫤绉戞妧-鍐呯綉": 'http://172.16.20.233:8082/API_NW/',
+					// 鍥涚淮灏斿唴澶栫綉
+					"瀹佹尝鍥涚淮灏�-鍐呯綉": "http://192.168.0.236:9010/API/",
+					"瀹佹尝鍥涚淮灏�-澶栫綉": "http://220.189.218.155:9010/API/",
+					// 閿﹂殕
+					"閿﹂殕-鏅鸿兘瀹跺眳": "http://192.168.1.11/API/",
+					"閿﹂殕-鏅鸿兘瀹跺眳-澶栫綉": "http://61.174.29.234:8880/API/",
 					// 鍗庤垷鍖呰
 					"瀹佹尝鍗庤垷鍖呰1": "http://192.168.110.222:8082/API_NW/",
-                    "瀹佹尝鍗庤垷鍖呰2": "http://192.168.88.167:8082/API_NW/",
+					"瀹佹尝鍗庤垷鍖呰2": "http://192.168.88.167:8082/API_NW/",
 					"瀹佹尝鍗庤垷鍖呰": "http://61.164.64.222:8082/API_WW/",
-                },
-                serverUrlName:uni.getStorageSync('serverUrlName') || '娴欐睙鏅轰簯杩堟��',
+				},
+				serverUrlName: uni.getStorageSync('serverUrlName') || '娴欐睙鏅轰簯杩堟��',
 
-                arrayOrganization: [],
-                Organization: '',
-                HOrgNameList: [],
+				arrayOrganization: [],
+				Organization: '',
+				HOrgNameList: [],
 
-                HOrgName: '',
-                UserName: '', //admin    001
-                PassWord: '', //123456
-                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API/',
-                serverUrlCache: '',
-            }
-        },
-        onLoad() {
-            this.ApplyLanguagePack(this.$i18n.locale)
-        },
-        onShow() {
-            var logindata = uni.getStorageSync('loginData') || ''
-            // console.log(logindata)
-            if (logindata) {
-                logindata = JSON.parse(logindata)
-                this.HOrgName = logindata.HOrgName
-                this.Organization = logindata.Organization
-                this.UserName = logindata.HUserNumber
-                this.PassWord = logindata.HPassWord
-                // this.UserName = logindata.UserName
-                // this.PassWord = logindata.PassWord
-            }
-            this.getOrganization()
-            this.getDataBases()
-        },
-        methods: {
-            async ApplyLanguagePack(lang, forceUpdate = false) {
-                // 璇诲彇璇█鍖呭苟鍔犺浇
-                // let languagePack = await getLanguagePackJson(lang)
-                // this.$i18n.setLocaleMessage(lang, languagePack)
-                this.$i18n.locale = lang
-            },
-            onLanguageChangeHandler(e) {
-                //鍔ㄦ�佽幏鍙栧悗绔殑璇█鍖呮枃浠讹紝骞跺皢璇█鍖呭簲鐢ㄥ埌鍏ㄥ眬
-                console.log('e: ', e.detail.value);
-                if (e.detail.value == 0) {
-                    this.Language = '涓枃'
-                    this.ApplyLanguagePack("zh-Hans")
-                    // this.$i18n.locale = 'zh-Hans'
-                }
-                if (e.detail.value == 1) {
-                    this.Language = 'English'
-                    this.ApplyLanguagePack("en")
-                    // this.$i18n.locale = 'en'
-                }
-            },
-            async InitOrgination() {
-                console.log("鍒濆鍖栫粍缁�")
-                await this.$nextTick(() => {
-                    this.Organization = this.arrayOrganization[0]
-                    this.HOrgName = this.HOrgNameList[0]
+				HOrgName: '',
+				UserName: '', //admin    001
+				PassWord: '', //123456
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API/',
+				serverUrlCache: '',
+			}
+		},
+		onLoad() {
+			this.ApplyLanguagePack(this.$i18n.locale)
+		},
+		onShow() {
+			var logindata = uni.getStorageSync('loginData') || ''
+			// console.log(logindata)
+			if (logindata) {
+				logindata = JSON.parse(logindata)
+				this.HOrgName = logindata.HOrgName
+				this.Organization = logindata.Organization
+				this.UserName = logindata.HUserNumber
+				this.PassWord = logindata.HPassWord
+				// this.UserName = logindata.UserName
+				// this.PassWord = logindata.PassWord
+			}
+			this.getOrganization()
+			this.getDataBases()
+		},
+		methods: {
+			async ApplyLanguagePack(lang, forceUpdate = false) {
+				// 璇诲彇璇█鍖呭苟鍔犺浇
+				// let languagePack = await getLanguagePackJson(lang)
+				// this.$i18n.setLocaleMessage(lang, languagePack)
+				this.$i18n.locale = lang
+			},
+			onLanguageChangeHandler(e) {
+				//鍔ㄦ�佽幏鍙栧悗绔殑璇█鍖呮枃浠讹紝骞跺皢璇█鍖呭簲鐢ㄥ埌鍏ㄥ眬
+				console.log('e: ', e.detail.value);
+				if (e.detail.value == 0) {
+					this.Language = '涓枃'
+					this.ApplyLanguagePack("zh-Hans")
+					// this.$i18n.locale = 'zh-Hans'
+				}
+				if (e.detail.value == 1) {
+					this.Language = 'English'
+					this.ApplyLanguagePack("en")
+					// this.$i18n.locale = 'en'
+				}
+			},
+			async InitOrgination() {
+				console.log("鍒濆鍖栫粍缁�")
+				await this.$nextTick(() => {
+					this.Organization = this.arrayOrganization[0]
+					this.HOrgName = this.HOrgNameList[0]
 
-                    let org = uni.getStorageSync('Organization')
-                    let orgName = uni.getStorageSync('OrganizationID')
-                    let orgHas = Array.from(this.arrayOrganization).findIndex((e) => e == org)
-                    if (org && (orgHas != -1)) {
-                        this.Organization = org
-                        this.HOrgName = orgName
-                    }
-                })
-            },
-            confirmHandler() {
-                console.log(this.serverUrlName)
-                console.log(this.serverUrlandName[this.serverUrlName])
-                let url = this.serverUrlandName[this.serverUrlName];
-                if (url != undefined) {
-                    uni.setStorageSync('serverUrl', url)
+					let org = uni.getStorageSync('Organization')
+					let orgName = uni.getStorageSync('OrganizationID')
+					let orgHas = Array.from(this.arrayOrganization).findIndex((e) => e == org)
+					if (org && (orgHas != -1)) {
+						this.Organization = org
+						this.HOrgName = orgName
+					}
+				})
+			},
+			confirmHandler() {
+				console.log(this.serverUrlName)
+				console.log(this.serverUrlandName[this.serverUrlName])
+				let url = this.serverUrlandName[this.serverUrlName];
+				if (url != undefined) {
+					uni.setStorageSync('serverUrl', url)
 					uni.setStorageSync('serverUrlName', this.serverUrlName)
-                    this.serverUrl = url
-                    this.changeApi = false
-                    this.getOrganization()
-                    this.$refs.popup.close()
-                } else {
-                    uni.showToast({
-                        title: '鏈嶅姟鍣ㄥ悕绉伴敊璇閲嶆柊杈撳叆',
-                        icon: 'none',
-                    })
-                }
-            },
-            close() {
-                this.$refs.popup.close()
-            },
-            openServerSettingHandler() {
-                this.$refs.popup.open()
-            },
-            getDataBases() {
-                uni.request({
-                    url: this.serverUrl + '/Web/GetDataBases',
-                    success: (result) => {
-                        console.log(result);
-                        if (result.count == 1) {
-                            for (var i = 0; i < res.data.data.length; i++) {
-                                this.arrayDataBases[i] = result.data.data[i].name;
-                            }
-                        }
-                        console.log(this.arrayDataBases);
-                        this.$forceUpdate();
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                    },
-                });
-            },
-            DataBasesChange(e) {
-                console.log(e.detail.value)
-                this.DataBases = this.arrayDataBases[e.detail.value]
-                uni.setStorageSync('DataBases', this.DataBases);
-            },
+					this.serverUrl = url
+					this.changeApi = false
+					this.getOrganization()
+					this.$refs.popup.close()
+				} else {
+					uni.showToast({
+						title: '鏈嶅姟鍣ㄥ悕绉伴敊璇閲嶆柊杈撳叆',
+						icon: 'none',
+					})
+				}
+			},
+			close() {
+				this.$refs.popup.close()
+			},
+			openServerSettingHandler() {
+				this.$refs.popup.open()
+			},
+			getDataBases() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetDataBases',
+					success: (result) => {
+						console.log(result);
+						if (result.count == 1) {
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayDataBases[i] = result.data.data[i].name;
+							}
+						}
+						console.log(this.arrayDataBases);
+						this.$forceUpdate();
+					},
+					fail: (res) => {
+						console.log(res);
+					},
+				});
+			},
+			DataBasesChange(e) {
+				console.log(e.detail.value)
+				this.DataBases = this.arrayDataBases[e.detail.value]
+				uni.setStorageSync('DataBases', this.DataBases);
+			},
 
-            getOrganization() {
-                this.arrayOrganization = []
-                uni.request({
-                    url: this.serverUrl + '/Web/GetOrganizations',
-                    success: (res) => {
-                        console.log(res.data.data);
-                        for (var i = 0; i < res.data.data.length; i++) {
-                            this.arrayOrganization[i] = res.data.data[i].Name
-                            this.HOrgNameList[i] = res.data.data[i].ID
-                        }
-                        // this.Organization = res.data.data[0].Name
-                        // this.HOrgName = res.data.data[0].ID
-                        this.$forceUpdate();
-                        this.InitOrgination()
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鑾峰彇缁勭粐澶辫触,璇锋鏌ユ湇鍔″櫒鍦板潃',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            OrganizationChange(e) {
-                // console.log(e.detail.value)
-                this.Organization = this.arrayOrganization[e.detail.value]
-                this.HOrgName = this.HOrgNameList[e.detail.value]
-            },
-            submit() {
-                if (!this.Organization) {
-                    uni.showToast({
-                        title: '璇烽�夋嫨缁勭粐',
-                        icon: 'none'
-                    })
-                } else if (!this.UserName) {
-                    uni.showToast({
-                        title: '璇疯緭鍏ョ敤鎴峰悕',
-                        icon: 'none'
-                    })
-                } else if (!this.PassWord) {
-                    uni.showToast({
-                        title: '璇疯緭鍏ュ瘑鐮�',
-                        icon: 'none'
-                    })
-                } else {
-                    uni.showLoading({
-                        title: '鐧诲綍涓�...',
-                        mask: true
-                    })
-                    var data = {
-                        HUserNumber: this.UserName,
-                        HPassWord: this.PassWord,
-                        HStockOrgID: this.HOrgName,
-                        HStockOrgName: this.Organization
-                    }
+			getOrganization() {
+				this.arrayOrganization = []
+				uni.request({
+					url: this.serverUrl + '/Web/GetOrganizations',
+					success: (res) => {
+						console.log(res.data.data);
+						for (var i = 0; i < res.data.data.length; i++) {
+							this.arrayOrganization[i] = res.data.data[i].Name
+							this.HOrgNameList[i] = res.data.data[i].ID
+						}
+						// this.Organization = res.data.data[0].Name
+						// this.HOrgName = res.data.data[0].ID
+						this.$forceUpdate();
+						this.InitOrgination()
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鑾峰彇缁勭粐澶辫触,璇锋鏌ユ湇鍔″櫒鍦板潃',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			OrganizationChange(e) {
+				// console.log(e.detail.value)
+				this.Organization = this.arrayOrganization[e.detail.value]
+				this.HOrgName = this.HOrgNameList[e.detail.value]
+			},
+			submit() {
+				if (!this.Organization) {
+					uni.showToast({
+						title: '璇烽�夋嫨缁勭粐',
+						icon: 'none'
+					})
+				} else if (!this.UserName) {
+					uni.showToast({
+						title: '璇疯緭鍏ョ敤鎴峰悕',
+						icon: 'none'
+					})
+				} else if (!this.PassWord) {
+					uni.showToast({
+						title: '璇疯緭鍏ュ瘑鐮�',
+						icon: 'none'
+					})
+				} else {
+					uni.showLoading({
+						title: '鐧诲綍涓�...',
+						mask: true
+					})
+					var data = {
+						HUserNumber: this.UserName,
+						HPassWord: this.PassWord,
+						HStockOrgID: this.HOrgName,
+						HStockOrgName: this.Organization
+					}
 
-                    //     UserName: this.UserName,
-                    //     PassWord: this.PassWord,
-                    //     HOrgName: this.HOrgName,
-                    //     Organization: this.Organization
-                    // }
-                    uni.setStorageSync('loginData', JSON.stringify(data));
-                    uni.request({
-                        url: this.serverUrl + 'WEBSController/GetUser_Json',
-                        method: 'GET',
-                        data: data,
-                        success: (res) => {
-                            console.log(res)
-                            uni.hideLoading()
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                            if (res.data.count == 1) {
-                                setLoginData(data)
-                                setUserInfo(res.data.data[0])
-                                uni.setStorageSync('HUserName', res.data.data[0].Czymc);
-                                uni.setStorageSync('HBillerID', res.data.data[0].HK3UserID);
-                                uni.setStorageSync('SourceFlag', false);
-                                uni.setStorageSync('login', "login");
-                                uni.setStorageSync('Organization', this.Organization);
-                                uni.setStorageSync('OrganizationID', this.HOrgName);
+					//     UserName: this.UserName,
+					//     PassWord: this.PassWord,
+					//     HOrgName: this.HOrgName,
+					//     Organization: this.Organization
+					// }
+					uni.setStorageSync('loginData', JSON.stringify(data));
+					uni.request({
+						url: this.serverUrl + 'WEBSController/GetUser_Json',
+						method: 'GET',
+						data: data,
+						success: (res) => {
+							console.log(res)
+							uni.hideLoading()
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+							if (res.data.count == 1) {
+								setLoginData(data)
+								setUserInfo(res.data.data[0])
+								uni.setStorageSync('HUserName', res.data.data[0].Czymc);
+								uni.setStorageSync('HBillerID', res.data.data[0].HK3UserID);
+								uni.setStorageSync('SourceFlag', false);
+								uni.setStorageSync('login', "login");
+								uni.setStorageSync('Organization', this.Organization);
+								uni.setStorageSync('OrganizationID', this.HOrgName);
 								//瀛樺偍閮ㄩ棬 鑱屽憳 浠撳簱 绛変俊鎭�
 								uni.setStorageSync('HDeptID', res.data.data[0].HDeptID); //閮ㄩ棬
 								uni.setStorageSync('HDeptName', res.data.data[0].HDeptName);
@@ -329,208 +332,216 @@
 								uni.setStorageSync('HEmpName', res.data.data[0].HEmpName);
 								uni.setStorageSync('HSCWHID', res.data.data[0].HSCWHID); //璋冨叆浠撳簱
 								uni.setStorageSync('HSCWHName', res.data.data[0].HSCWHName);
-								uni.setStorageSync('HWhID', res.data.data[0].HWhID);//瀵瑰簲浠撳簱
+								uni.setStorageSync('HWhID', res.data.data[0].HWhID); //瀵瑰簲浠撳簱
 								uni.setStorageSync('HWhName', res.data.data[0].HWhName);
-								uni.setStorageSync('HWorkCenterID', res.data.data[0].HWorkCenterID);//宸ヤ綔涓績
+								uni.setStorageSync('HWorkCenterID', res.data.data[0].HWorkCenterID); //宸ヤ綔涓績
 								uni.setStorageSync('HWorkCenterName', res.data.data[0].HWorkCenterName);
 								uni.setStorageSync('HSecManagerID', res.data.data[0].HSecManagerID); //瀵瑰簲楠屾敹
 								uni.setStorageSync('HSecManagerName', res.data.data[0].HSecManagerName);
-                                this.CommonUtils.setServerUrl(this.serverUrl)
-                                // this.WebSocketServices.createConnect(res.data.data[0].Czybm,res.data.data[0].Czymc);
-                                uni.reLaunch({
-                                    url: '/pages/index/index'
-                                })
-                            }
-                        },
-                        fail: (res) => {
-                            console.log(res);
-                            uni.hideLoading()
-                            uni.showToast({
-                                title: '鎺ュ彛璇锋眰澶辫触',
-                                icon: 'none'
-                            })
-                        },
-                    });
+								uni.setStorageSync('HGroupID', res.data.data[0].HGroupID); //瀵瑰簲鐝粍
+								uni.setStorageSync('HGroupName', res.data.data[0].HGroup);
+								uni.setStorageSync('HProcID', res.data.data[0].HProcID); //瀵瑰簲宸ュ簭
+								uni.setStorageSync('HProcName', res.data.data[0].HProcName);
+								uni.setStorageSync('HSourceID', res.data.data[0].HSourceID); //瀵瑰簲鐢熶骇璧勬簮
+								uni.setStorageSync('HSourceName', res.data.data[0].HSource);
+								this.CommonUtils.setServerUrl(this.serverUrl)
+								// this.WebSocketServices.createConnect(res.data.data[0].Czybm,res.data.data[0].Czymc);
+								// getuiUtils.getClientID()
+								getuiUtils.getClientID(res.data.data[0].Czybm, res.data.data[0].Czymc)
+								uni.reLaunch({
+									url: '/pages/index/index'
+								})
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.hideLoading()
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					});
 
-                    // uni.request({
-                    //     url: this.serverUrl + '/Web/GetUser',
-                    //     method: 'GET',
-                    //     data: data,
-                    //     success: (res) => {
-                    //         console.log(res)
-                    //         uni.hideLoading()
-                    //         uni.showToast({
-                    //             title: res.data.Message,
-                    //             icon: 'none'
-                    //         })
-                    //         if (res.data.count == 1) {
-                    //             setLoginData(data)
-                    //             setUserInfo(res.data.data[0])
-                    //             uni.setStorageSync('HUserName', res.data.data[0].Czymc);
-                    //             uni.setStorageSync('HBillerID', res.data.data[0].HK3UserID);
-                    //             uni.setStorageSync('SourceFlag', false);
-                    //             uni.setStorageSync('login', "login");
-                    //             uni.setStorageSync('Organization', this.Organization);
-                    //             uni.setStorageSync('OrganizationID', this.HOrgName);
-                    //             this.CommonUtils.setServerUrl(this.serverUrl)
-                    //             uni.reLaunch({
-                    //                 url: '/pages/index/index'
-                    //             })
-                    //         }
-                    //     },
-                    //     fail: (res) => {
-                    //         console.log(res);
-                    //         uni.hideLoading()
-                    //         uni.showToast({
-                    //             title: '鎺ュ彛璇锋眰澶辫触',
-                    //             icon: 'none'
-                    //         })
-                    //     },
-                    // });
-                }
-            }
-        }
-    }
+					// uni.request({
+					//     url: this.serverUrl + '/Web/GetUser',
+					//     method: 'GET',
+					//     data: data,
+					//     success: (res) => {
+					//         console.log(res)
+					//         uni.hideLoading()
+					//         uni.showToast({
+					//             title: res.data.Message,
+					//             icon: 'none'
+					//         })
+					//         if (res.data.count == 1) {
+					//             setLoginData(data)
+					//             setUserInfo(res.data.data[0])
+					//             uni.setStorageSync('HUserName', res.data.data[0].Czymc);
+					//             uni.setStorageSync('HBillerID', res.data.data[0].HK3UserID);
+					//             uni.setStorageSync('SourceFlag', false);
+					//             uni.setStorageSync('login', "login");
+					//             uni.setStorageSync('Organization', this.Organization);
+					//             uni.setStorageSync('OrganizationID', this.HOrgName);
+					//             this.CommonUtils.setServerUrl(this.serverUrl)
+					//             uni.reLaunch({
+					//                 url: '/pages/index/index'
+					//             })
+					//         }
+					//     },
+					//     fail: (res) => {
+					//         console.log(res);
+					//         uni.hideLoading()
+					//         uni.showToast({
+					//             title: '鎺ュ彛璇锋眰澶辫触',
+					//             icon: 'none'
+					//         })
+					//     },
+					// });
+				}
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-    .bg-img {
-        position: fixed;
-        width: 100%;
-        height: 100%;
-        top: 0;
-        left: 0;
-        z-index: -1;
-    }
+	.bg-img {
+		position: fixed;
+		width: 100%;
+		height: 100%;
+		top: 0;
+		left: 0;
+		z-index: -1;
+	}
 
-    .container {
-        width: 100%;
-        height: 100%;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
+	.container {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
 
-        .title {
-            margin-top: 174rpx;
-            font-size: 47rpx;
-            font-weight: bold;
-            color: #FFFFFF;
-        }
+		.title {
+			margin-top: 174rpx;
+			font-size: 47rpx;
+			font-weight: bold;
+			color: #FFFFFF;
+		}
 
-        .box {
-            width: 682rpx;
-            position: relative;
-            top: 120rpx;
-            display: flex;
-            justify-content: center;
+		.box {
+			width: 682rpx;
+			position: relative;
+			top: 120rpx;
+			display: flex;
+			justify-content: center;
 
-            .logo {
-                width: 155rpx;
-                height: 155rpx;
-                padding: 10rpx;
-                position: absolute;
-                z-index: 9;
-                background-color: rgba(255, 255, 255, 0.5);
-                border-radius: 100%;
+			.logo {
+				width: 155rpx;
+				height: 155rpx;
+				padding: 10rpx;
+				position: absolute;
+				z-index: 9;
+				background-color: rgba(255, 255, 255, 0.5);
+				border-radius: 100%;
 
-                image {
-                    width: 100%;
-                    height: 100%;
-                    border-radius: 100%;
-                    background-color: #f0f3f7;
-                }
-            }
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 100%;
+					background-color: #f0f3f7;
+				}
+			}
 
-            .login {
-                width: 100%;
-                height: 520rpx;
-                position: absolute;
-                top: 90rpx;
-                z-index: 0;
-                background: #FFFFFF;
-                border-radius: 25rpx 0 25rpx 0;
-                box-shadow: 0 6rpx 24rpx 8rpx rgba(21, 99, 210, 0.14);
-                padding-top: 160rpx;
+			.login {
+				width: 100%;
+				height: 520rpx;
+				position: absolute;
+				top: 90rpx;
+				z-index: 0;
+				background: #FFFFFF;
+				border-radius: 25rpx 0 25rpx 0;
+				box-shadow: 0 6rpx 24rpx 8rpx rgba(21, 99, 210, 0.14);
+				padding-top: 160rpx;
 
-                .item {
-                    display: flex;
-                    align-items: center;
-                    justify-content: flex-end;
-                    margin-right: 38rpx;
-                    margin-bottom: 70rpx;
+				.item {
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
+					margin-right: 38rpx;
+					margin-bottom: 70rpx;
 
-                    .left {
-                        font-size: 34rpx;
-                        font-weight: 400;
-                        color: #3C3C3C;
-                    }
+					.left {
+						font-size: 34rpx;
+						font-weight: 400;
+						color: #3C3C3C;
+					}
 
-                    .right {
-                        width: 441rpx;
-                        height: 68rpx;
-                        background: #EBEBEB;
-                        border-radius: 10rpx;
+					.right {
+						width: 441rpx;
+						height: 68rpx;
+						background: #EBEBEB;
+						border-radius: 10rpx;
 
-                        input {
-                            height: 100%;
-                            padding: 0 30rpx;
-                            font-size: 30rpx;
-                        }
-                    }
-                }
+						input {
+							height: 100%;
+							padding: 0 30rpx;
+							font-size: 30rpx;
+						}
+					}
+				}
 
-                // .api{
-                //     margin-left: 30rpx;
-                //     font-size: 27rpx;
-                //     color: #888;
-                // }
-                // .apibtn{
-                //     text-align: center;
-                //     font-size: 27rpx;
-                //     margin-top: 14rpx;
-                //     color: #066fb8;
-                //     text-decoration: underline; /* 娣诲姞涓嬪垝绾� */
-                //     font-style: italic; /* 灏嗗瓧浣撳彉涓烘枩浣� */
-                // }
-            }
-        }
+				// .api{
+				//     margin-left: 30rpx;
+				//     font-size: 27rpx;
+				//     color: #888;
+				// }
+				// .apibtn{
+				//     text-align: center;
+				//     font-size: 27rpx;
+				//     margin-top: 14rpx;
+				//     color: #066fb8;
+				//     text-decoration: underline; /* 娣诲姞涓嬪垝绾� */
+				//     font-style: italic; /* 灏嗗瓧浣撳彉涓烘枩浣� */
+				// }
+			}
+		}
 
-        .btn {
-            width: 540rpx;
-            height: 92rpx;
-            line-height: 92rpx;
-            margin-top: 940rpx;
-            background: #78CEFD;
-            box-shadow: 0rpx 0rpx 44rpx 7rpx rgba(120, 206, 253, 0.3);
-            border-radius: 10rpx;
-            font-weight: 400;
-            color: #FEFEFE;
-            text-align: center;
-            font-size: 36rpx;
-        }
+		.btn {
+			width: 540rpx;
+			height: 92rpx;
+			line-height: 92rpx;
+			margin-top: 940rpx;
+			background: #78CEFD;
+			box-shadow: 0rpx 0rpx 44rpx 7rpx rgba(120, 206, 253, 0.3);
+			border-radius: 10rpx;
+			font-weight: 400;
+			color: #FEFEFE;
+			text-align: center;
+			font-size: 36rpx;
+		}
 
-        .apibtn {
-            margin-top: 50rpx;
-            background: #eec18e;
-            box-shadow: 0rpx 0rpx 44rpx 7rpx rgba(253, 186, 118, 0.3);
-        }
-    }
+		.apibtn {
+			margin-top: 50rpx;
+			background: #eec18e;
+			box-shadow: 0rpx 0rpx 44rpx 7rpx rgba(253, 186, 118, 0.3);
+		}
+	}
 
-    .popup-content {
-        box-sizing: border-box;
-        display: flex;
-        flex-direction: column;
-        gap: 30rpx;
+	.popup-content {
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: column;
+		gap: 30rpx;
 
-        .pop-item {
-            border: #EBEBEB 2rpx solid;
-            border-radius: 10rpx;
-            padding: 14rpx 8rpx;
-        }
+		.pop-item {
+			border: #EBEBEB 2rpx solid;
+			border-radius: 10rpx;
+			padding: 14rpx 8rpx;
+		}
 
-        >picker {
-            background-color: #EBEBEB;
-        }
-    }
+		>picker {
+			background-color: #EBEBEB;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/mine.vue b/pages/index/mine.vue
index 3c3242c..0ac7a2a 100644
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -103,7 +103,7 @@
                             // 鏂紑Socket杩炴帴
                             // WebSocketServices.closeSocket();
                             // 閿�姣� userInfo 缂撳瓨
-                            uni.removeStorageSync("userinfo")
+                            // uni.removeStorageSync("userinfo")
 							uni.reLaunch({
 								url:'/pages/index/login'
 							})
diff --git a/pages/index/tab1.vue b/pages/index/tab1.vue
index 541524a..ece653d 100644
--- a/pages/index/tab1.vue
+++ b/pages/index/tab1.vue
@@ -95,14 +95,7 @@
 						id: 7,
 						hidden: false,
 					},
-					{
-						img: '../../static/icon/icon12.png',
-						text: '鍛樺伐绛惧埌璁板綍鍗曞垪琛�',
-						tip: '鐐瑰嚮杩涘叆',
-						url: '/pages/EmployeeRecords/EmployeeRecordsBillList',
-						id: 8,
-						hidden: false,
-					}
+					
 				]
 			}
 		},
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index 20304c5..f985e5c 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -257,28 +257,28 @@
 					},
 					{
 						"img": "../../static/icon/icon8.png",
-						"text": "妯″叿鎶ュ簾鍑哄簱鍗曞垪琛�",
+						"text": "鍣ㄥ叿鎶ュ簾鍑哄簱鍗曞垪琛�",
 						"url": "/pages/MJGL/MouldScrapOutBill/MouldScrapOutBillList",
 						"id": 29,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
-						"text": "妯″叿璋冩嫧鍗曞垪琛�",
+						"text": "鍣ㄥ叿璋冩嫧鍗曞垪琛�",
 						"url": "/pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
 						"id": 30,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
-						"text": "妯″叿棰嗙敤鍑哄簱鍗曞垪琛�",
+						"text": "鍣ㄥ叿棰嗙敤鍑哄簱鍗曞垪琛�",
 						"url": "/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
 						"id": 31,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
-						"text": "妯″叿棰嗙敤閫�搴撳崟鍒楄〃",
+						"text": "鍣ㄥ叿棰嗙敤閫�搴撳崟鍒楄〃",
 						"url": "/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
 						"id": 32,
 						"hidden": false
@@ -299,28 +299,28 @@
 					},
 					{
 						"img": "../../static/icon/icon5.png",
-						"text": "妯″叿鐐规璁板綍鍗曞垪琛�",
+						"text": "鍣ㄥ叿鐐规璁板綍鍗曞垪琛�",
 						"url": "/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBillList",
 						"id": 35,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon5.png",
-						"text": "妯″叿淇濆吇璁板綍鍗曞垪琛�",
+						"text": "鍣ㄥ叿淇濆吇璁板綍鍗曞垪琛�",
 						"url": "/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBillList",
 						"id": 36,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon13.png",
-						"text": "妯″叿鏁呴殰鐧昏鍒楄〃",
-						"url": "/pages/qijvguzhangdengji/mouldMistake",
+						"text": "鍣ㄥ叿鏁呴殰鐧昏鍒楄〃",
+						"url": "/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList",
 						"id": 37,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
-						"text": "妯″叿缁翠慨娲惧伐鍗曞垪琛�",
+						"text": "鍣ㄥ叿缁翠慨娲惧伐鍗曞垪琛�",
 						"url": "/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBillList",
 						"id": 38,
 						"hidden": false
@@ -328,15 +328,15 @@
 
 					{
 						"img": "../../static/icon/icon13.png",
-						"text": "妯″叿缁翠慨璁板綍鍒楄〃",
-						"url": "/pages/weixiujilu/mouldRepairRecordBillList",
+						"text": "鍣ㄥ叿缁翠慨璁板綍鍒楄〃",
+						"url": "/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBillList",
 						"id": 39,
 						"hidden": false
 					},
 
 					{
 						"img": "../../static/icon/icon8.png",
-						"text": "妯″叿缁翠慨楠屾敹鍗曞垪琛�",
+						"text": "鍣ㄥ叿缁翠慨楠屾敹鍗曞垪琛�",
 						"url": "/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList",
 						"id": 40,
 						"hidden": false
@@ -423,7 +423,7 @@
 					{
 						"img": "../../static/icon/icon7.png",
 						"text": "璁惧缁翠慨璁板綍鍗曞垪琛�",
-						"url": "/pages/shebeiweixiu/SbEqpMaintenanceBillList",
+						"url": "/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBillList",
 						"id": 52,
 						"hidden": false
 					},
@@ -510,6 +510,21 @@
 						"id": 63,
 						"hidden": false
 					},
+                    {
+                    	"img": "../../static/icon/icon15.png",
+                    	"text": "宸ヤ綔鑱旂郴鍗曟煡璇�",
+                    	"url": "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery?OperationType=1",
+                    	"id": 64,
+                    	"hidden": false
+                    },
+					{
+						img: '../../static/icon/icon12.png',
+						text: '鍛樺伐绛惧埌璁板綍鍗曞垪琛�',
+						tip: '鐐瑰嚮杩涘叆',
+						url: '/pages/EmployeeRecords/EmployeeRecordsBillList',
+						id: 65,
+						hidden: false,
+					}
 				]
 			}
 		},
diff --git a/pages/index/tab3.vue b/pages/index/tab3.vue
index d2b409e..864abde 100644
--- a/pages/index/tab3.vue
+++ b/pages/index/tab3.vue
@@ -43,88 +43,82 @@
                 menuListName: 'tab3',
                 canEdit: false,
                 serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-                itemData: [{
+                itemData: [
+					{
+					    img: '../../static/icon/icon8.png',
+					    text: '鍣ㄥ叿妗ｆ鏌ヨ',
+					    url: `/pages/MJGL/Gy_MouldFile/Gy_MouldFileList`,
+					    id: 1,
+					    hidden: false,
+					},
+					{
                         img: '../../static/icon/icon6.png',
-                        text: '妯″叿鐘舵�佸垎鏋�',
+                        text: '鍣ㄥ叿鐘舵�佸垎鏋�',
                         tip: '鏌ョ湅璇︽儏',
                         url: '/pages/mujvzhuangtai/mujvzhuangtai',
-                        id: 1,
+                        id: 2,
                         hidden: false,
 
                     },
                     {
-                        img: '../../static/icon/icon8.png',
-                        text: '妯″叿妗ｆ鏌ヨ',
-                        url: `/pages/MJGL/Gy_MouldFile/Gy_MouldFileList`,
-                        id: 2,
-                        hidden: false,
-                    },
-                    {
                         img: '../../static/icon/icon16.png',
-                        text: '妯″叿瀵垮懡',
+                        text: '鍣ㄥ叿瀵垮懡',
                         url: '/pages/shoujishouming/table',
                         id: 3,
                         hidden: false,
                     },
                     {
                         "img": "../../static/icon/icon13.png",
-                        "text": "妯″叿鏁呴殰鐧昏鍗�",
-                        "url": "/pages/qijvguzhangdengji/mouldMistakeBill?operationType=1",
+                        "text": "鍣ㄥ叿鏁呴殰鐧昏鍗�",
+                        "url": "/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill?operationType=1",
                         "id": 4,
                         "hidden": false
                     },
                     {
-                    	"img": "../../static/icon/icon6.png",
-                    	"text": "璁惧鏁呴殰鐧昏鍗�",
-                    	"url": "/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill?operationType=1",
-                    	"id": 20,
-                    	"hidden": false
-                    },
-                    {
                         "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿缁翠慨娲惧伐鍗�",
+                        "text": "鍣ㄥ叿缁翠慨娲惧伐鍗�",
                         "url": "/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill",
                         "id": 5,
                         "hidden": false
                     },
                     {
                         "img": "../../static/icon/icon13.png",
-                        "text": "妯″叿缁翠慨璁板綍鍗�",
-                        "url": "/pages/weixiujilu/mouldRepairRecordBill",
+                        "text": "鍣ㄥ叿缁翠慨璁板綍鍗�",
+                        "url": "/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill",
                         "id": 6,
                         "hidden": false
                     },
                     {
                         "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿缁翠慨楠屾敹鍗�",
+                        "text": "鍣ㄥ叿缁翠慨楠屾敹鍗�",
                         "url": "/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill",
                         "id": 7,
                         "hidden": false
                     },
                     {
                         "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿鐐规璁板綍鍗�",
+                        "text": "鍣ㄥ叿鐐规璁板綍鍗�",
                         "url": "/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill",
                         "id": 8,
                         "hidden": false
                     },
                     {
                         "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿淇濆吇璁板綍鍗�",
+                        "text": "鍣ㄥ叿淇濆吇璁板綍鍗�",
                         "url": "/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill",
                         "id": 9,
                         "hidden": false
                     },
                     {
                         "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿棰嗙敤鍑哄簱鍗�",
+                        "text": "鍣ㄥ叿棰嗙敤鍑哄簱鍗�",
                         "url": "/pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
                         "id": 10,
                         "hidden": false
                     },
                     {
                         "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿棰嗙敤閫�搴撳崟",
+                        "text": "鍣ㄥ叿棰嗙敤閫�搴撳崟",
                         "url": "/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill",
                         "id": 11,
                         "hidden": false
@@ -145,7 +139,7 @@
                     },
                     {
                         "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿鎶ュ簾鍑哄簱鍗�",
+                        "text": "鍣ㄥ叿鎶ュ簾鍑哄簱鍗�",
                         "url": "/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill",
                         "id": 14,
                         "hidden": false
@@ -190,18 +184,26 @@
                     },
                     {
                         "img": "../../static/icon/icon8.png",
+   "text": "璁惧鏁呴殰鐧昏鍗�",
+					    "url": "/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill?operationType=1",
+					    "id": 20,
+					    "hidden": false
+					},
+                    {
+                        "img": "../../static/icon/icon8.png",
                         "text": "璁惧缁翠慨娲惧伐鍗�",
                         "url": "/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill",
                         "id": 21,
                         "hidden": false
                     },
                     {
-                        "img": "../../static/icon/icon8.png",
                         "text": "璁惧缁翠慨楠屾敹鍗�",
-                        "url": "/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill",
-                        "id": 23,
-                        "hidden": false
-                    }, 
+                        "img": "../../static/icon/icon8.png",
+					    "text": "璁惧缁翠慨璁板綍鍗�",
+					    "url": "/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill",
+					    "id": 22,
+					    "hidden": false
+					}, 
                     {
                         "img": "../../static/icon/icon8.png",
                         "text": "璁惧淇濆吇浠诲姟",
@@ -211,7 +213,8 @@
                     },
                     {
                         "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿淇濆吇浠诲姟",
+
+                        "text": "鍣ㄥ叿淇濆吇浠诲姟",
                         "url": "/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport",
                         "id": 25,
                         "hidden": false
@@ -225,11 +228,12 @@
                     },
                     {
                         "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿缁翠慨浠诲姟",
+
+                        "text": "鍣ㄥ叿缁翠慨浠诲姟",
                         "url": "/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport",
                         "id": 27,
                         "hidden": false
-                    },
+                    }
                 ]
             }
         },
diff --git a/pages/index/tab4.vue b/pages/index/tab4.vue
index 928e6a1..2ed110c 100644
--- a/pages/index/tab4.vue
+++ b/pages/index/tab4.vue
@@ -164,14 +164,14 @@
 					{
 						"img": "../../static/icon/icon15.png",
 						"text": "鍙栨牱鍗�",
-						"url": "/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill",
+						"url": "/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=0",
 						"id": 17,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon15.png",
 						"text": "杩樻牱鍗�",
-						"url": "/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill",
+						"url": "/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=0",
 						"id": 18,
 						"hidden": false
 					},
diff --git a/pages/shebeilvli/EquipFileBillResume.vue b/pages/shebeilvli/EquipFileBillResume.vue
index 7d4d291..5aef2bc 100644
--- a/pages/shebeilvli/EquipFileBillResume.vue
+++ b/pages/shebeilvli/EquipFileBillResume.vue
@@ -1,449 +1,469 @@
 <template>
-	<view class="content">
-		<view class="form">
-			<view class="form-item">
-				<view class="title">鍗曟嵁鍙�:</view>
-				<view class="right">
-					<input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">璁惧鍒嗙被:</view>
-				<view class="right">
-					<input v-model="hform.HEquipType" placeholder="璇疯緭鍏ヨ澶囧垎绫�" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">寮�濮嬫椂闂�:</view>
-				<view class="right">
-					<picker mode="date" :value="hform.BenginHCreateDate" @change="BenginHCreateDateChange">
-						<input name="BenginHCreateDate" disabled :value="hform.BenginHCreateDate" placeholder="璇烽�夋嫨" />
-					</picker>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">缁撴潫鏃堕棿:</view>
-				<view class="right">
-					<picker mode="date" :value="hform.EndHCreateDate" @change="EndHCreateDateChange">
-						<input name="EndHCreateDate" disabled :value="hform.EndHCreateDate" placeholder="璇烽�夋嫨" />
-					</picker>
-				</view>
-			</view>
-			
-			<view class="buttons">
-				<button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
-				<!-- <button class="btn-b" size="mini" type="default">鏂板</button> -->
-				<button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
-			</view>
-		</view>
-		
-		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
-		
-		<view class="list" v-for="(item,index) in showList" :key="index">
-			<uni-card :title="item.璁惧鍚嶇О" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
-				<view class="card-detail">
-					<view class="detail" v-if="item.璁惧浠ｇ爜">
-						<text>璁惧浠ｇ爜锛�</text>{{item.璁惧浠ｇ爜}}
-					</view>
-					<view class="detail" v-if="item.璁惧鍑哄巶鏃ユ湡">
-						<text>鍑哄巶鏃ユ湡锛�</text>{{item.璁惧鍑哄巶鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.璁惧鍨嬪彿">
-						<text>璁惧鍨嬪彿锛�</text>{{item.璁惧鍨嬪彿}}
-					</view>
-					<view class="detail" v-if="item.璁惧绫诲瀷">
-						<text>璁惧绫诲瀷锛�</text>{{item.璁惧绫诲瀷}}
-					</view>
-					<view class="detail" v-if="item.璁惧缂栫爜">
-						<text>璁惧缂栫爜锛�</text>{{item.璁惧缂栫爜}}
-					</view>
-					<view class="detail" v-if="item.璁惧瑙勬牸">
-						<text>璁惧瑙勬牸锛�</text>{{item.璁惧瑙勬牸}}
-					</view>
-					<view class="detail" v-if="item.褰撳墠鐘舵��">
-						<text>褰撳墠鐘舵�侊細</text>{{item.褰撳墠鐘舵�亇}
-					</view>
-					<view class="detail" v-if="item.鏃ユ湡">
-						<text>鏃ユ湡锛�</text>{{item.鏃ユ湡.substr(0,10)}}
-					</view>
-				</view>
-				<view class="card-detail" v-if="showDetail == index">
-<!-- 					<view class="detail" v-if="item.hmainid">
+    <view class="content">
+        <view class="form">
+            <view class="form-item">
+                <view class="title">鍗曟嵁鍙�:</view>
+                <view class="right">
+                    <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">璁惧鍒嗙被:</view>
+                <view class="right">
+                    <input v-model="hform.HEquipType" placeholder="璇疯緭鍏ヨ澶囧垎绫�" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">寮�濮嬫椂闂�:</view>
+                <view class="right">
+                    <picker mode="date" :value="hform.BenginHCreateDate" @change="BenginHCreateDateChange">
+                        <input name="BenginHCreateDate" disabled :value="hform.BenginHCreateDate" placeholder="璇烽�夋嫨" />
+                    </picker>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">缁撴潫鏃堕棿:</view>
+                <view class="right">
+                    <picker mode="date" :value="hform.EndHCreateDate" @change="EndHCreateDateChange">
+                        <input name="EndHCreateDate" disabled :value="hform.EndHCreateDate" placeholder="璇烽�夋嫨" />
+                    </picker>
+                </view>
+            </view>
+
+            <view class="buttons">
+                <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+                <!-- <button class="btn-b" size="mini" type="default">鏂板</button> -->
+                <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+            </view>
+        </view>
+
+        <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+        <view class="list" v-for="(item,index) in showList" :key="index">
+            <uni-card :title="item.璁惧鍚嶇О" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+                @tap="showDetail = showDetail==index?-1:index">
+                <view class="card-detail">
+                    <view class="detail" v-if="item.璁惧浠ｇ爜">
+                        <text>璁惧浠ｇ爜锛�</text>{{item.璁惧浠ｇ爜}}
+                    </view>
+                    <view class="detail" v-if="item.璁惧鍑哄巶鏃ユ湡">
+                        <text>鍑哄巶鏃ユ湡锛�</text>{{item.璁惧鍑哄巶鏃ユ湡.substr(0,10)}}
+                    </view>
+                    <view class="detail" v-if="item.璁惧鍨嬪彿">
+                        <text>璁惧鍨嬪彿锛�</text>{{item.璁惧鍨嬪彿}}
+                    </view>
+                    <view class="detail" v-if="item.璁惧绫诲瀷">
+                        <text>璁惧绫诲瀷锛�</text>{{item.璁惧绫诲瀷}}
+                    </view>
+                    <view class="detail" v-if="item.璁惧缂栫爜">
+                        <text>璁惧缂栫爜锛�</text>{{item.璁惧缂栫爜}}
+                    </view>
+                    <view class="detail" v-if="item.璁惧瑙勬牸">
+                        <text>璁惧瑙勬牸锛�</text>{{item.璁惧瑙勬牸}}
+                    </view>
+                    <view class="detail" v-if="item.褰撳墠鐘舵��">
+                        <text>褰撳墠鐘舵�侊細</text>{{item.褰撳墠鐘舵�亇}
+                    </view>
+                    <view class="detail" v-if="item.鏃ユ湡">
+                        <text>鏃ユ湡锛�</text>{{item.鏃ユ湡.substr(0,10)}}
+                    </view>
+                </view>
+                <view class="card-detail" v-if="showDetail == index">
+                    <!-- 					<view class="detail" v-if="item.hmainid">
 						<text>hmainid锛�</text>{{item.hmainid}}
 					</view> -->
-					<view class="detail" v-if="item.鏉″舰鐮�">
-						<text>鏉＄爜缂栧彿锛�</text>{{item.鏉″舰鐮亇}
-					</view>
-<!-- 					<view class="detail" v-if="item.HMaterID">
+                    <view class="detail" v-if="item.鏉″舰鐮�">
+                        <text>鏉＄爜缂栧彿锛�</text>{{item.鏉″舰鐮亇}
+                    </view>
+                    <!-- 					<view class="detail" v-if="item.HMaterID">
 						<text>HMaterID锛�</text>{{item.HMaterID}}
 					</view> -->
-					<view class="detail" v-if="item.鐗╂枡鍚嶇О">
-						<text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
-					</view>
-<!-- 					<view class="detail" v-if="item.HUnitID">
+                    <view class="detail" v-if="item.鐗╂枡鍚嶇О">
+                        <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+                    </view>
+                    <!-- 					<view class="detail" v-if="item.HUnitID">
 						<text>HUnitID锛�</text>{{item.HUnitID}}
 					</view> -->
-					<view class="detail" v-if="item.鍗曚綅">
-						<text>鍗曚綅锛�</text>{{item.鍗曚綅}}
-					</view>
-<!-- 					<view class="detail" v-if="item.HDeptID">
+                    <view class="detail" v-if="item.鍗曚綅">
+                        <text>鍗曚綅锛�</text>{{item.鍗曚綅}}
+                    </view>
+                    <!-- 					<view class="detail" v-if="item.HDeptID">
 						<text>HDeptID锛�</text>{{item.HDeptID}}
 					</view> -->
-					<view class="detail" v-if="item.浣跨敤閮ㄩ棬">
-						<text>浣跨敤閮ㄩ棬锛�</text>{{item.浣跨敤閮ㄩ棬}}
-					</view>
-					<view class="detail" v-if="item.HUseEmpID">
-						<text>HUseEmpID锛�</text>{{item.HUseEmpID}}
-					</view>
-					<view class="detail" v-if="item.浣跨敤璐熻矗浜�">
-						<text>浣跨敤璐熻矗浜猴細</text>{{item.浣跨敤璐熻矗浜簘}
-					</view>
-<!-- 					<view class="detail" v-if="item.HRepairEmpID">
+                    <view class="detail" v-if="item.浣跨敤閮ㄩ棬">
+                        <text>浣跨敤閮ㄩ棬锛�</text>{{item.浣跨敤閮ㄩ棬}}
+                    </view>
+                    <view class="detail" v-if="item.HUseEmpID">
+                        <text>HUseEmpID锛�</text>{{item.HUseEmpID}}
+                    </view>
+                    <view class="detail" v-if="item.浣跨敤璐熻矗浜�">
+                        <text>浣跨敤璐熻矗浜猴細</text>{{item.浣跨敤璐熻矗浜簘}
+                    </view>
+                    <!-- 					<view class="detail" v-if="item.HRepairEmpID">
 						<text>HRepairEmpID锛�</text>{{item.HRepairEmpID}}
 					</view> -->
-					<view class="detail" v-if="item.缁存姢璐熻矗浜�">
-						<text>缁存姢璐熻矗浜猴細</text>{{item.缁存姢璐熻矗浜簘}
-					</view>
-					<view class="detail" v-if="item.瀹夎鍦扮偣">
-						<text>瀹夎鍦扮偣锛�</text>{{item.瀹夎鍦扮偣}}
-					</view>
-					<view class="detail" v-if="item.瀹夎鏃ユ湡">
-						<text>瀹夎鏃ユ湡锛�</text>{{item.瀹夎鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.杩愯寮�濮嬫棩鏈�">
-						<text>杩愯寮�濮嬫棩鏈燂細</text>{{item.杩愯寮�濮嬫棩鏈�.substr(0,10)}}
-					</view>
-<!-- 					<view class="detail" v-if="item.HEquipFileTypeID">
+                    <view class="detail" v-if="item.缁存姢璐熻矗浜�">
+                        <text>缁存姢璐熻矗浜猴細</text>{{item.缁存姢璐熻矗浜簘}
+                    </view>
+                    <view class="detail" v-if="item.瀹夎鍦扮偣">
+                        <text>瀹夎鍦扮偣锛�</text>{{item.瀹夎鍦扮偣}}
+                    </view>
+                    <view class="detail" v-if="item.瀹夎鏃ユ湡">
+                        <text>瀹夎鏃ユ湡锛�</text>{{item.瀹夎鏃ユ湡.substr(0,10)}}
+                    </view>
+                    <view class="detail" v-if="item.杩愯寮�濮嬫棩鏈�">
+                        <text>杩愯寮�濮嬫棩鏈燂細</text>{{item.杩愯寮�濮嬫棩鏈�.substr(0,10)}}
+                    </view>
+                    <!-- 					<view class="detail" v-if="item.HEquipFileTypeID">
 						<text>HEquipFileTypeID锛�</text>{{item.HEquipFileTypeID}}
 					</view> -->
-					<view class="detail" v-if="item.宸ョ▼缂栫爜">
-						<text>宸ョ▼缂栫爜锛�</text>{{item.宸ョ▼缂栫爜}}
-					</view>
-					<view class="detail" v-if="item.浜у搧">
-						<text>浜у搧锛�</text>{{item.浜у搧}}
-					</view>
-					<view class="detail" v-if="item.鍝佺墝">
-						<text>鍝佺墝锛�</text>{{item.鍝佺墝}}
-					</view>
-<!-- 					<view class="detail" v-if="item.HSellSupID">
+                    <view class="detail" v-if="item.宸ョ▼缂栫爜">
+                        <text>宸ョ▼缂栫爜锛�</text>{{item.宸ョ▼缂栫爜}}
+                    </view>
+                    <view class="detail" v-if="item.浜у搧">
+                        <text>浜у搧锛�</text>{{item.浜у搧}}
+                    </view>
+                    <view class="detail" v-if="item.鍝佺墝">
+                        <text>鍝佺墝锛�</text>{{item.鍝佺墝}}
+                    </view>
+                    <!-- 					<view class="detail" v-if="item.HSellSupID">
 						<text>HSellSupID锛�</text>{{item.HSellSupID}}
 					</view> -->
-					<view class="detail" v-if="item.渚涘簲鍟�">
-						<text>渚涘簲鍟嗭細</text>{{item.渚涘簲鍟唥}
-					</view>
-<!-- 					<view class="detail" v-if="item.HMakeSupID">
+                    <view class="detail" v-if="item.渚涘簲鍟�">
+                        <text>渚涘簲鍟嗭細</text>{{item.渚涘簲鍟唥}
+                    </view>
+                    <!-- 					<view class="detail" v-if="item.HMakeSupID">
 						<text>HMakeSupID锛�</text>{{item.HMakeSupID}}
 					</view> -->
-					<view class="detail" v-if="item.鍒堕�犲晢">
-						<text>鍒堕�犲晢锛�</text>{{item.鍒堕�犲晢}}
-					</view>
-					<view class="detail" v-if="item.鍒跺崟浜�">
-						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
-					</view>
-					<view class="detail" v-if="item.鍒跺崟鏃ユ湡">
-						<text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.瀹℃牳浜�">
-						<text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
-					</view>
-					<view class="detail" v-if="item.瀹℃牳鏃ユ湡">
-						<text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.淇敼浜�">
-						<text>淇敼浜猴細</text>{{item.淇敼浜簘}
-					</view>
-					<view class="detail" v-if="item.淇敼鏃ユ湡">
-						<text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.鍏抽棴浜�">
-						<text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
-					</view>
-					<view class="detail" v-if="item.鍏抽棴鏃ユ湡">
-						<text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
-					</view>
-<!-- 					<view class="detail" v-if="item.hbilltype">
+                    <view class="detail" v-if="item.鍒堕�犲晢">
+                        <text>鍒堕�犲晢锛�</text>{{item.鍒堕�犲晢}}
+                    </view>
+                    <view class="detail" v-if="item.鍒跺崟浜�">
+                        <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+                    </view>
+                    <view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+                        <text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
+                    </view>
+                    <view class="detail" v-if="item.瀹℃牳浜�">
+                        <text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
+                    </view>
+                    <view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+                        <text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
+                    </view>
+                    <view class="detail" v-if="item.淇敼浜�">
+                        <text>淇敼浜猴細</text>{{item.淇敼浜簘}
+                    </view>
+                    <view class="detail" v-if="item.淇敼鏃ユ湡">
+                        <text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
+                    </view>
+                    <view class="detail" v-if="item.鍏抽棴浜�">
+                        <text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
+                    </view>
+                    <view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+                        <text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
+                    </view>
+                    <!-- 					<view class="detail" v-if="item.hbilltype">
 						<text>hbilltype锛�</text>{{item.hbilltype}}
 					</view> -->
-					<view class="detail" v-if="item.鍗曟嵁绫诲瀷">
-						<text>鍗曟嵁绫诲瀷锛�</text>{{item.鍗曟嵁绫诲瀷}}
-					</view>
-<!-- 					<view class="detail" v-if="item.HMoudType">
+                    <view class="detail" v-if="item.鍗曟嵁绫诲瀷">
+                        <text>鍗曟嵁绫诲瀷锛�</text>{{item.鍗曟嵁绫诲瀷}}
+                    </view>
+                    <!-- 					<view class="detail" v-if="item.HMoudType">
 						<text>HMoudType锛�</text>{{item.HMoudType}}
 					</view>
 					<view class="detail" v-if="item.hsubid">
 						<text>hsubid锛�</text>{{item.hsubid}}
 					</view> -->
-				</view>
-				
-				<view class="more" v-if="showDetail == index">
-					<view class="part" style="border-right: 1px solid #eee;">
-						<uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
-					</view>
-					<view class="part" @tap.stop="toSon(item)">
-						<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏌ョ湅瀛愯〃
-					</view>
-				</view>
-				<view class="more" v-if="showDetail != index">
-					<view class="part" style="border-right: 1px solid #eee;">
-						<uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
-					</view>
-					<view class="part" @tap.stop="toSon(item)">
-						<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏌ョ湅瀛愯〃
-					</view>
-				</view>
-			</uni-card>
-		</view>
-		
-		<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
-		<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
-		<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
-	</view>
+                </view>
+
+                <view class="more" v-if="showDetail == index">
+                    <view class="part" style="border-right: 1px solid #eee;">
+                        <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+                    </view>
+                    <view class="part" @tap.stop="toSon(item)">
+                        <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                            size="14"></uni-icons>鏌ョ湅瀛愯〃
+                    </view>
+                </view>
+                <view class="more" v-if="showDetail != index">
+                    <view class="part" style="border-right: 1px solid #eee;">
+                        <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+                    </view>
+                    <view class="part" @tap.stop="toSon(item)">
+                        <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                            size="14"></uni-icons>鏌ョ湅瀛愯〃
+                    </view>
+                </view>
+            </uni-card>
+        </view>
+
+        <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+        <view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
+        <view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+    </view>
 </template>
 
 <script>
-	import { getUserInfo } from "@/utils/auth.js";
-	export default {
-	    data() {
-	        return {
-				userInfo:getUserInfo(),
-				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
-				hform:{
-					HBillNo:'',
-					HEquipType:'',
-					BenginHCreateDate:'',
-					EndHCreateDate:'',
-				},
-				sWhere:'',
-				listData:[],
-				showList:[],
-				showDetail:-1,
-				
-				page:1,
-	        }
-	    },
-		onLoad() {
-			this.getList()
-			console.log(this.userInfo,uni.getStorageSync('HUserName'))
-		},
-		onReachBottom: function() {
-			this.page++
-			setTimeout(() => {
-				this.showList = this.showList.concat(this.getPage(this.page,this.listData))
-			}, 100)
-		},
-		onPullDownRefresh: function() {
-			this.clear()
-			setTimeout(()=>{
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-	    methods: {
-			getPage(page,list){
-				let sindex = (parseInt(page) - 1) * 20
-				let eindex = parseInt(page) * 20
-				let newList = list.slice(sindex,eindex)
-				return newList
-			},
-			getList(){
-				console.log(this.sWhere)
-				uni.showLoading({
-					title:'鍔犺浇涓�...'
-				})
-				uni.request({
-				    url: this.serverUrl + '/Gy_EquipFileMain/GetList',
-					data:{ 
-						sWhere: this.sWhere,
-						user: uni.getStorageSync('HUserName')
-					},
-				    success: (res) => {
-				        console.log(1,res);
-						if(res.data.count == 1){
-							this.listData = res.data.data
-							this.showList = this.getPage(this.page,this.listData)
-							setTimeout(()=>{
-							     uni.hideLoading()
-							}, 1000)
-						}else{
-							uni.hideLoading()
-							uni.showToast({
-								title:res.data.Message,
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.hideLoading()
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-				
-				// uni.request({
-				//     url: this.serverUrl + '/Gy_EquipFileMain/Sb_EquipFileBillResumeDate',
-				// 	data: { "HInterID": 2 },
-				//     success: (res) => {
-				//         console.log(2,res);
-						
-				//     }
-				// });
-			},
-			//閫夋嫨鍗曟嵁鏃ユ湡
-			BenginHCreateDateChange(e){
-				console.log(e.detail.value)
-				this.hform.BenginHCreateDate = e.detail.value
-			},
-			//閫夋嫨鍗曟嵁鏃ユ湡
-			EndHCreateDateChange(e){
-				console.log(e.detail.value)
-				this.hform.EndHCreateDate = e.detail.value
-			},
-			search(){
-				this.sWhere = ''
-				this.listData = []
-				this.page = 1
-				this.showList = []
-				
-				console.log(this.hform)
-				if (this.hform.HBillNo) {
-				    this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
-				}
-				if (this.hform.HEquipType) {
-				    this.sWhere += " and 璁惧绫诲瀷 like '%" + this.hform.HEquipType + "%'";
-				}
-				if (this.hform.BenginHCreateDate) {
-				    this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
-				}
-				if (this.hform.EndHCreateDate) {
-				    this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
-				}
-				
-				this.getList()
-			},
-			clear(){
-				this.listData = []
-				this.page = 1
-				this.showList = []
-				
-				this.sWhere = ''
-				this.hform = {
-					HBillNo:'',
-					HEquipType:'',
-					BenginHCreateDate:'',
-					EndHCreateDate:'',
-				}
-				this.getList()
-			},
-			toSon(item){
-				uni.navigateTo({
-					url:'/pages/shebeilvli/EquipFileBillResume_son?HInterID=' + item.hmainid 
-					+ '&璁惧鍚嶇О=' + item.璁惧鍚嶇О 
-					+ '&璁惧浠ｇ爜=' + item.璁惧浠ｇ爜 
-					+ '&璁惧鍑哄巶鏃ユ湡=' + item.璁惧鍑哄巶鏃ユ湡 
-					+ '&璁惧鍑哄巶缂栧彿=' + item.璁惧鍑哄巶缂栧彿 
-					+ '&璁惧鍨嬪彿=' + item.璁惧鍨嬪彿 
-					+ '&璁惧绫诲瀷=' + item.璁惧绫诲瀷
-					+ '&璁惧缂栫爜=' + item.璁惧缂栫爜
-					+ '&璁惧瑙勬牸=' + item.璁惧瑙勬牸,
-				})
-			}
-	    }
-	}
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    export default {
+        data() {
+            return {
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                hform: {
+                    HBillNo: '',
+                    HEquipType: '',
+                    BenginHCreateDate: '',
+                    EndHCreateDate: '',
+                },
+                sWhere: '',
+                listData: [],
+                showList: [],
+                showDetail: -1,
+
+                page: 1,
+            }
+        },
+        onLoad(e) {
+            this.getList()
+            console.log(this.userInfo, uni.getStorageSync('HUserName'))
+        },
+        onReachBottom: function() {
+            this.page++
+            setTimeout(() => {
+                this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+            }, 100)
+        },
+        onPullDownRefresh: function() {
+            this.clear()
+            setTimeout(() => {
+                uni.stopPullDownRefresh();
+            }, 1000);
+        },
+        methods: {
+            getPage(page, list) {
+                let sindex = (parseInt(page) - 1) * 20
+                let eindex = parseInt(page) * 20
+                let newList = list.slice(sindex, eindex)
+                return newList
+            },
+            getList() {
+                console.log(this.sWhere)
+                uni.showLoading({
+                    title: '鍔犺浇涓�...'
+                })
+                uni.request({
+                    url: this.serverUrl + '/Gy_EquipFileMain/GetList',
+                    data: {
+                        sWhere: this.sWhere,
+                        user: uni.getStorageSync('HUserName')
+                    },
+                    success: (res) => {
+                        console.log(1, res);
+                        if (res.data.count == 1) {
+                            this.listData = res.data.data
+                            this.showList = this.getPage(this.page, this.listData)
+                            setTimeout(() => {
+                                uni.hideLoading()
+                            }, 1000)
+                        } else {
+                            uni.hideLoading()
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.hideLoading()
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+
+                // uni.request({
+                //     url: this.serverUrl + '/Gy_EquipFileMain/Sb_EquipFileBillResumeDate',
+                // 	data: { "HInterID": 2 },
+                //     success: (res) => {
+                //         console.log(2,res);
+
+                //     }
+                // });
+            },
+            //閫夋嫨鍗曟嵁鏃ユ湡
+            BenginHCreateDateChange(e) {
+                console.log(e.detail.value)
+                this.hform.BenginHCreateDate = e.detail.value
+            },
+            //閫夋嫨鍗曟嵁鏃ユ湡
+            EndHCreateDateChange(e) {
+                console.log(e.detail.value)
+                this.hform.EndHCreateDate = e.detail.value
+            },
+            search() {
+                this.sWhere = ''
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                console.log(this.hform)
+                if (this.hform.HBillNo) {
+                    this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+                }
+                if (this.hform.HEquipType) {
+                    this.sWhere += " and 璁惧绫诲瀷 like '%" + this.hform.HEquipType + "%'";
+                }
+                if (this.hform.BenginHCreateDate) {
+                    this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
+                }
+                if (this.hform.EndHCreateDate) {
+                    this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
+                }
+
+                this.getList()
+            },
+            clear() {
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                this.sWhere = ''
+                this.hform = {
+                    HBillNo: '',
+                    HEquipType: '',
+                    BenginHCreateDate: '',
+                    EndHCreateDate: '',
+                }
+                this.getList()
+            },
+            toSon(item) {
+                uni.navigateTo({
+                    url: '/pages/shebeilvli/EquipFileBillResume_son?HInterID=' + item.hmainid +
+                        '&璁惧鍚嶇О=' + item.璁惧鍚嶇О +
+                        '&璁惧浠ｇ爜=' + item.璁惧浠ｇ爜 +
+                        '&璁惧鍑哄巶鏃ユ湡=' + item.璁惧鍑哄巶鏃ユ湡 +
+                        '&璁惧鍑哄巶缂栧彿=' + item.璁惧鍑哄巶缂栧彿 +
+                        '&璁惧鍨嬪彿=' + item.璁惧鍨嬪彿 +
+                        '&璁惧绫诲瀷=' + item.璁惧绫诲瀷 +
+                        '&璁惧缂栫爜=' + item.璁惧缂栫爜 +
+                        '&璁惧瑙勬牸=' + item.璁惧瑙勬牸,
+                })
+            }
+        }
+    }
 </script>
 
 <style lang="scss" scoped>
-	.form{
-		width: 640rpx;
-		margin: 20rpx auto;
-	}
-    .form-item{
-		display: flex;
-		align-items: center;
-		font-size: 28rpx;
-		padding: 6rpx 0;
-		.title{
-			width: 180rpx;
-			text{
-				color: red;
-				font-weight: bold;
-			}
-		}
-		.right{
-			width: 450rpx;
-			border-radius: 22rpx;
-			border: 1px solid #acacac;
-		}
-		.righton{
-			width: 450rpx;
-			border-radius: 22rpx;
-			border: 1px solid #e4e4e4;
-			background-color: #e4e4e4;
-		}
-		input{
-			width: 100%;
-			padding: 8rpx 20rpx;
-			font-size: 30rpx;
-		}
-	}
-	.buttons{
-		width: 100%;
-		display: flex;
-		justify-content: center;
-		margin-top: 20rpx;
-		button{
-			border-radius: 50rpx;
-			width: 180rpx;
-			height: 66rpx;
-			line-height: 66rpx;
-			font-size: 28rpx;
-		}
-		.btn-a{
-			background-color: #acacac;
-			color: #fff;
-		}
-		.btn-b{
-			background-color: #41a863;
-			color: #fff;
-		}
-		.btn-c{
-			background-color: #3a78ff;
-			color: #fff;
-		}
-	}
-	
-	.list{
-		width: 100%;
-		.card-detail{
-			width: 100%;
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-			line-height: 120%;
-			.detail{
-				// width: 50%;
-				font-size: 26rpx;
-				margin-bottom: 12rpx;
-				color: #555;
-				margin-right: 20rpx;
-				text{
-					color: #999;
-					font-size: 26rpx;
-				}
-			}
-		}
-		.more{
-			color: #888;
-			font-size: 24rpx;
-			display: flex;
-			border-top: 1px solid #eee;
-			padding-top: 20rpx;
-			.part{
-				width: 50%;
-				text-align: center;
-			}
-		}
-	}
+    .form {
+        width: 640rpx;
+        margin: 20rpx auto;
+    }
 
-</style>
+    .form-item {
+        display: flex;
+        align-items: center;
+        font-size: 28rpx;
+        padding: 6rpx 0;
+
+        .title {
+            width: 180rpx;
+
+            text {
+                color: red;
+                font-weight: bold;
+            }
+        }
+
+        .right {
+            width: 450rpx;
+            border-radius: 22rpx;
+            border: 1px solid #acacac;
+        }
+
+        .righton {
+            width: 450rpx;
+            border-radius: 22rpx;
+            border: 1px solid #e4e4e4;
+            background-color: #e4e4e4;
+        }
+
+        input {
+            width: 100%;
+            padding: 8rpx 20rpx;
+            font-size: 30rpx;
+        }
+    }
+
+    .buttons {
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        margin-top: 20rpx;
+
+        button {
+            border-radius: 50rpx;
+            width: 180rpx;
+            height: 66rpx;
+            line-height: 66rpx;
+            font-size: 28rpx;
+        }
+
+        .btn-a {
+            background-color: #acacac;
+            color: #fff;
+        }
+
+        .btn-b {
+            background-color: #41a863;
+            color: #fff;
+        }
+
+        .btn-c {
+            background-color: #3a78ff;
+            color: #fff;
+        }
+    }
+
+    .list {
+        width: 100%;
+
+        .card-detail {
+            width: 100%;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            line-height: 120%;
+
+            .detail {
+                // width: 50%;
+                font-size: 26rpx;
+                margin-bottom: 12rpx;
+                color: #555;
+                margin-right: 20rpx;
+
+                text {
+                    color: #999;
+                    font-size: 26rpx;
+                }
+            }
+        }
+
+        .more {
+            color: #888;
+            font-size: 24rpx;
+            display: flex;
+            border-top: 1px solid #eee;
+            padding-top: 20rpx;
+
+            .part {
+                width: 50%;
+                text-align: center;
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/pages/shebeiyunxingzhuangtai/detail.vue b/pages/shebeiyunxingzhuangtai/detail.vue
index 71511dc..a949b5a 100644
--- a/pages/shebeiyunxingzhuangtai/detail.vue
+++ b/pages/shebeiyunxingzhuangtai/detail.vue
@@ -1,509 +1,596 @@
 <template>
-	<view class="container">
-		<view class="graph-container">
-			<view class="graph"><l-echart ref="chartRef1" @finished="initHistogram1"></l-echart></view>
-			<view class="graph"><l-echart ref="chartRef2" @finished="initLineChart"></l-echart></view>
-			<view class="graph"><l-echart ref="chartRef3" @finished="initStatistics"></l-echart></view>
-			<view class="graph"><l-echart ref="chartRef4" @finished="initHistogram4"></l-echart></view>
-		</view>
+    <view class="container">
+        <view class="graph-container">
+            <view class="graph"><l-echart ref="chartRef1" @finished="initHistogram1"></l-echart></view>
+            <view class="graph"><l-echart ref="chartRef2" @finished="initLineChart"></l-echart></view>
+            <view class="graph"><l-echart ref="chartRef3" @finished="initStatistics"></l-echart></view>
+            <view class="graph"><l-echart ref="chartRef4" @finished="initHistogram4"></l-echart></view>
+        </view>
 
-		<view class="operation-zone">
-			<button size="mini" plain>寮�鏈�</button>
-			<button size="mini" plain>鍋滄満</button>
-			<button size="mini" plain>鐐规璁板綍</button>
-			<button size="mini" plain>鏁呴殰鐧昏</button>
-			<button size="mini" plain>缁翠慨</button>
-			<button size="mini" plain>灞ュ巻</button>
-			<button size="mini" plain>宸ヨ壓</button>
-			<button size="mini" plain>鐘舵��</button>
-		</view>
+        <view class="operation-zone" @click="doOperation">
+            <button size="mini" data-type="equipBegin" plain>寮�鏈�</button>
+            <button size="mini" data-type="equipStop" plain>鍋滄満</button>
+            <button size="mini" data-type="workDotCheck" plain>鐐规璁板綍</button>
+            <button size="mini" data-type="equipConkBook" plain>鏁呴殰鐧昏</button>
+            <button size="mini" data-type="eqpMaintenance" plain>缁翠慨</button>
+            <button size="mini" data-type="equipResume" plain>灞ュ巻</button>
+            <button size="mini" data-type="equipmentProcess" plain>宸ヨ壓</button>
+            <button size="mini" data-type="OEEStatusReport" plain>鐘舵��</button>
+        </view>
 
-	</view>
+    </view>
 </template>
 
 <script>
-	import {
-		getUserInfo
-	} from "@/utils/auth.js";
-	import * as echarts from "echarts"
-	export default {
-		data() {
-			return {
-				userInfo: getUserInfo(),
-				organInfo: {
-					id: uni.getStorageSync("OrganizationID") || "",
-					name: uni.getStorageSync("Organization") || ""
-				},
-				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-				
-			}
-		},
-		methods: {
-			doRequest(url, data, resFunction, errFunction, method) {
-				uni.showLoading({
-					title: '鍔犺浇涓�...'
-				})
-				uni.request({
-					method: method || "GET",
-					url: this.serverUrl + url,
-					data: data || "",
-					success: (res) => {
-						if (typeof resFunction === 'function') {
-							resFunction.call(this, res)
-						} else if (typeof errFunction === 'undefined') {
-							return
-						} else {
-							throw new TypeError("璁块棶鎴愬姛鍥炶皟鍑芥暟绫诲瀷寮傚父!")
-						}
-					},
-					fail: (err) => {
+    import {
+        CommonUtils
+    } from "../../utils/common";
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import * as echarts from "echarts"
+    export default {
+        data() {
+            return {
+                HEquipID: 0,
+                HICMOInterID: 0,
+                HICMOEntryID: 0,
+                userInfo: getUserInfo(),
+                organInfo: {
+                    id: uni.getStorageSync("OrganizationID") || "",
+                    name: uni.getStorageSync("Organization") || ""
+                },
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
 
-						if (typeof errFunction === 'function') {
-							errFunction.call(this, err)
-						} else if (typeof errFunction === 'undefined') {
-							return
-						} else {
-							throw new TypeError("璁块棶澶辫触鍥炶皟鍑芥暟绫诲瀷寮傚父!")
-						}
-					}
-				})
-				uni.hideLoading()
-			},
+            }
+        },
+        methods: {
+            doRequest(url, data, resFunction, errFunction, method) {
+                uni.showLoading({
+                    title: '鍔犺浇涓�...'
+                })
+                uni.request({
+                    method: method || "GET",
+                    url: this.serverUrl + url,
+                    data: data || "",
+                    success: (res) => {
+                        if (typeof resFunction === 'function') {
+                            resFunction.call(this, res)
+                        } else if (typeof errFunction === 'undefined') {
+                            return
+                        } else {
+                            throw new TypeError("璁块棶鎴愬姛鍥炶皟鍑芥暟绫诲瀷寮傚父!")
+                        }
+                    },
+                    fail: (err) => {
 
-			//鏌辩姸鍥�
-			async get_Histogram1(mychart11, chartData) {
-				console.log("鍒濆鍖栨煴鐘跺浘")
-				// 榛樿鐨刼ption缁撴瀯
-				var option = {
-					title: {
-						text: '杩戜竷澶╀骇鑳�', // 榛樿鏍囬涓虹┖
-						left: 'center',
-						top: '10%', // 璋冩暣鏍囬浣嶇疆锛屾斁鍒版渶涓婇潰
-						textStyle: {
-							fontSize: 18,
-							color: '#ff0000'
-						}
-					},
-					grid: {
-						top: '25%', // 璋冩暣grid鐨則op鍊硷紝缁欐爣棰樼暀鍑虹┖闂�
-						bottom: '20%',
-						left: '10%',
-						right: '10%'
-					},
-					xAxis: {
-						type: 'category',
-						data: [] // 榛樿x杞存暟鎹负绌�
-					},
-					yAxis: {
-						type: 'value'
-					},
-					series: [{
-						data: [], // 榛樿series鏁版嵁涓虹┖
-						type: 'bar'
-					}]
-				};
+                        if (typeof errFunction === 'function') {
+                            errFunction.call(this, err)
+                        } else if (typeof errFunction === 'undefined') {
+                            return
+                        } else {
+                            throw new TypeError("璁块棶澶辫触鍥炶皟鍑芥暟绫诲瀷寮傚父!")
+                        }
+                    }
+                })
+                uni.hideLoading()
+            },
 
-				// 濡傛灉鏈夋暟鎹紝鏇存柊option鐨勫唴瀹�
-				if (chartData && chartData.length > 0) {
-					option.title.text = '杩戜竷澶╀骇鑳�'; // 姝ｅ父鏁版嵁鏃舵病鏈夋爣棰�
-					option.xAxis.data = chartData.map(item => item.鏃ユ湡); // 璁剧疆x杞存暟鎹�
-					option.series[0].data = chartData.map(item => item['鐢熶骇鎬绘暟']); // 璁剧疆y杞存暟鎹�
+            //鏌辩姸鍥�
+            async get_Histogram1(mychart11, chartData) {
+                console.log("鍒濆鍖栨煴鐘跺浘")
+                // 榛樿鐨刼ption缁撴瀯
+                var option = {
+                    title: {
+                        text: '杩戜竷澶╀骇鑳�', // 榛樿鏍囬涓虹┖
+                        left: 'center',
+                        top: '10%', // 璋冩暣鏍囬浣嶇疆锛屾斁鍒版渶涓婇潰
+                        textStyle: {
+                            fontSize: 18,
+                            color: '#ff0000'
+                        }
+                    },
+                    grid: {
+                        top: '25%', // 璋冩暣grid鐨則op鍊硷紝缁欐爣棰樼暀鍑虹┖闂�
+                        bottom: '20%',
+                        left: '10%',
+                        right: '10%'
+                    },
+                    xAxis: {
+                        type: 'category',
+                        data: [] // 榛樿x杞存暟鎹负绌�
+                    },
+                    yAxis: {
+                        type: 'value'
+                    },
+                    series: [{
+                        data: [], // 榛樿series鏁版嵁涓虹┖
+                        type: 'bar'
+                    }],
+                };
 
-					option.series[0].label = {
-						normal: {
-							show: true,
-							position: 'top',
-							formatter: function(params) {
-								return echarts.format.addCommas(params.value);
-							}
-						}
-					};
+                // 濡傛灉鏈夋暟鎹紝鏇存柊option鐨勫唴瀹�
+                if (chartData && chartData.length > 0) {
+                    option.title.text = '杩戜竷澶╀骇鑳�'; // 姝ｅ父鏁版嵁鏃舵病鏈夋爣棰�
+                    option.xAxis.data = chartData.map(item => item.鏃ユ湡); // 璁剧疆x杞存暟鎹�
+                    option.series[0].data = chartData.map(item => item['鐢熶骇鎬绘暟']); // 璁剧疆y杞存暟鎹�
 
-					option.series[0].itemStyle = {
-						normal: {
-							color: '#15b1fa',
-							label: {
-								show: true // 鍦ㄦ煴鐘跺浘涓婃樉绀烘暟鎹�
-							}
-						}
-					};
-				} else {
-					// 娌℃湁鏁版嵁鏃讹紝鏄剧ず"鏆傛棤鏁版嵁"鎻愮ず
-					option.title.text = '鏆傛棤鏁版嵁';
-				}
+                    option.series[0].label = {
+                        normal: {
+                            show: true,
+                            position: 'top',
+                            formatter: function(params) {
+                                return echarts.format.addCommas(params.value);
+                            }
+                        }
+                    };
 
-				// 鏇存柊鍥捐〃
-				mychart11.setOption(option);
-			},
+                    option.series[0].itemStyle = {
+                        normal: {
+                            color: '#15b1fa',
+                            label: {
+                                show: true // 鍦ㄦ煴鐘跺浘涓婃樉绀烘暟鎹�
+                            }
+                        }
+                    };
+                } else {
+                    // 娌℃湁鏁版嵁鏃讹紝鏄剧ず"鏆傛棤鏁版嵁"鎻愮ず
+                    option.title.text = '鏆傛棤鏁版嵁';
+                }
 
-			//鏌辩姸鍥�2
-			async get_LineChart(mychart22, chartData1) {
-				// 榛樿鐨刼ption缁撴瀯
-				var option = {
-					title: {
-						text: '缁翠慨', // 榛樿鏍囬涓虹┖
-						left: 'center',
-						top: '10%', // 璋冩暣鏍囬浣嶇疆锛屾斁鍒版渶涓婇潰
-						textStyle: {
-							fontSize: 18,
-							color: '#ff0000'
-						}
-					},
-					axisLabel: {
-						show: true,
-						interval: 0,
-						color: '#15b1fa',
-						formatter: function(value) {
-							var ret = ""; //鎷兼帴鍔燶n杩斿洖鐨勭被鐩」
-							var maxLength = 1; //姣忛」鏄剧ず鏂囧瓧涓暟
-							var valLength = value.length; //X杞寸被鐩」鐨勬枃瀛椾釜鏁�
-							var rowN = Math.ceil(valLength / maxLength); //绫荤洰椤归渶瑕佹崲琛岀殑琛屾暟
-							if (rowN > 1) //濡傛灉绫荤洰椤圭殑鏂囧瓧澶т簬3,
-							{
-								for (var i = 0; i < rowN; i++) {
-									var temp = ""; //姣忔鎴彇鐨勫瓧绗︿覆
-									var start = i * maxLength; //寮�濮嬫埅鍙栫殑浣嶇疆
-									var end = start + maxLength; //缁撴潫鎴彇鐨勪綅缃�
-									//杩欓噷涔熷彲浠ュ姞涓�涓槸鍚︽槸鏈�鍚庝竴琛岀殑鍒ゆ柇锛屼絾鏄笉鍔犱篃娌℃湁褰卞搷锛岄偅灏变笉鍔犲惂
-									temp = value.substring(start, end) + "\n";
-									ret += temp; //鍑�熸渶缁堢殑瀛楃涓�
-								}
-								return ret;
-							} else {
-								return value;
-							}
-						}
-					},
-					grid: {
-						top: '25%', // 璋冩暣grid鐨則op鍊硷紝缁欐爣棰樼暀鍑虹┖闂�
-						bottom: '20%',
-						left: '10%',
-						right: '10%'
-					},
-					xAxis: {
-						type: 'category',
-						data: [] // 榛樿x杞存暟鎹负绌�
-					},
-					yAxis: {
-						type: 'value'
-					},
-					series: [{
-						data: [], // 榛樿series鏁版嵁涓虹┖
-						type: 'bar'
-					}]
-				};
+                // 鏇存柊鍥捐〃
+                mychart11.setOption(option);
+            },
+
+            //鏌辩姸鍥�2
+            async get_LineChart(mychart22, chartData1) {
+                // 榛樿鐨刼ption缁撴瀯
+                var option = {
+                    title: {
+                        text: '缁翠慨', // 榛樿鏍囬涓虹┖
+                        left: 'center',
+                        top: '10%', // 璋冩暣鏍囬浣嶇疆锛屾斁鍒版渶涓婇潰
+                        textStyle: {
+                            fontSize: 18,
+                            color: '#ff0000'
+                        }
+                    },
+                    axisLabel: {
+                        show: true,
+                        interval: 0,
+                        color: '#15b1fa',
+                        formatter: function(value) {
+                            var ret = ""; //鎷兼帴鍔燶n杩斿洖鐨勭被鐩」
+                            var maxLength = 1; //姣忛」鏄剧ず鏂囧瓧涓暟
+                            var valLength = value.length; //X杞寸被鐩」鐨勬枃瀛椾釜鏁�
+                            var rowN = Math.ceil(valLength / maxLength); //绫荤洰椤归渶瑕佹崲琛岀殑琛屾暟
+                            if (rowN > 1) //濡傛灉绫荤洰椤圭殑鏂囧瓧澶т簬3,
+                            {
+                                for (var i = 0; i < rowN; i++) {
+                                    var temp = ""; //姣忔鎴彇鐨勫瓧绗︿覆
+                                    var start = i * maxLength; //寮�濮嬫埅鍙栫殑浣嶇疆
+                                    var end = start + maxLength; //缁撴潫鎴彇鐨勪綅缃�
+                                    //杩欓噷涔熷彲浠ュ姞涓�涓槸鍚︽槸鏈�鍚庝竴琛岀殑鍒ゆ柇锛屼絾鏄笉鍔犱篃娌℃湁褰卞搷锛岄偅灏变笉鍔犲惂
+                                    temp = value.substring(start, end) + "\n";
+                                    ret += temp; //鍑�熸渶缁堢殑瀛楃涓�
+                                }
+                                return ret;
+                            } else {
+                                return value;
+                            }
+                        }
+                    },
+                    grid: {
+                        top: '25%', // 璋冩暣grid鐨則op鍊硷紝缁欐爣棰樼暀鍑虹┖闂�
+                        bottom: '20%',
+                        left: '10%',
+                        right: '10%'
+                    },
+                    xAxis: {
+                        type: 'category',
+                        data: [] // 榛樿x杞存暟鎹负绌�
+                    },
+                    yAxis: {
+                        type: 'value'
+                    },
+                    series: [{
+                        data: [], // 榛樿series鏁版嵁涓虹┖
+                        type: 'bar'
+                    }],
+                };
 
 
 
-				// 濡傛灉鏈夋暟鎹紝鏇存柊option鐨勫唴瀹�
-				if (chartData1 && chartData1.length > 0) {
-					option.title.text = '涓嶈壇鍘熷洜'; // 姝ｅ父鏁版嵁鏃舵病鏈夋爣棰�
-					option.xAxis.data = chartData1.map(item => item.涓嶈壇鍘熷洜); // 璁剧疆x杞存暟鎹�
-					option.series[0].data = chartData1.map(item => item['鏁伴噺']); // 璁剧疆y杞存暟鎹�
+                // 濡傛灉鏈夋暟鎹紝鏇存柊option鐨勫唴瀹�
+                if (chartData1 && chartData1.length > 0) {
+                    option.title.text = '涓嶈壇鍘熷洜'; // 姝ｅ父鏁版嵁鏃舵病鏈夋爣棰�
+                    option.xAxis.data = chartData1.map(item => item.涓嶈壇鍘熷洜); // 璁剧疆x杞存暟鎹�
+                    option.series[0].data = chartData1.map(item => item['鏁伴噺']); // 璁剧疆y杞存暟鎹�
 
-					option.series[0].label = {
-						normal: {
-							show: true,
-							position: 'top',
-							formatter: function(params) {
-								return echarts.format.addCommas(params.value);
-							}
-						}
-					};
+                    option.series[0].label = {
+                        normal: {
+                            show: true,
+                            position: 'top',
+                            formatter: function(params) {
+                                return echarts.format.addCommas(params.value);
+                            }
+                        }
+                    };
 
-					option.series[0].itemStyle = {
-						normal: {
-							color: '#15b1fa',
-							label: {
-								show: true // 鍦ㄦ煴鐘跺浘涓婃樉绀烘暟鎹�
-							}
-						}
-					};
-				} else {
-					// 娌℃湁鏁版嵁鏃讹紝鏄剧ず"鏆傛棤鏁版嵁"鎻愮ず
-					option.title.text = '鏆傛棤鏁版嵁';
-				}
+                    option.series[0].itemStyle = {
+                        normal: {
+                            color: '#15b1fa',
+                            label: {
+                                show: true // 鍦ㄦ煴鐘跺浘涓婃樉绀烘暟鎹�
+                            }
+                        }
+                    };
+                } else {
+                    // 娌℃湁鏁版嵁鏃讹紝鏄剧ず"鏆傛棤鏁版嵁"鎻愮ず
+                    option.title.text = '鏆傛棤鏁版嵁';
+                }
 
-				// 鏇存柊鍥捐〃
-				mychart22.setOption(option);
-			},
+                // 鏇存柊鍥捐〃
+                mychart22.setOption(option);
+            },
 
-			//楗煎浘
-			async get_Statistics(mychart3, chartData2) {
-				// 濡傛灉 chartData2 涓虹┖锛屾彁渚涗竴涓�滄棤鏁版嵁鈥濇彁绀�
-				if (chartData2.length === 0) {
-					mychart3.setOption({
-						title: {
-							text: '鏆傛棤鏁版嵁',
-							left: 'center',
-							top: '10%',
-							textStyle: {
-								color: 'red', // 璁剧疆鏍囬棰滆壊涓虹孩鑹�
-								fontSize: 18,
-								fontWeight: 'bold'
-							}
-						},
-						series: [], // 娓呯┖鏁版嵁
-						graphic: [] // 娓呯┖鍥惧舰涓殑鏂囨湰
-					});
-					return;
-				}
+            //楗煎浘
+            async get_Statistics(mychart3, chartData2) {
+                // 濡傛灉 chartData2 涓虹┖锛屾彁渚涗竴涓�滄棤鏁版嵁鈥濇彁绀�
+                if (!chartData2 || chartData2.length == 0) {
+                    mychart3.setOption({
+                        title: {
+                            text: '鏆傛棤鏁版嵁',
+                            left: 'center',
+                            top: '10%',
+                            textStyle: {
+                                color: 'red', // 璁剧疆鏍囬棰滆壊涓虹孩鑹�
+                                fontSize: 18,
+                                fontWeight: 'bold'
+                            }
+                        },
+                        series: [], // 娓呯┖鏁版嵁
+                        graphic: [], // 娓呯┖鍥惧舰涓殑鏂囨湰
+                    });
+                } else {
+                    // 鐘舵�侀鑹叉槧灏�
+                    const statusColorMap = {
+                        '寮�鏈�': '#28a745', // 缁胯壊
+                        '鏁呴殰': '#ff63a5', // 妗冪孩鑹�
+                        '鍋滄満': '#f0ad4e', // 榛勮壊
+                        '鏈煡': '#6c757d' // 鐏拌壊
+                    };
 
-				// 鐘舵�侀鑹叉槧灏�
-				const statusColorMap = {
-					'寮�鏈�': '#28a745', // 缁胯壊
-					'鏁呴殰': '#ff63a5', // 妗冪孩鑹�
-					'鍋滄満': '#f0ad4e', // 榛勮壊
-					'鏈煡': '#6c757d' // 鐏拌壊
-				};
+                    // 璁＄畻寮�鏈虹巼
+                    chartData2 = Array.from(chartData2)
+                    const totalDevices = chartData2.reduce((sum, item) => sum + item.鏁伴噺, 0);
+                    const onlineDevices = chartData2.find(item => item.鐘舵�� === '寮�鏈�')?.鏁伴噺 || 0;
+                    const onlineRate = totalDevices === 0 ? 0 : (onlineDevices / totalDevices * 100).toFixed(2);
 
-				// 璁＄畻寮�鏈虹巼
-				const totalDevices = chartData2.reduce((sum, item) => sum + item.鏁伴噺, 0);
-				const onlineDevices = chartData2.find(item => item.鐘舵�� === '寮�鏈�')?.鏁伴噺 || 0;
-				const onlineRate = totalDevices === 0 ? 0 : (onlineDevices / totalDevices * 100).toFixed(2);
+                    // 鍔ㄦ�佺敓鎴愰ゼ鍥炬暟鎹紝骞舵牴鎹姸鎬佽缃鑹�
+                    var data = chartData2.map(function(item) {
+                        // 鑾峰彇褰撳墠鐘舵�佺殑棰滆壊锛岄粯璁や负鐏拌壊
+                        var color = statusColorMap[item.鐘舵�乚 || statusColorMap['鏈煡'];
 
-				// 鍔ㄦ�佺敓鎴愰ゼ鍥炬暟鎹紝骞舵牴鎹姸鎬佽缃鑹�
-				var data = chartData2.map(function(item) {
-					// 鑾峰彇褰撳墠鐘舵�佺殑棰滆壊锛岄粯璁や负鐏拌壊
-					var color = statusColorMap[item.鐘舵�乚 || statusColorMap['鏈煡'];
+                        return {
+                            value: item.鏁伴噺,
+                            name: item.鐘舵��,
+                            itemStyle: {
+                                color: color // 涓烘瘡涓姸鎬佽缃搴旂殑棰滆壊
+                            }
+                        };
+                    });
 
-					return {
-						value: item.鏁伴噺,
-						name: item.鐘舵��,
-						itemStyle: {
-							color: color // 涓烘瘡涓姸鎬佽缃搴旂殑棰滆壊
-						}
-					};
-				});
+                    // 鍥捐〃鐨勯厤缃」
+                    var option = {
+                        title: {
+                            text: '璁惧鐘舵�佸垎鏋愬姣�',
+                            left: 'center',
+                            top: '10%', // 灏嗘爣棰樻斁缃埌椤堕儴
+                            textStyle: {
+                                color: 'red', // 璁剧疆鏍囬瀛椾綋棰滆壊涓虹孩鑹�
+                                fontSize: 18,
+                                fontWeight: 'bold'
+                            }
+                        },
+                        tooltip: {
+                            trigger: 'item'
+                        },
+                        legend: {
+                            orient: 'vertical',
+                            left: 'left'
+                        },
+                        series: [{
+                            name: '璁惧鐘舵��',
+                            type: 'pie',
+                            radius: '50%',
+                            data: data, // 浣跨敤鍔ㄦ�佺敓鎴愮殑鏁版嵁
+                            emphasis: {
+                                itemStyle: {
+                                    shadowBlur: 10,
+                                    shadowOffsetX: 0,
+                                    shadowColor: 'rgba(0, 0, 0, 0.5)'
+                                }
+                            }
+                        }],
+                        graphic: [{
+                            type: 'text',
+                            left: 'center',
+                            top: '85%', // 璋冩暣鏂囨湰浣嶇疆锛岃鍏剁◢寰洿寰�涓�
+                            style: {
+                                text: `寮�鏈虹巼: ${onlineRate}%`, // 鏄剧ず寮�鏈虹巼
+                                font: '16px Arial',
+                                fill: '#00aaff' // 浣跨敤娴呰摑鑹叉樉绀哄紑鏈虹巼
+                            }
+                        }]
+                    };
 
-				// 鍥捐〃鐨勯厤缃」
-				var option = {
-					title: {
-						text: '璁惧鐘舵�佸垎鏋愬姣�',
-						left: 'center',
-						top: '10%', // 灏嗘爣棰樻斁缃埌椤堕儴
-						textStyle: {
-							color: 'red', // 璁剧疆鏍囬瀛椾綋棰滆壊涓虹孩鑹�
-							fontSize: 18,
-							fontWeight: 'bold'
-						}
-					},
-					tooltip: {
-						trigger: 'item'
-					},
-					legend: {
-						orient: 'vertical',
-						left: 'left'
-					},
-					series: [{
-						name: '璁惧鐘舵��',
-						type: 'pie',
-						radius: '50%',
-						data: data, // 浣跨敤鍔ㄦ�佺敓鎴愮殑鏁版嵁
-						emphasis: {
-							itemStyle: {
-								shadowBlur: 10,
-								shadowOffsetX: 0,
-								shadowColor: 'rgba(0, 0, 0, 0.5)'
-							}
-						}
-					}],
-					graphic: [{
-						type: 'text',
-						left: 'center',
-						top: '85%', // 璋冩暣鏂囨湰浣嶇疆锛岃鍏剁◢寰洿寰�涓�
-						style: {
-							text: `寮�鏈虹巼: ${onlineRate}%`, // 鏄剧ず寮�鏈虹巼
-							font: '16px Arial',
-							fill: '#00aaff' // 浣跨敤娴呰摑鑹叉樉绀哄紑鏈虹巼
-						}
-					}]
-				};
+                    // 璁剧疆鍥捐〃鐨勯厤缃」
+                    mychart3.setOption(option);
+                }
 
-				// 璁剧疆鍥捐〃鐨勯厤缃」
-				mychart3.setOption(option);
-			},
 
-			//鏌辩姸鍥�4
-			async get_Histogram4(mychart4, chartData3) {
-				// 榛樿鐨刼ption缁撴瀯
-				var option = {
-					title: {
-						text: '缁翠慨', // 榛樿鏍囬涓虹┖
-						left: 'center',
-						top: '10%', // 璋冩暣鏍囬浣嶇疆锛屾斁鍒版渶涓婇潰
-						textStyle: {
-							fontSize: 18,
-							color: '#ff0000'
-						}
-					},
-					axisLabel: {
-						show: true,
-						interval: 0,
-						color: '#15b1fa',
-						formatter: function(value) {
-							var ret = ""; //鎷兼帴鍔燶n杩斿洖鐨勭被鐩」
-							var maxLength = 1; //姣忛」鏄剧ず鏂囧瓧涓暟
-							var valLength = value.length; //X杞寸被鐩」鐨勬枃瀛椾釜鏁�
-							var rowN = Math.ceil(valLength / maxLength); //绫荤洰椤归渶瑕佹崲琛岀殑琛屾暟
-							if (rowN > 1) //濡傛灉绫荤洰椤圭殑鏂囧瓧澶т簬3,
-							{
-								for (var i = 0; i < rowN; i++) {
-									var temp = ""; //姣忔鎴彇鐨勫瓧绗︿覆
-									var start = i * maxLength; //寮�濮嬫埅鍙栫殑浣嶇疆
-									var end = start + maxLength; //缁撴潫鎴彇鐨勪綅缃�
-									//杩欓噷涔熷彲浠ュ姞涓�涓槸鍚︽槸鏈�鍚庝竴琛岀殑鍒ゆ柇锛屼絾鏄笉鍔犱篃娌℃湁褰卞搷锛岄偅灏变笉鍔犲惂
-									temp = value.substring(start, end) + "\n";
-									ret += temp; //鍑�熸渶缁堢殑瀛楃涓�
-								}
-								return ret;
-							} else {
-								return value;
-							}
-						}
-					},
-					grid: {
-						top: '25%', // 璋冩暣grid鐨則op鍊硷紝缁欐爣棰樼暀鍑虹┖闂�
-						bottom: '20%',
-						left: '10%',
-						right: '10%'
-					},
-					xAxis: {
-						type: 'category',
-						data: [] // 榛樿x杞存暟鎹负绌�
-					},
-					yAxis: {
-						type: 'value'
-					},
-					series: [{
-						data: [], // 榛樿series鏁版嵁涓虹┖
-						type: 'bar'
-					}]
-				};
+            },
 
-				// 濡傛灉鏈夋暟鎹紝鏇存柊option鐨勫唴瀹�
-				if (chartData3 && chartData3.length > 0) {
-					option.title.text = '缁翠慨'; // 姝ｅ父鏁版嵁鏃舵病鏈夋爣棰�
-					option.xAxis.data = chartData3.map(item => item.缁翠慨椤圭洰); // 璁剧疆x杞存暟鎹�
-					option.series[0].data = chartData3.map(item => item['缁翠慨娆℃暟']); // 璁剧疆y杞存暟鎹�
+            //鏌辩姸鍥�4
+            async get_Histogram4(mychart4, chartData3) {
+                // 榛樿鐨刼ption缁撴瀯
+                var option = {
+                    title: {
+                        text: '缁翠慨', // 榛樿鏍囬涓虹┖
+                        left: 'center',
+                        top: '10%', // 璋冩暣鏍囬浣嶇疆锛屾斁鍒版渶涓婇潰
+                        textStyle: {
+                            fontSize: 18,
+                            color: '#ff0000'
+                        }
+                    },
+                    axisLabel: {
+                        show: true,
+                        interval: 0,
+                        color: '#15b1fa',
+                        formatter: function(value) {
+                            var ret = ""; //鎷兼帴鍔燶n杩斿洖鐨勭被鐩」
+                            var maxLength = 1; //姣忛」鏄剧ず鏂囧瓧涓暟
+                            var valLength = value.length; //X杞寸被鐩」鐨勬枃瀛椾釜鏁�
+                            var rowN = Math.ceil(valLength / maxLength); //绫荤洰椤归渶瑕佹崲琛岀殑琛屾暟
+                            if (rowN > 1) //濡傛灉绫荤洰椤圭殑鏂囧瓧澶т簬3,
+                            {
+                                for (var i = 0; i < rowN; i++) {
+                                    var temp = ""; //姣忔鎴彇鐨勫瓧绗︿覆
+                                    var start = i * maxLength; //寮�濮嬫埅鍙栫殑浣嶇疆
+                                    var end = start + maxLength; //缁撴潫鎴彇鐨勪綅缃�
+                                    //杩欓噷涔熷彲浠ュ姞涓�涓槸鍚︽槸鏈�鍚庝竴琛岀殑鍒ゆ柇锛屼絾鏄笉鍔犱篃娌℃湁褰卞搷锛岄偅灏变笉鍔犲惂
+                                    temp = value.substring(start, end) + "\n";
+                                    ret += temp; //鍑�熸渶缁堢殑瀛楃涓�
+                                }
+                                return ret;
+                            } else {
+                                return value;
+                            }
+                        }
+                    },
+                    grid: {
+                        top: '25%', // 璋冩暣grid鐨則op鍊硷紝缁欐爣棰樼暀鍑虹┖闂�
+                        bottom: '20%',
+                        left: '10%',
+                        right: '10%'
+                    },
+                    xAxis: {
+                        type: 'category',
+                        data: [] // 榛樿x杞存暟鎹负绌�
+                    },
+                    yAxis: {
+                        type: 'value'
+                    },
+                    series: [{
+                        data: [], // 榛樿series鏁版嵁涓虹┖
+                        type: 'bar'
+                    }],
+                };
 
-					option.series[0].label = {
-						normal: {
-							show: true,
-							position: 'top',
-							formatter: function(params) {
-								return echarts.format.addCommas(params.value);
-							}
-						}
-					};
+                // 濡傛灉鏈夋暟鎹紝鏇存柊option鐨勫唴瀹�
+                if (chartData3 && chartData3.length > 0) {
+                    option.title.text = '缁翠慨'; // 姝ｅ父鏁版嵁鏃舵病鏈夋爣棰�
+                    option.xAxis.data = chartData3.map(item => item.缁翠慨椤圭洰); // 璁剧疆x杞存暟鎹�
+                    option.series[0].data = chartData3.map(item => item['缁翠慨娆℃暟']); // 璁剧疆y杞存暟鎹�
 
-					option.series[0].itemStyle = {
-						normal: {
-							color: '#15b1fa',
-							label: {
-								show: true // 鍦ㄦ煴鐘跺浘涓婃樉绀烘暟鎹�
-							}
-						}
-					};
-				} else {
-					// 娌℃湁鏁版嵁鏃讹紝鏄剧ず"鏆傛棤鏁版嵁"鎻愮ず
-					option.title.text = '鏆傛棤鏁版嵁';
-				}
+                    option.series[0].label = {
+                        normal: {
+                            show: true,
+                            position: 'top',
+                            formatter: function(params) {
+                                return echarts.format.addCommas(params.value);
+                            }
+                        }
+                    };
 
-				// 鏇存柊鍥捐〃
-				mychart4.setOption(option);
-			},
-			initCharts(data) {
-				try {
-					let {
-						h_p_Sc_FourStateDistributionReport,
-						h_p_Sc_FourStateDistributionReport1,
-						h_p_Sc_FourStateDistributionReport2,
-						h_p_Sc_FourStateDistributionReport3
-					} = data
-					
-					// 鑳芥樉绀烘殏鏃犳暟鎹紝浣嗘槸闇�瑕佹覆鏌撲袱娆″浘琛�
-					this.initHistogram1 = this.initHistogram1(h_p_Sc_FourStateDistributionReport);
-					this.initLineChart =  this.initLineChart(h_p_Sc_FourStateDistributionReport1);
-					this.initStatistics = this.initStatistics(h_p_Sc_FourStateDistributionReport2);
-					this.initHistogram4 = this.initHistogram4(h_p_Sc_FourStateDistributionReport3);
-				} catch (e) {
-					console.error(e)
-				}
-			},
-			async initHistogram1(data) {
-				const chart = await this.$refs.chartRef1.init(echarts)
-				this.get_Histogram1(chart, data)
-			},
-			async initLineChart(data) {
-				const chart = await this.$refs.chartRef2.init(echarts)
-				this.get_LineChart(chart, data)
-			},
-			async initStatistics(data) {
-				const chart = await this.$refs.chartRef3.init(echarts)
-				this.get_Statistics(chart, data)
-			},
-			async initHistogram4(data) {
-				const chart = await this.$refs.chartRef4.init(echarts)
-				this.get_Histogram4(chart, data)
-			}
-		},
-		onLoad(options) {
-			let {
-				HDeptID,
-				HSourceID
-			} = options
-			this.doRequest(
-				"/Sc_HEquipStateDistribution/Get_EquipStateDistribution_FourReport", {
-					sWhere: {
-						"HDeptID": HDeptID,
-						"HSourceID": HSourceID
-					},
-					user: this.userInfo.HEmpName,
-					OrganizationID: this.organInfo.id
-				},
-				function(res) {
-					let res1 = res.data
-					this.initCharts(res1.data)
-				},
-				function(err) {
-					uni.showToast({
-						icon: "fail",
-						title: '鎺ュ彛璇锋眰澶辫触!'
-					})
-				}
-			)
-		},
-	}
+                    option.series[0].itemStyle = {
+                        normal: {
+                            color: '#15b1fa',
+                            label: {
+                                show: true // 鍦ㄦ煴鐘跺浘涓婃樉绀烘暟鎹�
+                            }
+                        }
+                    };
+                } else {
+                    // 娌℃湁鏁版嵁鏃讹紝鏄剧ず"鏆傛棤鏁版嵁"鎻愮ず
+                    option.title.text = '鏆傛棤鏁版嵁';
+                }
+
+                // 鏇存柊鍥捐〃
+                mychart4.setOption(option);
+            },
+            async initCharts(data) {
+                try {
+                    let {
+                        h_p_Sc_FourStateDistributionReport,
+                        h_p_Sc_FourStateDistributionReport1,
+                        h_p_Sc_FourStateDistributionReport2,
+                        h_p_Sc_FourStateDistributionReport3
+                    } = data
+
+                    // 鑳芥樉绀烘殏鏃犳暟鎹紝浣嗘槸闇�瑕佹覆鏌撲袱娆″浘琛�
+                    this.initHistogram1 = await this.initHistogram1(h_p_Sc_FourStateDistributionReport);
+                    this.initLineChart = await this.initLineChart(h_p_Sc_FourStateDistributionReport1);
+                    this.initStatistics = await this.initStatistics(h_p_Sc_FourStateDistributionReport2);
+                    this.initHistogram4 = await this.initHistogram4(h_p_Sc_FourStateDistributionReport3);
+                } catch (e) {
+                    console.error(e)
+                }
+            },
+            async initHistogram1(data) {
+                const chart = await this.$refs.chartRef1.init(echarts)
+                this.get_Histogram1(chart, data)
+            },
+            async initLineChart(data) {
+                const chart = await this.$refs.chartRef2.init(echarts)
+                this.get_LineChart(chart, data)
+            },
+            async initStatistics(data) {
+                const chart = await this.$refs.chartRef3.init(echarts)
+                this.get_Statistics(chart, data)
+            },
+            async initHistogram4(data) {
+                const chart = await this.$refs.chartRef4.init(echarts)
+                this.get_Histogram4(chart, data)
+            },
+            doOperation(e) {
+                let ds = e.target
+                let type = ds.dataset.type
+                if (type) {
+                    switch (type) {
+                        case "equipBegin":
+                            // 瀵艰埅鍒� 璁惧寮�鏈哄崟
+                            uni.navigateTo({
+                                url: "/pages/MJGL/Sb_EquipBegin/Sb_EquipBeginBill?HEquipID=" + this.HEquipID
+                            });
+                            break;
+                        case "equipStop":
+                            // 瀵艰埅鍒� 璁惧鍋滄満鍗�
+                            uni.navigateTo({
+                                url: "/pages/MJGL/Sb_EquipStop/Sb_EquipStopBill?HEquipID=" + this.HEquipID
+                            });
+                            break;
+                        case "workDotCheck":
+                            // 瀵艰埅鍒扮偣妫�璁板綍
+                            uni.navigateTo({
+                                url: "/pages/MJGL/Sc_WorkDotCheck/Sc_WorkDotCheckBillList_Day?operationType=璁惧&HEquipID=" +
+                                    this.HEquipID
+                            });;
+                            break;
+                        case "equipConkBook":
+                            // 瀵艰埅鍒拌澶囨晠闅滅櫥璁板崟
+                            uni.navigateTo({
+                                url: "/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill?operationType=4&HEquipID=" +
+                                    this.HEquipID
+                            });
+                            break;
+                        case "equipResume":
+                            // 瀵艰埅鍒拌澶囧饱鍘�
+                            uni.navigateTo({
+                                url: "/pages/MJGL/Sb_EquipResumeCheckQuery/Sb_EquipResumeCheckQuery?operationType=4&HEquipID=" +
+                                    this.HEquipID
+                            });
+                            break;
+                        case "equipmentProcess":
+                            // 瀵艰埅鍒拌澶囧伐鑹�
+                            if (!this.HICMOInterID && !this.HICMOEntryID) {
+                                CommonUtils.showTips({
+                                    message: "褰撳墠璁惧鏃犵敓浜ц鍗曪紝鏃犳硶鏌ョ湅宸ヨ壓"
+                                })
+                            }
+                            uni.navigateTo({
+                                url: "/pages/MJGL/Sc_EquipmentProcessList/Sc_EquipmentProcess?operationType=4&HEquipID=" +
+                                    this.HEquipID +
+                                    `&HICMOInterID=${this.HICMOInterID}&HICMOEntryID=${this.HICMOEntryID}`
+                            });
+                            break;
+                        case "eqpMaintenance":
+                            uni.navigateTo({
+                                url: "/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill?operationType=4&HEquipID=" +
+                                    this.HEquipID
+                            });
+                            break;
+                        case "OEEStatusReport":
+                            uni.navigateTo({
+                                url: "/pages/MJGL/Sc_OEEStatusReport/Sc_OEEStatusReport?operationType=4&HEquipID=" +
+                                    this.HEquipID
+                            });
+                            break;
+                        default:
+                            return;
+                    }
+                }
+            },
+            async getDiagram(HDeptID, HSourceID) {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Sc_HEquipStateDistribution/Get_EquipStateDistribution_FourReport",
+                        data: {
+                            sWhere: {
+                                "HDeptID": HDeptID,
+                                "HSourceID": HSourceID
+                            },
+                            user: getUserInfo()["Czymc"],
+                            OrganizationID: this.organInfo.id
+                        }
+                    })
+
+                    let res1 = res.data
+                    await this.initCharts(res1.data)
+                } catch (err) {
+                    uni.showToast({
+                        icon: "fail",
+                        title: '鎺ュ彛璇锋眰澶辫触!'
+                    })
+                }
+            }
+        },
+        async onLoad(options) {
+            let {
+                HDeptID,
+                HSourceID,
+                HEquipID,
+                HICMOInterID,
+                HICMOEntryID
+            } = options
+            this.HEquipID = HEquipID
+            this.HICMOInterID = HICMOInterID
+            this.HICMOEntryID = HICMOEntryID
+
+            await this.getDiagram(HDeptID, HSourceID)
+        },
+    }
 </script>
 
 <style lang="scss">
-	* {
-		box-sizing: border-box;
-	}
+    * {
+        box-sizing: border-box;
+    }
 
-	.container {
-		padding: 20rpx 40rpx;
-		display: flex;
-		flex-direction: column;
-		gap: 20rpx;
+    .container {
+        padding: 20rpx 40rpx;
+        display: flex;
+        flex-direction: column;
+        gap: 20rpx;
 
-		>div {
-			padding: 10rpx;
-		}
+        >div {
+            padding: 10rpx;
+        }
 
-		.operation-zone {
+        .operation-zone {
 
-			>button {
-				margin-right: 10rpx;
-				margin-top: 10rpx;
-				width: auto;
-			}
+            >button {
+                margin-right: 10rpx;
+                margin-top: 10rpx;
+                width: auto;
+            }
 
-			>button:last-child {
-				margin-right: 0;
-			}
+            >button:last-child {
+                margin-right: 0;
+            }
 
-		}
-	}
+        }
+    }
 </style>
\ No newline at end of file
diff --git a/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai.vue b/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai.vue
index 39e278f..b9c29c0 100644
--- a/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai.vue
+++ b/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai.vue
@@ -53,6 +53,10 @@
 						<uni-icons type="smallcircle-filled" size="14"
 							color=""></uni-icons><text>{{item["璁惧鐘舵��"]}}</text>
 					</view>
+                    <view class="op2" v-if="item['璁惧鐘舵��']=='鏁呴殰'">
+                    	<uni-icons type="smallcircle-filled" size="14"
+                    		color=""></uni-icons><text>{{item["璁惧鐘舵��"]}}</text>
+                    </view>
 					<view class="op1" v-if="item['璁惧鐘舵��']=='鐢熶骇'">
 						<uni-icons type="smallcircle-filled" size="14"
 							color=""></uni-icons><text>{{item["璁惧鐘舵��"]}}</text>
@@ -91,7 +95,8 @@
 				departmentsTitles: [],
 				departmentsIdArray: [],
 				devices: [],
-				selectedDepartment: ""
+				selectedDepartment: "",
+                HDeptID: 0
 			};
 		},
 		methods: {
@@ -99,7 +104,7 @@
 				let index = e.detail.value
 				this.selectedDepartment = this.departmentsTitles[index]
 				let id = this.departmentsIdArray[index]
-
+                this.HDeptID = id
 				// 鍚堝苟绋煎姩鐜囧拰OEE => Sc_HEquipStateDistribution/Sc_HEquipStateDistribution_Souce_MergeOEEReport
 				this.doRequest(
 					"/Sc_HEquipStateDistribution/Sc_HEquipStateDistribution_Souce_MergeOEEReport",
@@ -159,9 +164,11 @@
 				uni.hideLoading()
 			},
 			ToDetail(item) {
+                console.log('item: ',item);
 				uni.navigateTo({
-					url: "./detail?HDeptID=" + (item['璁惧id'] || 0) + "&HSourceID=" + (item['HSourceID'] || 0)
-				})
+					url: "./detail?HDeptID=" + (this.HDeptID || 0) + "&HSourceID=" + (item['HSourceID'] || 0) + `&HEquipID=${item['璁惧id'] || 0}`
+                    + `&HICMOInterID=${item["鐢熶骇璁㈠崟涓诲唴鐮�"] || 0}&HICMOEntryID=${item["鐢熶骇璁㈠崟瀛愬唴鐮�"] || 0}`
+                })
 			},
 			async initDepartment() {
 				this.doRequest(
@@ -192,44 +199,50 @@
 						}) // 鑷姩瑙﹀彂棣栨潯鏁版嵁鐨勬洿鏂拌鍙�
 					},
 				)
-			}
+			},
+            refreshEquipList() {
+                let departIndex = this.departmentsTitles.indexOf(this.selectedDepartment)
+                if (departIndex != -1) {
+                	let departId = this.departmentsIdArray[departIndex]
+                	// 鍚堝苟绋煎姩鐜囧拰OEE => Sc_HEquipStateDistribution/Sc_HEquipStateDistribution_Souce_MergeOEEReport
+                	this.doRequest(
+                		"/Sc_HEquipStateDistribution/Sc_HEquipStateDistribution_Souce_MergeOEEReport",
+                		// "/Sc_HEquipStateDistribution/Sc_HEquipStateDistribution_Souce", 
+                		{
+                			HDeptID: departId,
+                			user: this.userInfo.Czymc,
+                			OrganizationID: this.organInfo.id
+                		},
+                		function(res) {
+                			let res1 = res.data
+                			let {
+                				count,
+                				data
+                			} = res1
+                			if (count > 0) {
+                				console.log(data)
+                				this.devices = data["h_p_sc_HDeptSouceMOList_MergeOEEReport"].map(item => {
+                					return Object.assign(item, {
+                						imgSrc: "../../static/sb.png"
+                					})
+                				})
+                			}
+                		},
+                		function(err) {
+                			console.error(err)
+                		}
+                	)
+                }
+            }
 		},
 		async onLoad() {
 			await this.initDepartment()
 		},
+        async onShow() {
+            this.refreshEquipList()
+        },
 		onPullDownRefresh() {
-			let departIndex = this.departmentsTitles.indexOf(this.selectedDepartment)
-			if (departIndex != -1) {
-				let departId = this.departmentsIdArray[departIndex]
-				// 鍚堝苟绋煎姩鐜囧拰OEE => Sc_HEquipStateDistribution/Sc_HEquipStateDistribution_Souce_MergeOEEReport
-				this.doRequest(
-					"/Sc_HEquipStateDistribution/Sc_HEquipStateDistribution_Souce_MergeOEEReport",
-					// "/Sc_HEquipStateDistribution/Sc_HEquipStateDistribution_Souce", 
-					{
-						HDeptID: departId,
-						user: this.userInfo.Czymc,
-						OrganizationID: this.organInfo.id
-					},
-					function(res) {
-						let res1 = res.data
-						let {
-							count,
-							data
-						} = res1
-						if (count > 0) {
-							console.log(data)
-							this.devices = data["h_p_sc_HDeptSouceMOList_MergeOEEReport"].map(item => {
-								return Object.assign(item, {
-									imgSrc: "../../static/sb.png"
-								})
-							})
-						}
-					},
-					function(err) {
-						console.error(err)
-					}
-				)
-			}
+			this.refreshEquipList()
 
 			uni.stopPullDownRefresh()
 		}
diff --git a/utils/WebSocketServices.js b/utils/WebSocketServices.js
index 7115a50..c1a0526 100644
--- a/utils/WebSocketServices.js
+++ b/utils/WebSocketServices.js
@@ -11,7 +11,7 @@
         this.wsUrl = CommonUtils.httpFormatWs(); // WebSocket 鍩虹鍦板潃
 
         // 瓒呮椂鏍￠獙閰嶇疆
-        this.businessMessageInterval = 5 * 60 * 1000; 
+        this.businessMessageInterval = 5 * 60 * 1000;
         this.noMessageTimeout = this.businessMessageInterval + 2 * 60 * 1000;
         this.noMessageTimer = null; // 鏃犳秷鎭秴鏃跺畾鏃跺櫒
 
@@ -96,10 +96,22 @@
                 this.resetNoMessageTimer();
 
                 // 澶勭悊涓氬姟娑堟伅
-                if (message.Type === "Message") {
+                if (message.Type === "MessageUnRead") { // 鏈娑堟伅
+                    let payload = {
+                        pagePath: "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillList",
+                        itemId: 0
+                    }
                     const content = JSON.parse(message.Content);
-                    this.showTaskTip(`鎮ㄦ湁${content.length}鏉℃秷鎭渶瑕佸鐞�!`);
+                    this.showTaskTip(`鎮ㄦ湁${content.length}鏉℃秷鎭渶瑕佸鐞�!`, payload);
                     // this.emit("message", content); // 鏀寔澶栭儴鐩戝惉
+                } else if (message.Type === "Message") {
+                    const content = JSON.parse(message.Content)
+                    let payload = {
+                        pagePath: "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillList",
+                        itemId: 0
+                    }
+                    this.showTaskTip(content[0]["鍐呭"], payload, content[0]["涓婚"]);
+                    
                 }
             } catch (error) {
                 console.error("[WebSocket] 娑堟伅瑙ｆ瀽澶辫触", error, res.data);
@@ -213,16 +225,19 @@
     }
 
 
-    showTaskTip(Content) {
+    showTaskTip(Content, payloads, Title = "閲嶈閫氱煡") {
         // #ifdef APP-PLUS || APP
         let content = Content;
         let options = {
-            title: "閲嶈閫氱煡",
+            title: Title,
             cover: true, // 鏄惁瑕嗙洊涓婁竴娆＄殑閫氱煡
-            when: new Date() // 閫氱煡鏄剧ず鏃堕棿
+            when: new Date(), // 閫氱煡鏄剧ず鏃堕棿
+            icon: "../static/logo.png",
+            largeIcon: "../static/logo.png"
         };
         // TODO 璺宠浆鍒版寚瀹氶〉
-        let payload = JSON.stringify({});
+        let payload = JSON.stringify(payloads);
+        console.log('payload: ', payload);
 
         plus.push.createMessage(content, payload, options);
         // #endif
diff --git a/utils/getuiUtils.js b/utils/getuiUtils.js
new file mode 100644
index 0000000..c9e8e10
--- /dev/null
+++ b/utils/getuiUtils.js
@@ -0,0 +1,58 @@
+import {
+    CommonUtils
+} from "./common";
+
+class getuiInstance {
+    constructor() {
+        this.cid = ""
+    }
+
+    getClientID(Userbm, UserName) {
+        // #ifdef APP-PLUS
+        const info = plus.push.getClientInfo()
+        this.cid = info["clientid"]
+        console.log('cid: ', this.cid);
+        this.setUserClientIDRelative(Userbm, UserName, this.cid, 1)
+        // #endif
+    };
+
+    async setUserClientIDRelative(Userbm, UserName, ClientID, Online) {
+        try {
+            let res = await CommonUtils.doRequest2Async({
+                url: "/Web/SetGy_UserClientIdConnection",
+                method: "POST",
+                data: {
+                    HUserbm: Userbm,
+                    HUserName: UserName,
+                    HClientID: ClientID,
+                    HOnline: Online
+                }
+            })
+            
+
+            let {
+                data,
+                count,
+                Message
+            } = res.data
+            
+            if(count != 1) {
+                CommonUtils.showTips({
+                    title: "娓╅Θ鎻愮ず",
+                    message: Message
+                })
+            }
+        }catch(err) {
+            CommonUtils.showTips({
+                title: "娓╅Θ鎻愮ず",
+                message: err
+            })
+        }
+
+    }
+}
+
+
+
+
+export default new getuiInstance()
\ No newline at end of file

--
Gitblit v1.9.1