From 975e5fdae1f4ce0a4bd7cb1c1544a025540618aa Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 一月 2026 15:02:56 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue                 |   10 
 pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue                      |   23 
 pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue |   22 
 pages/index/tab2.vue                                                         |    4 
 pages/MJGL/shangmudan/MouldUpperBill.vue                                     |  171 
 pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList.vue         |    2 
 pages/ZLGL/mojianjianyan/ProcessCheckBill.vue                                |  160 
 pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue                     | 1553 ++--
 pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBillList.vue             |   14 
 pages/index/login.vue                                                        | 1000 +-
 pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue                   |  158 
 pages/ZLGL/shoujianjianyan/firstCheckBill.vue                                |   30 
 pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue                         |   12 
 pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList.vue               |  121 
 pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue                     |  197 
 pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue                 | 4846 +++++++++---------
 pages/baogong/OA_ErrMsgBackBill.vue                                          |    7 
 pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue            |   19 
 pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue                     |   13 
 pages.json                                                                   |   28 
 pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList.vue                 |    6 
 pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue                     |   53 
 pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList.vue                 |  111 
 pages/index/tab4.vue                                                         |    4 
 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue             |    5 
 pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue               |   12 
 pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue                         | 2582 ++++----
 pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue             |   14 
 pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList.vue           |   91 
 pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue                            | 4213 +++++++--------
 pages/index/tab3.vue                                                         |   21 
 pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList.vue                 |  121 
 pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue             |   98 
 pages/MJGL/xiamodan/MouldLowerBill.vue                                       |   14 
 34 files changed, 7,520 insertions(+), 8,215 deletions(-)

diff --git a/pages.json b/pages.json
index 26cbe31..7e912a8 100644
--- a/pages.json
+++ b/pages.json
@@ -230,13 +230,13 @@
 				"enablePullDownRefresh": true
 			}
 		},
-		// {
-		// 	"path": "pages/baogong/OA_ErrMsgBackBill",
-		// 	"style": {
-		// 		"navigationBarTitleText": "寮傚父鍙嶉鍗�",
-		// 		"enablePullDownRefresh": false
-		// 	}
-		// },
+		{
+			"path": "pages/baogong/OA_ErrMsgBackBill",
+			"style": {
+				"navigationBarTitleText": "寮傚父鍙嶉鍗�",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBillList",
 			"style": {
@@ -1248,29 +1248,29 @@
 			}
 		},
 		{
-			"path": "pages/weixiujilu/mouldRepairRecordBillList",
+			"path": "pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿缁翠慨璁板綍",
+				"navigationBarTitleText": "妯″叿缁翠慨璁板綍鍗曞垪琛�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "pages/weixiujilu/mouldRepairRecordBill",
+			"path": "pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill",
 			"style": {
 				"navigationBarTitleText": "妯″叿缁翠慨璁板綍鍗�"
 			}
 		},
 		{
-			"path": "pages/qijvguzhangdengji/mouldMistake",
+			"path": "pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill",
 			"style": {
-				"navigationBarTitleText": "妯″叿鏁呴殰鐧昏"
+				"navigationBarTitleText": "妯″叿鏁呴殰鐧昏鍗�"
 
 			}
 		},
 		{
-			"path": "pages/qijvguzhangdengji/mouldMistakeBill",
+			"path": "pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿鏁呴殰鐧昏鍗�"
+				"navigationBarTitleText": "妯″叿鏁呴殰鐧昏鍗曞垪琛�"
 			}
 		},
 		{
diff --git a/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
index b41f1a2..b62b164 100644
--- a/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
+++ b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
@@ -251,14 +251,14 @@
                     "HMainSourceInterID": 0,
                     "HMainSourceEntryID": 0,
                     "HCheckResult": "OK",
-                    "HEmpName": "",
-                    "HEmpID": 0,
+                    "HEmpName": getUserInfo().HEmpName,
+                    "HEmpID": getUserInfo().HEmpID,
                     "HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD"),
-                    "HDeptName": "",
-                    "HDeptID": 0,
+                    "HDeptName": getUserInfo().HDeptName,
+                    "HDeptID": getUserInfo().HDeptID,
                     "HMainSourceBillNo": "",
-                    "HManagerName": "",
-                    "HManagerID": 0,
+                    "HManagerName": getUserInfo().HManagerName,
+                    "HManagerID": getUserInfo().HManagerID,
                     "HMouldRepairWorkName": "",
                     "HMouldRepairWorkID": 0,
                     "HExplanation": "",
@@ -338,7 +338,7 @@
             },
             addNew() {
                 uni.redirectTo({
-                    url: './Sb_MouldRepairCheckBill?operationType=1'
+                    url: './Sc_MouldRepairCheckBill?operationType=1'
                 })
             },
             goBack() {
@@ -350,89 +350,6 @@
                     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
-                    })
                 }
             },
             //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
@@ -576,66 +493,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.鐐规椤圭洰浠g爜,
-                                "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
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_EquipConkBook/Sb_EquipConkBookBill.vue b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
index 068bc57..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: "",
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.鐐规椤圭洰浠g爜,
-                                "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.淇濆吇椤圭洰浠g爜,
-                                "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.淇濆吇椤圭洰浠g爜,
+								"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.淇濆吇椤圭洰浠g爜,
-                                "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.淇濆吇椤圭洰浠g爜,
+								"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..e731c50 100644
--- a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
+++ b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
@@ -216,14 +216,14 @@
                     "HBillNo": "",
                     "HInterID": 0,
                     "HDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
-                    "HDeptName": "",
-                    "HDeptID": 0,
-                    "HEmpName": "",
-                    "HEmpID": 0,
+                    "HDeptName": getUserInfo().HDeptName,
+                    "HDeptID": getUserInfo().HDeptID,
+                    "HEmpName": getUserInfo().HEmpName,
+                    "HEmpID": getUserInfo().HEmpID,
+                    "HManagerName": getUserInfo().HManagerName,
+                    "HManagerID": getUserInfo().HManagerID,
                     "HRepairCheckMainName": "",
                     "HRepairCheckMainID": 0,
-                    "HManagerName": "",
-                    "HManagerID": 0,
                     "HBarName": "",
                     "HEquipID": 0,
                     "HBarSpec": "",
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..bfcf397 100644
--- a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
+++ b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
@@ -242,12 +242,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 +255,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"],
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/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 = '鏈~鍐欒礋璐d汉'
-    //             }
-
                 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..0d5985b 100644
--- a/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
+++ b/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
@@ -251,7 +251,6 @@
             <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>
 
@@ -299,12 +298,12 @@
                     "HCycleUnit": "灏忔椂",
                     "MouldHName": "",
                     "MouldHModel": "",
-                    "HDeptIDName": "",
-                    "HDeptID": "0",
-                    "HManagerIDName": "",
-                    "HManagerID": "0",
-                    "HEmpIDName": "",
-                    "HEmpID": "0",
+                    "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": "",
                     "HMainSourceInterID": "0",
@@ -447,7 +446,7 @@
             },
             addNew() {
                 uni.redirectTo({
-                    url: './Sb_EquipRepairSendWorkBill?operationType=1'
+                    url: './Sc_MouldRepairSendWorkBill?operationType=1'
                 })
             },
             goBack() {
@@ -459,89 +458,6 @@
                     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
-                    })
                 }
             },
             //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
diff --git a/pages/weixiujilu/mouldRepairRecordBill.vue b/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
similarity index 98%
rename from pages/weixiujilu/mouldRepairRecordBill.vue
rename to pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
index b6e167a..456f6a2 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: {
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/mujudianjianjiludan/Sc_MouldDotCheckBill.vue b/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue
index 792f7d2..f134d8e 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,16 @@
 						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.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,8 +576,8 @@
 								"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
diff --git a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
index 984f151..90013e8 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,1173 @@
                     <view class="righton" v-show="!showHSourceBillNo">
                         <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
                     </view> -->
-                </view>
-                <view class="form-item">
-                    <view class="title">鍒跺崟浜�:</view>
-                    <view class="righton">
-                        <input name="HMaker" disabled v-model="hform.HMaker" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍗曟嵁鍙�:</view>
-                    <view class="righton">
-                        <input name="HBillNo" disabled v-model="hform.HBillNo" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍗曟嵁ID:</view>
-                    <view class="righton">
-                        <input name="HInterID" disabled v-model="hform.HInterID" />
-                    </view>
-                </view>
-            </view>
-            <view v-if="tabs==1">
-                <view class="list" v-for="(item,index) in HMouldList" :key="index">
-                     <uni-card :title="item.鍣ㄥ叿鍚嶇О" style="margin: 10px;" @tap="delMater(item, $event)">
-                                <!-- 鍣ㄥ叿浠g爜浣滀负鍙偣鍑婚摼鎺� -->
-                                <view class="card-header">
-                                    <text class="link-text">鍣ㄥ叿鍙凤細{{item.鍣ㄥ叿鍙穧}</text>
-                                </view>
-                                
-                                <view class="card-detail">
-                                    <view class="detail">
-                                        <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
-                                    </view>
-                                    <view class="detail">
-                                        <text>鍣ㄥ叿鏉$爜锛�</text>{{item.鍣ㄥ叿鏉$爜}}
-                                    </view>
-                                </view>
-                            </uni-card>
-                </view>
-                <view class="over" v-if="HMouldList.length == 0">鏆傛棤鏁版嵁</view>
-            </view>
-            <view class="bottom-btn">
-                <button class="btn-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.妯″叿浠g爜,
-                            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)">
+						<!-- 鍣ㄥ叿浠g爜浣滀负鍙偣鍑婚摼鎺� -->
+						<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().HKeeperName,
+					HKeeperID: getUserInfo().HKeeperID, //鍙戞枡浜�
+					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"]
+							}
+						} 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.妯″叿浠g爜,
+								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..cc9117d 100644
--- a/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
+++ b/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
@@ -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,
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/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue b/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
index 74c82a2..fc363b2 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,
@@ -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({
diff --git a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
index b04deaa..62630ea 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]['浜у搧浠g爜']
-					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]['浜у搧浠g爜']
+						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]['浜у搧浠g爜']
+						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]['浜у搧浠g爜']
-			            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]['浜у搧浠g爜']
+							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]['浜у搧浠g爜']
+							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 ef5dc7e..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">浜у搧浠g爜</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">浜у搧浠g爜</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>涓嶈壇鍘熷洜浠g爜锛�</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>涓嶈壇鍘熷洜浠g爜锛�</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]['浜у搧浠g爜']
-                        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]['浜у搧浠g爜']
+							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]['浜у搧浠g爜']
+							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]['浜у搧浠g爜']
-                    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]['浜у搧浠g爜']
+						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]['浜у搧浠g爜']
+						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].浜у搧浠g爜
-                    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].浜у搧浠g爜
+					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 瀹℃牳浜� !='' order by 閮ㄩ棬浠g爜`,
-                            user: getUserInfo()["Czymc"],
-                            Organization: uni.getStorageSync("Organization"),
-                        },
-                    });
+							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["浠g爜"],
-                        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["鎶芥牱鏂规浠g爜"],
-                        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["浠g爜"],
+						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["鎶芥牱鏂规浠g爜"],
+						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];
-                }
-            },
-            // 浜у搧浠g爜杩斿洖
-            async MaterComplete(e) {
-                console.log("MaterRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.hform, {
-                        HMaterNumber: data["鐗╂枡浠g爜"],
-                        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.浜у搧浠g爜,
-                        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]['涓嶈壇鍘熷洜浠g爜'],
-                    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];
+				}
+			},
+			// 浜у搧浠g爜杩斿洖
+			async MaterComplete(e) {
+				console.log("MaterRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.hform, {
+						HMaterNumber: data["鐗╂枡浠g爜"],
+						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.浜у搧浠g爜,
+						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]['涓嶈壇鍘熷洜浠g爜'],
+					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].鐗╂枡浠g爜,
-                            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].鐗╂枡浠g爜,
+							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 d38552b..c5f936a 100644
--- a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
+++ b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -733,7 +733,7 @@
 					count
 				} = res.data
 				if (count == 1) {
-					if(HSourceBillType=3772){
+					if(this.hform.HSourceBillType=="3772"){
 						this.hform.HMaterID = data[0]['HMaterID']
 						this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
 						this.hform.HMaterNumber = data[0]['浜у搧浠g爜']
@@ -757,18 +757,18 @@
 						this.hform.HSourceID = data[0].HSourceID
 						this.hform.HProcID = data[0].HProcID
 						this.hform.HProcName = data[0].褰撳墠宸ュ簭
-					}else if(HSourceBillType=7521){
+					}
+					else if(this.hform.HSourceBillType=="7521"){
 						this.hform.HMaterID = data[0]['HMaterID']
 						this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
 						this.hform.HMaterNumber = data[0]['浜у搧浠g爜']
-						this.hform.HMainSourceBillNo = data[0]['HBillNo']
-						this.hform.HSourceBillNo = data[0]['HBillNo']
+						this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�
+						this.hform.HSourceBillNo = data[0].鍗曟嵁鍙�
 						this.hform.HMainSourceInterID = data[0].HInterID
 						this.hform.HMainSourceEntryID = data[0].HEntryID
 						this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
 						this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
 						this.hform.HSourceBillQty = data[0].妫�楠屾暟閲�
-						this.hasSourceBill = true
 						this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
 						this.hform.HICMOInterID = data[0].HICMOInterID
 						this.hform.HICMOEntryID = data[0].HICMOEntryID
@@ -781,7 +781,10 @@
 						this.hform.HSourceID = data[0].HSourceID
 						this.hform.HProcID = data[0].HProcID
 						this.hform.HProcName = data[0].褰撳墠宸ュ簭
-					}else{
+						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]['浜у搧浠g爜']
@@ -864,8 +867,8 @@
 							this.hform.HMaterID = data[0]['HMaterID']
 							this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
 							this.hform.HMaterNumber = data[0]['浜у搧浠g爜']
-							this.hform.HMainSourceBillNo = data[0]['HBillNo']
-							this.hform.HSourceBillNo = data[0]['HBillNo']
+							this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�
+							this.hform.HSourceBillNo = data[0].鍗曟嵁鍙�
 							this.hform.HMainSourceInterID = data[0].HInterID
 							this.hform.HMainSourceEntryID = data[0].HEntryID
 							this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
@@ -883,6 +886,8 @@
 							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]['浜у搧鍚嶇О']
@@ -1803,7 +1808,7 @@
 							CheckProjectID: this.hform.HQCSchemeID || 0,
 							HBatchQty: this.hform.HProcExchQty || 0,
 							HMaterID: this.hform.HMaterID,
-							HBillType: '鐢熶骇鍏ュ簱妫�鏂规'
+							HBillType: '棣栦欢妫�鏂规'
 						},
 					});
 
@@ -1826,7 +1831,7 @@
 								HUnit: data[i]["鍗曚綅鍚嶇О"],
 								HQCNote: "",
 								HAnalysisMethod: data[i]["鍒嗘瀽鏂规硶"],
-								HResult: data[i]["榛樿缁撹"],
+								HResult: data[i]["HResult"],
 								HMax: "",
 								HMin: "",
 								HAvg: "",
@@ -2234,7 +2239,10 @@
 				await this.getMaxBillNo();
 				
 				if(e.HSouceBillType=="7521"){
-					this.hform.HSourceBillType="7521";
+					if (uni.getStorageSync('Organization')  == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
+						this.HSourceBillType = "鍙栨牱鍗�"; // 鏄剧ず鍚嶇О
+						this.hform.HSourceBillType = "7521"; // 瀵瑰簲鐨勫��
+					}
 					this.hform.HTakeSampleCheckBillNo=e.HBillNo;
 					this.hform.HTakeSampleCheckBillID=e.linterid;
 					//鍙栨牱鍗曟煡璇㈡暟鎹�
diff --git a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
index dd4d5fa..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">浜у搧浠g爜</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">浜у搧浠g爜</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].浜у搧浠g爜;
+					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 瀹℃牳浜� !='' order by 閮ㄩ棬浠g爜`,
-                            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 閮ㄩ棬浠g爜`,
+							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["浠g爜"],
-                        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["鎶芥牱鏂规浠g爜"],
-                        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["浠g爜"],
+						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["鎶芥牱鏂规浠g爜"],
+						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];
-                }
-            },
-            // 浜у搧浠g爜杩斿洖
-            async MaterComplete(e) {
-                console.log("MaterRet: ", e);
-                for (var key in e["retVal"]) {
-                    let data = e["retVal"][key];
-                    Object.assign(this.hform, {
-                        HMaterNumber: data["鐗╂枡浠g爜"],
-                        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.浜у搧浠g爜,
-                        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];
+				}
+			},
+			// 浜у搧浠g爜杩斿洖
+			async MaterComplete(e) {
+				console.log("MaterRet: ", e);
+				for (var key in e["retVal"]) {
+					let data = e["retVal"][key];
+					Object.assign(this.hform, {
+						HMaterNumber: data["鐗╂枡浠g爜"],
+						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.浜у搧浠g爜,
+						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].鐗╂枡浠g爜,
-                            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].鐗╂枡浠g爜,
+							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/OA_ErrMsgBackBill.vue b/pages/baogong/OA_ErrMsgBackBill.vue
index 591952e..040feab 100644
--- a/pages/baogong/OA_ErrMsgBackBill.vue
+++ b/pages/baogong/OA_ErrMsgBackBill.vue
@@ -367,7 +367,7 @@
 					HReTransmitMan: '', // 杞彂鑷�
 					HSourceName: '', // 鐢熶骇璧勬簮
 					HSourceID: '0', // 鐢熶骇璧勬簮ID
-					HCenterName: getUserInfo().HWorkCenter, // 杞﹂棿
+					HCenterName: getUserInfo().HWorkCenterName, // 杞﹂棿
 					HCenterID: getUserInfo().HWorkCenterID, // 杞﹂棿ID
 					HQty: 0, // 鏁伴噺
 					HDeleteMan: '', // 浣滃簾浜�
@@ -770,9 +770,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/index/login.vue b/pages/index/login.vue
index f6e8b25..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,525 +17,531 @@
                             </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";
-    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/",
-                    "瀹佹尝鍗庤垷鍖呰": "http://61.164.64.222:8082/API_WW/",
-                },
-                serverUrlName: uni.getStorageSync('serverUrlName') || '娴欐睙鏅轰簯杩堟��',
+	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/",
+					"瀹佹尝鍗庤垷鍖呰": "http://61.164.64.222:8082/API_WW/",
+				},
+				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)
-                    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);
-            },
+					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);
+			},
 
-            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);
-                                //瀛樺偍閮ㄩ棬 鑱屽憳 浠撳簱 绛変俊鎭�
-                                uni.setStorageSync('HDeptID', res.data.data[0].HDeptID); //閮ㄩ棬
-                                uni.setStorageSync('HDeptName', res.data.data[0].HDeptName);
-                                uni.setStorageSync('HEmpID', res.data.data[0].HEmpID); //鑱屽憳
-                                uni.setStorageSync('HEmpName', res.data.data[0].HEmpName);
-                                uni.setStorageSync('HSCWHID', res.data.data[0].HSCWHID); //璋冨叆浠撳簱
-                                uni.setStorageSync('HSCWHName', res.data.data[0].HSCWHName);
-                                uni.setStorageSync('HWhID', res.data.data[0].HWhID); //瀵瑰簲浠撳簱
-                                uni.setStorageSync('HWhName', res.data.data[0].HWhName);
-                                uni.setStorageSync('HWorkCenterID', res.data.data[0].HWorkCenterID); //宸ヤ綔涓績
-                                uni.setStorageSync('HWorkCenterName', res.data.data[0].HWorkCenterName);
-                                uni.setStorageSync('HSecManagerID', res.data.data[0].HSecManagerID); //瀵瑰簲楠屾敹
-                                uni.setStorageSync('HSecManagerName', res.data.data[0].HSecManagerName);
-                                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'
-                            })
-                        },
-                    });
+					//     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);
+								uni.setStorageSync('HEmpID', res.data.data[0].HEmpID); //鑱屽憳
+								uni.setStorageSync('HEmpName', res.data.data[0].HEmpName);
+								uni.setStorageSync('HSCWHID', res.data.data[0].HSCWHID); //璋冨叆浠撳簱
+								uni.setStorageSync('HSCWHName', res.data.data[0].HSCWHName);
+								uni.setStorageSync('HWhID', res.data.data[0].HWhID); //瀵瑰簲浠撳簱
+								uni.setStorageSync('HWhName', res.data.data[0].HWhName);
+								uni.setStorageSync('HWorkCenterID', res.data.data[0].HWorkCenterID); //宸ヤ綔涓績
+								uni.setStorageSync('HWorkCenterName', res.data.data[0].HWorkCenterName);
+								uni.setStorageSync('HSecManagerID', res.data.data[0].HSecManagerID); //瀵瑰簲楠屾敹
+								uni.setStorageSync('HSecManagerName', res.data.data[0].HSecManagerName);
+								uni.setStorageSync('HGroupID', res.data.data[0].HGroupID); //瀵瑰簲鐝粍
+								uni.setStorageSync('HGroupName', res.data.data[0].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/tab2.vue b/pages/index/tab2.vue
index 8d6e023..74b6625 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -314,7 +314,7 @@
 					{
 						"img": "../../static/icon/icon13.png",
 						"text": "妯″叿鏁呴殰鐧昏鍒楄〃",
-						"url": "/pages/qijvguzhangdengji/mouldMistake",
+						"url": "/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList",
 						"id": 37,
 						"hidden": false
 					},
@@ -329,7 +329,7 @@
 					{
 						"img": "../../static/icon/icon13.png",
 						"text": "妯″叿缁翠慨璁板綍鍒楄〃",
-						"url": "/pages/weixiujilu/mouldRepairRecordBillList",
+						"url": "/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBillList",
 						"id": 39,
 						"hidden": false
 					},
diff --git a/pages/index/tab3.vue b/pages/index/tab3.vue
index fe6f8ee..c8c279c 100644
--- a/pages/index/tab3.vue
+++ b/pages/index/tab3.vue
@@ -44,6 +44,14 @@
                 canEdit: false,
                 serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                 itemData: [{
+
+					    img: '../../static/icon/icon8.png',
+					    text: '妯″叿妗f鏌ヨ',
+					    url: `/pages/MJGL/Gy_MouldFile/Gy_MouldFileList`,
+					    id: 1,
+					    hidden: false,
+					},
+					{
                         img: '../../static/icon/icon6.png',
                         text: '妯″叿鐘舵�佸垎鏋�',
                         tip: '鏌ョ湅璇︽儏',
@@ -190,6 +198,13 @@
                     },
                     {
                         "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,
@@ -197,6 +212,11 @@
                     },
                     {
                         "img": "../../static/icon/icon8.png",
+  "url": "/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill",
+					    "id": 23,
+					    "hidden": false
+					}, 
+                    {
                         "text": "璁惧缁翠慨楠屾敹鍗�",
                         "url": "/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill",
                         "id": 23,
@@ -232,6 +252,7 @@
                     },
                     {
                         "img": "../../static/icon/icon8.png",
+
                         "text": "璁惧缁翠慨璁板綍鍗�",
                         "url": "/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill",
                         "id": 28,
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
 					},

--
Gitblit v1.9.1