From 7d2739ea5d8926e3a64ab3bcd92b52767b82b8d2 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 10 十一月 2025 13:57:26 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 pages/ZLGL/shoujianjianyan/form.vue      | 1901 +++++++--
 pages/ZLGL/shoujianjianyan/table.vue     |   17 
 pages/qijvguzhangdengji/form.vue         |  405 --
 pages/weixiujilu/form.vue                |  408 --
 pages.json                               | 2551 ++++++------
 pages/index/tab2.vue                     |   23 
 .hbuilderx/launch.json                   |    4 
 pages/zhuangxiangdan/table.vue           |  487 ++
 pages/ZLGL/xunjianjianyan/table.vue      |  572 +++
 pages/zhuangxiangdan/form.vue            | 1062 +++++
 components/ZLGL/InspectValueTemplate.vue |  484 ++
 manifest.json                            |    4 
 pages/MJGL/mujudianjianjiludan/form.vue  |   26 
 pages/ZLGL/xunjianjianyan/form.vue       | 2240 +++++++++++
 pages/MJGL/xiamodan/table.vue            |    1 
 pages/index/login.vue                    |    2 
 pages/MJGL/shangmudan/table.vue          |    1 
 pages/index/index.vue                    | 1176 +++---
 18 files changed, 8,094 insertions(+), 3,270 deletions(-)

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 4dd14cd..a7d9080 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -21,11 +21,11 @@
             "type" : "uni-app:app-ios"
         },
         {
-            "customPlaygroundType" : "device",
+            "customPlaygroundType" : "local",
             "localRepoPath" : "D:/WorkBench/ZY_APP_Dev/STUWMS/unpackage/debug",
             "openVueDevtools" : true,
             "packageName" : "com.shebeiguanli.www",
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         }
     ]
diff --git a/components/ZLGL/InspectValueTemplate.vue b/components/ZLGL/InspectValueTemplate.vue
index bbfe0f9..369eab5 100644
--- a/components/ZLGL/InspectValueTemplate.vue
+++ b/components/ZLGL/InspectValueTemplate.vue
@@ -1,6 +1,6 @@
 <template>
     <view>
-        <view class="inspect-value-content">
+        <view class="InSpect-value-content">
             <view class="form-item">
                 <view class="left">椤圭洰搴忓彿</view>
                 <view class="right disabled">
@@ -21,7 +21,7 @@
             </view>
             <view class="form-item">
                 <view class="left">妫�楠岀粨鏋�</view>
-                <view class="right disabled">
+                <view class="right" :class="CheckResultClass">
                     <input type="text" v-model="checkData.HResult2" disabled />
                 </view>
             </view>
@@ -45,7 +45,7 @@
                         {{ checkData.HStatus?"鍚堟牸":"涓嶅悎鏍�" }}
                     </view>
                     <view>
-                        <switch style="width: 2em; transform:scale(0.7);" :checked="checkData.HStatus?'checked':''"
+                        <switch style="width: 2em; transform:scale(0.7);" :checked="checkData.HStatus"
                             @change="HStatusChange" />
                     </view>
                 </view>
@@ -53,56 +53,63 @@
             <view class="form-item">
                 <view class="left">姣旇緝绗�</view>
                 <view class="right disabled">
-                    <input type="text" v-model="checkData.HResult2" disabled />
+                    <uni-combox :candidates="HCompareSymbolList" v-model="checkData.HCompareSymbol"></uni-combox>
                 </view>
             </view>
             <view class="form-item">
                 <view class="left">鍗曚綅</view>
                 <view class="right disabled">
-                    <input type="text" v-model="checkData.HTargetVal" disabled />
+                    <uni-combox :candidates="UnitNameList" v-model="checkData.HUnitName"></uni-combox>
+                    <!-- <input type="text" v-model="checkData.HTargetVal" /> -->
                 </view>
             </view>
             <view class="form-item">
                 <view class="left">妫�楠屽��</view>
-                <view class="right disabled">
-                    <input type="text" v-model="checkData.HInspectVal" disabled />
+                <view class="right">
+                    <input type="number" v-model="checkData.HInSpectVal" />
                 </view>
             </view>
             <view class="form-item">
                 <view class="left">鐩爣鍊�</view>
-                <view class="right disabled">
-                    <input type="text" v-model="checkData.HTargetVal" disabled />
+                <view class="right ">
+                    <input type="number" v-model="checkData.HTargetVal" @blur="CalculateLimitOffset(1)" />
                 </view>
             </view>
             <view class="form-item">
                 <view class="left">涓婇檺鍊�</view>
-                <view class="right disabled">
-                    <input type="text" v-model="checkData.HUpLimit" disabled />
+                <view class="right" :class="[AnalysisMethodStatus == 1?'disabled':'']">
+                    <input type="number" v-model="checkData.HUpLimit" :disabled="AnalysisMethodStatus == 1"  @blur="CalculateLimitOffset(2)" />
                 </view>
             </view>
             <view class="form-item">
                 <view class="left">涓嬮檺鍊�</view>
-                <view class="right disabled">
-                    <input type="text" v-model="checkData.HDownLimit" disabled />
+                <view class="right" :class="[AnalysisMethodStatus == 1?'disabled':'']">
+                    <input type="number" v-model="checkData.HDownLimit" :disabled="AnalysisMethodStatus == 1"  @blur="CalculateLimitOffset(3)" />
                 </view>
             </view>
             <view class="form-item">
                 <view class="left">涓婂亸宸�</view>
-                <view class="right disabled">
-                    <input type="text" v-model="checkData.HUpOffset" disabled />
+                <view class="right" :class="[
+                   (AnalysisMethodStatus == 1 || AnalysisMethodStatus == 3)?'disabled':'' 
+                ]">
+                    <input type="number" v-model="checkData.HUpOffset"
+                        :disabled="AnalysisMethodStatus == 1 || AnalysisMethodStatus == 3"  @blur="CalculateLimitOffset(4)" />
                 </view>
             </view>
             <view class="form-item">
                 <view class="left">涓嬪亸宸�</view>
-                <view class="right disabled">
-                    <input type="text" v-model="checkData.HDownOffset" disabled />
+                <view class="right" :class="[
+                   (AnalysisMethodStatus == 1 || AnalysisMethodStatus == 3)?'disabled':'' 
+                ]">
+                    <input type="number" v-model="checkData.HDownOffset"
+                        :disabled="AnalysisMethodStatus == 1 || AnalysisMethodStatus == 3"  @blur="CalculateLimitOffset(5)" />
                 </view>
             </view>
             <view style="width: 100%;border-bottom: 1px solid #e3e3e3;"></view>
-            <view class="inspect-value-list">
-                <view style="width: 100%;text-align: right;">
-                    <button type="default" size="mini" class="btn-a" @click="storeInspectValue">缂撳瓨妫�楠屽��</button>
-                </view>
+            <view class="InSpect-value-list">
+                <!-- <view style="width: 100%;text-align: right;">
+                    <button type="default" size="mini" class="btn-a" @click="storeInSpectValue">缂撳瓨妫�楠屽��</button>
+                </view> -->
                 <view class="item" style="border-top: 2px solid #e3e3e3 ;">
                     <view class="th1">搴忓彿</view>
                     <view class="th2" style="display: flex; flex-direction: row; align-items: center;">
@@ -112,19 +119,25 @@
                         妫�楠屽��({{getAnalysisMethodTitle(checkData.HAnalysisMethod)}})
                     </view>
                 </view>
-                <view class="item" v-for="(item, index) in inspectValues">
+                <view class="item" v-for="(item, index) in InSpectValues">
                     <view class="th1">{{item.HSEQ}}</view>
                     <view class="th2" style="display: flex; flex-direction: row; align-items: center;">
                         <view style="width: 3em; ">
-                            {{ item.HInspectResult?"鍚堟牸":"涓嶅悎鏍�" }}
+                            {{ item.HInSpectResult == 1?"鍚堟牸":"涓嶅悎鏍�" }}
                         </view>
                         <view>
-                            <switch style="width: 3em; transform:scale(0.7);" :checked="item.HInspectResult?'checked':''"
-                                @change="HInspectResultChange(index, $event)" />
+                            <switch style="width: 3em; transform:scale(0.7);" :checked="item.HInSpectResult == 1"
+                                @change="HInSpectResultChange(index, $event)" />
                         </view>
                     </view>
                     <view class="th3">
-                        <input type="number" v-model="item.HInspectValue" />
+                        <uni-combox v-if="checkData.HAnalysisMethod == 1" :candidates="InitInSpectValNameList"
+                            v-model="item.HInSpectValueB_Text"
+                            @update:modelValue="HInSpectValueBChange(index, $event)"></uni-combox>
+                        <input v-else-if="checkData.HAnalysisMethod == 2" type="number" v-model="item.HInSpectValue"
+                            @blur="InSpectValueChange(item,index)" @confirm="InSpectValueChange(item,index)" @focus="item.HInSpectValue = ''" />
+                        <input v-else type="number" v-model="item.HInSpectValueT"
+                            @blue="InSpectValueTChange(item, index)" @confirm="InSpectValueTChange(item, index)" @focus="item.HInSpectValueT = ''"/>
                     </view>
                 </view>
             </view>
@@ -133,17 +146,41 @@
 </template>
 
 <script>
+    import {
+        getUserInfo
+    } from '../../utils/auth';
+    import {
+        CommonUtils
+    } from '../../utils/common';
     // 妫�楠屽�兼ā鏉�
     export default {
-        name: "InspectValueTemplate",
+        name: "InSpectValueTemplate",
         data() {
             return {
+                mode: 0,
                 checkData: {
                     HResDec: 2,
                     HResult2: '',
                     HStatus: true,
+                    HCompareSymbol: "=", // 榛樿涓�=鍙�
+                    HUnitName: '',
+                    HAnalysisMethod: 0,
+                    HTargetVal: 0,
+                    HUpOffset: 0,
+                    HDownOffset: 0,
+                    HUpLimit: 0,
+                    HDownLimit: 0,
+                    HSampleUnRightQty: 0
                 },
-                inspectValues: []
+                InSpectValues: [],
+                InitInSpectValNameList: [],
+                InitInSpectValList: [],
+                UnitNameList: [],
+                UnitList: [],
+
+                CheckResultClass: 'disable',
+
+                HCompareSymbolList: ["=", ">", ">=", "<", "<=", "<>", "between"]
             };
         },
         props: {
@@ -158,34 +195,326 @@
         },
         mounted() {
             console.log('bingData: ', this.bindData);
-            let {data, list} = this.bindData
-            this.checkData = Object.assign(data, JSON.parse(JSON.stringify(this.bindData)))
+            let {
+                data,
+                list,
+                mode
+            } = this.bindData
+            Object.assign(this.checkData, data, JSON.parse(JSON.stringify(this.bindData)))
+            this.checkData.HStatus = this.checkData.HStatus ? true : false
+            this.checkData.HResult2 = this.checkData.HResult == 1 ? '鍚堟牸' : '涓嶅悎鏍�'
+            this.mode = mode
             // 鍒ゆ柇鏄惁鏈夌紦瀛樻暟鎹垨鑰呯紦瀛樻暟鎹槸鍚︿笌鏍锋湰鏁颁竴鑷�
-            if(!list || list.length != this.checkData.HSampleQty ){
+            if (!list || list.length != this.checkData.HSampleQty) {
                 for (let index = 0; index < this.checkData.HSampleQty; index++) {
-                    this.inspectValues.push({
+                    this.InSpectValues.push({
                         HSEQ: index + 1,
-                        HInspectResult: true,
-                        HInspectValue: 0,
+                        HInSpectResult: 1,
+                        HInSpectValue: 0, // 瀹氶噺妫�娴嬪��
+                        HInSpectValueB: 0, // 瀹氭�ф娴婭D
+                        HInSpectValueB_Text: '', // 瀹氭�ф娴�(鍐呭)
+                        HInSpectValueT: 0, // 鍏朵粬妫�娴嬪��
                     })
                 }
-            }else {
-                this.inspectValues = list
+            } else {
+                this.InSpectValues = list
             }
-           
+            this.InitInSpectVal()
+            this.InitUnit()
+            // 瀹炰緥鎸傝浇鍚庯紝鑾峰彇InterID 鍜� EntryID 瀵瑰簲鐨勬楠岄」鐩殑妫�楠屽��
+            this.getValueList()
+
             this.$forceUpdate()
         },
+        watch: {
+            "checkData.HResult2"(newVal, oldVal) {
+                if (newVal == '鍚堟牸') {
+                    this.CheckResultClass = 'pass-background'
+                } else if (newVal == '涓嶅悎鏍�') {
+                    this.CheckResultClass = 'unpass-background'
+                } else {
+                    this.CheckResultClass = 'disabled'
+                }
+            },
+            
+        },
+        computed: {
+            AnalysisMethodStatus: {
+                get() {
+                    console.log('this.checkData.HAnalysisMethod: ', this.checkData.HAnalysisMethod);
+                    if (this.checkData.HAnalysisMethod == 1) {
+                        return 1
+                    } else if (this.checkData.HAnalysisMethod == 2) {
+                        return 2
+                    }
+                    return 3
+                }
+            },
+            currWebUrl: {
+                get(){
+                    switch (this.mode){
+                        case 1: return {
+                            setUrl: '/QC_FirstPieceCheckBill/set_SaveValue',
+                            getUrl: '/QC_ValueTable/getValueList'
+                        }
+                        case 2: return {
+                            setUrl: '/QC_PatrolProcCheckOtherBill/set_SaveValue',
+                            getUrl: '/QC_PatrolProcCheckOtherBill/getValueList'
+                        }
+                    }
+                } 
+            }
+        },
+        beforeDestroy() {
+            // 娉ㄩ攢鍓嶏紝鎻愪氦鏁版嵁鐨勬楠屽��
+            this.set_SaveValue()
+            this.$emit("syncCheckData", this.checkData)
+        },
         methods: {
-            storeInspectValue(){
-                this.$emit("update", {
-                    data: this.checkData,
-                    list: this.inspectValues
+            CalculateLimitOffset(mode) { // 閲嶆柊璁$畻涓婇檺鍊肩殑鍋忓樊鍊�
+                switch (mode) {
+                    // 鐩爣鍊煎彉鏇�
+                    case 1:
+                        this.checkData.HUpOffset = 0
+                        this.checkData.HUpLimit = this.checkData.HTargetVal
+                        this.checkData.HDownOffset = 0
+                        this.checkData.HDownLimit = this.checkData.HTargetVal
+                        break;
+                        // 涓婇檺鍊煎彉鏇�
+                    case 2:
+                        this.checkData.HUpOffset = eval(`${this.checkData.HUpLimit}-${this.checkData.HTargetVal}`) 
+                        break;
+                        // 涓嬮檺鍊煎彉鏇�
+                    case 3:
+                        this.checkData.HDownOffset = eval(`${this.checkData.HDownLimit}-${this.checkData.HTargetVal}`)
+                        break;
+                        // 涓婂亸宸�煎彉鏇�
+                    case 4:
+                        this.checkData.HUpLimit = eval(`${this.checkData.HUpOffset}-${this.checkData.HTargetVal}`)
+                        break;
+                        // 涓嬪亸宸�煎彉鏇�
+                    case 5:
+                        this.checkData.HDownLimit = eval(`${this.checkData.HDownOffset}-${this.checkData.HTargetVal}`)
+                        break;
+                }
+            },
+            // 鍏朵粬鍒嗘瀽 妫�楠屽�煎彉鍖栨椂鍒ゆ柇
+            InSpectValueTChange(item, index) {
+                console.log('item,: ', item);
+
+                this.HInSpectResultChange(index, {
+                    detail: {
+                        value: this.checkValuePass(item.HInSpectValueT)
+                    }
                 })
             },
-            getAnalysisMethodTitle(type){
-                if(type == 1) {
+            // 瀹氶噺鍒嗘瀽 妫�楠屽�煎彉鍖栨椂鍒ゆ柇
+            InSpectValueChange(item, index) {
+                console.log('item,: ', item);
+
+                this.HInSpectResultChange(index, {
+                    detail: {
+                        value: this.checkValuePass(item.HInSpectValue)
+                    }
+                })
+            },
+            checkValuePass(val) {
+                console.log('val: ', val);
+                console.log('this.checkData.HTargetVal: ', this.checkData.HTargetVal);
+                switch (this.checkData.HCompareSymbol) {
+                    case '=':
+                        if (val == this.checkData.HTargetVal) {
+                            return true
+                        };
+                        break;
+                    case '>':
+                        if (val > this.checkData.HTargetVal) {
+                            return true
+                        };
+                        break;
+                    case '>=':
+                        if (val >= this.checkData.HTargetVal) {
+                            return true
+                        };
+                        break;
+                    case '<':
+                        if (val < this.checkData.HTargetVal) {
+                            return true
+                        };
+                        break;
+                    case '<=':
+                        if (val <= this.checkData.HTargetVal) {
+                            return true
+                        };
+                        break;
+                    case '<>':
+                        if (val != this.checkData.HTargetVal) {
+                            return true
+                        };
+                        break;
+                    case 'between':
+                        if (val >= (this.checkData.HTargetVal - this.checkData.HDownLimit || 0) &&
+                            val <= (this.checkData.HTargetVal + this.checkData.HUpLimit || 0)) {
+                            return true
+                        };
+                        break;
+                    default:
+                        CommonUtils.showTips({
+                            message: '璇烽�夋嫨姣旇緝绗�'
+                        })
+                }
+            },
+            // 鍒濆鍖� 鍗曚綅
+            async InitUnit() {
+                let res = await CommonUtils.doRequest2Async({
+                    url: '/Gy_Unit/list1',
+                    data: {
+                        sWhere: ` and 绂佺敤鏍囪 = '' and 瀹℃牳浜� != ''`,
+                        user: getUserInfo()['Czymc'],
+                        Organization: uni.getStorageSync("Organization")
+                    }
+                })
+
+                let {
+                    data,
+                    count,
+                    Message
+                } = res.data
+                if (!count) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鍒濆鍖栧崟浣嶉敊璇�: ${Message}`
+                    })
+                } else {
+                    this.UnitNameList = Array.from(data).map(e => e["璁¢噺鍗曚綅鍚嶇О"])
+                    this.UnitList = data
+                }
+            },
+            // 鍗曚綅 淇敼 鐩戝惉
+            UnitChange(e) {
+
+            },
+            async set_SaveValue() {
+                console.log("InSpect Values: ", this.InSpectValues)
+                try {
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: this.currWebUrl.setUrl,
+                        data: {
+                            msg: `${JSON.stringify(this.InSpectValues)};${this.checkData.HInterID};${this.checkData.num}`
+                        },
+                        method: "POST"
+                    })
+
+                    if (res) {
+                        return
+                    }
+                    let {
+                        Message,
+                        count
+                    } = res.data
+                    if (count != 1) {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `淇濆瓨妫�楠屽�奸敊璇�: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `淇濆瓨妫�楠屽�奸敊璇�: ${err}`
+                    })
+                }
+            },
+            async getValueList() {
+                console.log('checkData: ', this.checkData);
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: this.currWebUrl.getUrl,
+                        data: {
+                            HInterID: this.checkData.HInterID,
+                            HEntryID: this.checkData.num,
+                            user: getUserInfo()['Czymc']
+                        }
+                    })
+
+                    let {
+                        data,
+                        count
+                    } = res.data
+                    if (count == 1) {
+                        console.log('InspectValuesData: ', data);
+                        // 褰撳墠 妫�楠屽�奸〉绛句腑 淇濆瓨鐨勬暟鎹釜鏁板拰鏁版嵁搴撲腑鐨勪釜鏁板ぇ 鎴栬�呯浉绛夛紝鍙栨暟鎹簱涓殑鏁版嵁锛屽鐨勮ˉ绌�
+                        if (this.InSpectValues.length >= data.length) {
+                            let InSpectValuesNew = this.InSpectValues.slice(data.length, this.InSpectValues.length)
+                            this.InSpectValues = [...data, ...InSpectValuesNew]
+                        } else {
+                            // 鎴彇褰撳墠淇濆瓨鐨勬暟鎹�
+                            this.InSpectValues = data.slice(0, this.InSpectValues.length)
+                        }
+                        // this.InSpectValues = data
+
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        tite: '娓╅Θ鎻愮ず',
+                        message: `鑾峰彇妫�娴嬪�奸敊璇�: ${err}`
+                    })
+                }
+
+            },
+            async InitInSpectVal() { // 鍒濆鍖栧畾鎬ф娴嬪唴瀹�
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Gy_BadReason/Gy_InSpectValueList',
+                        data: {
+                            sWhere: ` and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囧織 = '鍚�' and 瀹℃牳浜� !='' `,
+                            user: getUserInfo()['Czymc']
+                        }
+                    })
+
+                    let {
+                        count,
+                        Message,
+                        data
+                    } = res.data
+
+                    if (count == 1) {
+                        this.InitInSpectValNameList = Array.from(data).map(e => e["妫�娴嬪�煎悕绉�"])
+                        this.InitInSpectValList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `妫�娴嬪�煎垵濮嬪寲閿欒: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `妫�娴嬪�煎垵濮嬪寲閿欒: ${err}`
+                    })
+                }
+            },
+            // 妫�娴嬪�间慨鏀�
+            HInSpectValueBChange(index, e) {
+                let InSpectVal = this.InitInSpectValList.find(elem => elem["妫�娴嬪�煎悕绉�"] == e)
+                if (!InSpectVal) {
+                    this.InSpectValues[index].HInSpectValueB = 0
+                    this.InSpectValues[index].HInSpectValueB_Text = ''
+                    return
+                }
+                this.InSpectValues[index].HInSpectValueB = InSpectVal["HItemID"]
+                this.InSpectValues[index].HInSpectValueB_Text = InSpectVal["妫�娴嬪�煎悕绉�"]
+            },
+            storeInSpectValue() {
+                this.$emit("update", {
+                    data: this.checkData,
+                    list: this.InSpectValues
+                })
+            },
+            getAnalysisMethodTitle(type) {
+                if (type == 1) {
                     return '瀹氭�у垎鏋�'
-                }else if(type == 2){
+                } else if (type == 2) {
                     return '瀹氶噺鍒嗘瀽'
                 }
                 return '鍏朵粬鍒嗘瀽'
@@ -193,23 +522,47 @@
             HStatusChange(e) {
                 this.checkData.HStatus = e.detail.value
             },
-            HInspectResultChange(index, e) {
-                console.log('e: ',e.detail.value);
-                this.inspectValues[index].HInspectResult = e.detail.value
-            },
+            HInSpectResultChange(index, e) {
+                console.log('e: ', e.detail.value);
+                this.InSpectValues[index].HInSpectResult = e.detail.value ? 1 : 2
+                this.CheckPassNum()
 
-        }
+            },
+            CheckPassNum() {
+                let unPassNum = this.InSpectValues.map(elem => elem.HInSpectResult).filter(elem => elem != 1).length
+
+                this.checkData.HSampleUnRightQty = unPassNum
+                let unRightQty = this.checkData.HAcceptQty
+                if (this.checkData.HStatus) { // true 涓� 妫�楠屽悎鏍硷紝 false涓烘楠� 涓嶅悎鏍�
+                    if (unPassNum > unRightQty) {
+                        this.checkData.HResult2 = '涓嶅悎鏍�'
+                        
+                    } else {
+                        this.checkData.HResult2 = '鍚堟牸'
+                    }
+                } else {
+                    if (this.InSpectValues.length - unPassNum > unRightQty) {
+                        this.checkData.HResult2 = '涓嶅悎鏍�'
+                    } else {
+                        this.checkData.HResult2 = '鍚堟牸'
+                    }
+                }
+
+            }
+
+        },
+
     }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
     input {
         height: inherit;
         width: inherit;
         font-size: 26rpx;
     }
 
-    .inspect-value-content {
+    .InSpect-value-content {
         box-sizing: border-box;
         padding: 20rpx 10rpx;
         display: flex;
@@ -244,11 +597,36 @@
                 display: flex;
                 flex-direction: row;
                 align-items: center;
+
+                .uni-combox {
+                    padding: 0;
+                    height: auto;
+
+                    .uni-input-placeholder,
+                    .uni-input-input {
+                        font-size: 26rpx;
+                    }
+                }
+
+                .uni-combox::v-deep input {
+                    height: inherit;
+                    font-size: 26rpx;
+                }
             }
 
             .disabled {
                 border: 1px solid #e4e4e4;
                 background-color: #e4e4e4;
+            }
+
+            .pass-background {
+                background-color: #CEE3F2;
+                border: none;
+            }
+
+            .unpass-background {
+                background-color: #F0D6E3;
+                border: none;
             }
 
             .none-border {
@@ -257,7 +635,9 @@
         }
     }
 
-    .inspect-value-list {
+
+
+    .InSpect-value-list {
         box-sizing: border-box;
         display: flex;
         flex-direction: column;
diff --git a/manifest.json b/manifest.json
index 46f764f..53123f8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "鏅轰簯LMES",
     "appid" : "__UNI__B002F49",
     "description" : "",
-    "versionName" : "2.0.9",
-    "versionCode" : 209,
+    "versionName" : "2.0.12",
+    "versionCode" : 212,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index 58b1c80..0406947 100644
--- a/pages.json
+++ b/pages.json
@@ -1,1228 +1,1234 @@
 {
-	"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/index/login",
-			"style": {
-				"navigationBarTitleText": "鐧诲綍",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "棣栭〉",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/index/tab1",
-			"style": {
-				"navigationBarTitleText": "杞﹂棿宸ュ簭"
-			}
-		},
-		{
-			"path": "pages/index/tab2",
-			"style": {
-				"navigationBarTitleText": "鍗曟嵁鍒楄〃"
-			}
-		},
-		{
-			"path": "pages/index/mine",
-			"style": {
-				"navigationBarTitleText": "涓汉涓績",
-				// "navigationStyle": "custom"
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#65a2fb"
-			}
-		},
-		{
-			"path": "pages/shebeilvli/form",
-			"style": {
-				"navigationBarTitleText": "璁惧鐘舵�佸垎鏋�"
-			}
-		},
-		{
-			"path": "pages/shebeilvli/table",
-			"style": {
-				"navigationBarTitleText": "璁惧灞ュ巻",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeilvli/table_son",
-			"style": {
-				"navigationBarTitleText": "璁惧灞ュ巻瀛愯〃"
-			}
-		},
-		{
-			"path": "pages/baoyangjihua/form",
-			"style": {
-				"navigationBarTitleText": "璁惧淇濆吇璁″垝鍗�"
-			}
-		},
-		{
-			"path": "pages/baoyangjihua/table",
-			"style": {
-				"navigationBarTitleText": "璁惧淇濆吇璁″垝鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/baoyangjihua/table_son",
-			"style": {
-				"navigationBarTitleText": "淇濆吇璁″垝瀛愯〃"
-			}
-		},
-		{
-			"path": "pages/baoyangjilu/form",
-			"style": {
-				"navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�"
-			}
-		},
-		{
-			"path": "pages/baoyangjilu/table",
-			"style": {
-				"navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/baoyangjilu/table_son",
-			"style": {
-				"navigationBarTitleText": "淇濆吇璁板綍瀛愯〃"
-			}
-		},
-		{
-			"path": "pages/guzhangdengji/form",
-			"style": {
-				"navigationBarTitleText": "璁惧鏁呴殰鐧昏琛�"
-			}
-		},
-		{
-			"path": "pages/guzhangdengji/table",
-			"style": {
-				"navigationBarTitleText": "璁惧鏁呴殰鐧昏琛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeidangan/form",
-			"style": {
-				"navigationBarTitleText": "璁惧妗f"
-			}
-		},
-		{
-			"path": "pages/shebeidangan/table",
-			"style": {
-				"navigationBarTitleText": "璁惧妗f",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeiweixiu/form",
-			"style": {
-				"navigationBarTitleText": "璁惧缁翠慨璁板綍鍗�"
-			}
-		},
-		{
-			"path": "pages/shebeiweixiu/table",
-			"style": {
-				"navigationBarTitleText": "璁惧缁翠慨璁板綍鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwaigxIn/form",
-			"style": {
-				"navigationBarTitleText": "濮斿宸ュ簭鍙戝嚭鍗�"
-			}
-		},
-		{
-			"path": "pages/weiwaigxIn/table",
-			"style": {
-				"navigationBarTitleText": "濮斿宸ュ簭鍙戝嚭鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwaigxOut/form",
-			"style": {
-				"navigationBarTitleText": "濮斿宸ュ簭鎺ユ敹鍗�"
-			}
-		},
-		{
-			"path": "pages/weiwaigxOut/table",
-			"style": {
-				"navigationBarTitleText": "濮斿宸ュ簭鎺ユ敹鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwaigxOut/firstCheck",
-			"style": {
-				"navigationBarTitleText": "棣栦欢妫�楠屽崟",
-				"enablePullDownRefresh": true
-			}
-		}, {
-			"path": "pages/gongxuIn/form",
-			"style": {
-				"navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�"
-			}
-		},
-		{
-			"path": "pages/gongxuIn/table",
-			"style": {
-				"navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�",
-				"enablePullDownRefresh": true
-			}
-		}, {
-			"path": "pages/gongxuOut/form",
-			"style": {
-				"navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�"
-			}
-		},
-		{
-			"path": "pages/gongxuOut/table",
-			"style": {
-				"navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/gongxuOutSendWork/table",
-			"style": {
-				"navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�(娲惧伐)",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/gongxuOut/moneystatistics",
-			"style": {
-				"navigationBarTitleText": "鎴戠殑宸ヨ祫(姹囨姤棰勪及)",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeiguanli/form",
-			"style": {
-				"navigationBarTitleText": "璁惧绠$悊",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeiguanli/table",
-			"style": {
-				"navigationBarTitleText": "璁惧绠$悊",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeiguanli/list",
-			"style": {
-				"navigationBarTitleText": "宸ュ崟鍒楄〃",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/baogong/form",
-			"style": {
-				"navigationBarTitleText": "浜ч噺姹囨姤鍗�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/baogong/table",
-			"style": {
-				"navigationBarTitleText": "鎶ュ伐骞冲彴",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/baogong/list",
-			"style": {
-				"navigationBarTitleText": "宸ュ崟鍒楄〃",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/baogong/abnormal",
-			"style": {
-				"navigationBarTitleText": "寮傚父鍙嶉鍗�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/yichang/table",
-			"style": {
-				"navigationBarTitleText": "寮傚父鍙嶉鍗曞垪琛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/yichang/form",
-			"style": {
-				"navigationBarTitleText": "寮傚父鍙嶉鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/yichang/list",
-			"style": {
-				"navigationBarTitleText": "寮傚父鍙嶉澶勭悊鍗曞垪琛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/caigouruku/table",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鍒楄〃",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/caigouruku/form",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/caigoutuiliao/table",
-			"style": {
-				"navigationBarTitleText": "閲囪喘閫�鏂欏垪琛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/caigoutuiliao/form",
-			"style": {
-				"navigationBarTitleText": "閲囪喘閫�鏂欏崟",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/xiaoshouchuku/table",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴撳垪琛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/xiaoshouchuku/form",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴撳崟",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/xiaoshoutuihuo/table",
-			"style": {
-				"navigationBarTitleText": "閿�鍞��璐у垪琛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/xiaoshoutuihuo/form",
-			"style": {
-				"navigationBarTitleText": "閿�鍞��璐у崟",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/shouliaotongzhi/table",
-			"style": {
-				"navigationBarTitleText": "鏀舵枡閫氱煡鍗�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/shouliaotongzhi/table_son",
-			"style": {
-				"navigationBarTitleText": "鏉$爜鐢熸垚",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/shengchanlingliao/table",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇棰嗘枡鏍¢獙鍒楄〃",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanlingliao/form",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇棰嗘枡鍗曟牎楠�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/shengchanruku/table",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇鍏ュ簱鏍¢獙鍒楄〃",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanruku/form",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇鍏ュ簱鍗曟牎楠�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/shengchandiaobo/table",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇璋冩嫧鏍¢獙鍒楄〃",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchandiaobo/form",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇璋冩嫧鍗曟牎楠�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/labelPrinter/index",
-			"style": {
-				"navigationBarTitleText": "鏍囩鎵撳嵃"
-			}
-		},
-		{
-			"path": "pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai",
-			"style": {
-				"navigationBarTitleText": "璁惧杩愯鐘舵��",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeiyunxingzhuangtai/detail",
-			"style": {
-				"navigationBarTitleText": "璁惧杩愯鐘舵�佽鎯�"
-			}
-		},
-		{
-			"path": "pages/mujvzhuangtai/mujvzhuangtai",
-			"style": {
-				"navigationBarTitleText": "妯″叿鐘舵�佸垎甯�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/mujvzhuangtai/detail",
-			"style": {
-				"navigationBarTitleText": "妯″叿鐘舵�佽鎯�"
-			}
-		},
-		{
-			"path": "pages/tiaomachaima/tiaomachaima",
-			"style": {
-				"navigationBarTitleText": "鏉$爜鎷嗙爜"
-			}
-		},
-		{
-			"path": "pages/tiaomachaima/tiaomachaima2",
-			"style": {
-				"navigationBarTitleText": "鏉$爜鎷嗙爜2"
-			}
-		},
-		{
-			"path": "pages/wuliaosaoma/wuliaosaoma",
-			"style": {
-				"navigationBarTitleText": "鐗╂枡娓呭崟"
-			}
-		},
-		{
-			"path": "pages/wuliaosaoma/detail",
-			"style": {
-				"navigationBarTitleText": "鏉$爜妗f"
-			}
-		},
-		{
-			"path": "pages/caigouruku/table",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/caigouruku/form",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗�"
-			}
-		},
-		{
-			"path": "pages/caigoutuiliao/table",
-			"style": {
-				"navigationBarTitleText": "閲囪喘閫�鏂�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/caigoutuiliao/form",
-			"style": {
-				"navigationBarTitleText": "閲囪喘閫�鏂欏崟"
-			}
-		},
-		{
-			"path": "pages/xiaoshouchuku/table",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/xiaoshouchuku/form",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴撳崟"
-			}
-		},
-		{
-			"path": "pages/xiaoshoutuihuo/table",
-			"style": {
-				"navigationBarTitleText": "閿�鍞��璐�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/xiaoshoutuihuo/form",
-			"style": {
-				"navigationBarTitleText": "閿�鍞��璐у崟"
-			}
-		},
-		{
-			"path": "pages/qitachuku/qitachuku",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitachuku/form",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
-			}
-		},
-		{
-			"path": "pages/qitaruku/qitaruku",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitaruku/form",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
-			}
-		},
-		{
-			"path": "pages/tiaomadaying/tiaomadaying",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鏉$爜鎵撳嵃"
-			}
-		},
-		{
-			"path": "pages/caigoudingdan/generate",
-			"style": {
-				"navigationBarTitleText": "鏉$爜鐢熸垚"
-			}
-		},
-		{
-			"path": "pages/caigoudingdan/caigoudingdan",
-			"style": {
-				"navigationBarTitleText": "閲囪喘璁㈠崟"
-			}
-		},
-		{
-			"path": "pages/MJGL/shangmudan/table",
-			"style": {
-				"navigationBarTitleText": "涓婃ā鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/shangmudan/form",
-			"style": {
-				"navigationBarTitleText": "涓婃ā鍗�"
-			}
-		},
-		{
-			"path": "pages/MJGL/xiamodan/table",
-			"style": {
-				"navigationBarTitleText": "涓嬫ā鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/xiamodan/form",
-			"style": {
-				"navigationBarTitleText": "涓嬫ā鍗�"
-			}
-		},
-		{
-			"path": "pages/MJGL/mujudianjianjiludan/table",
-			"style": {
-				"navigationBarTitleText": "妯″叿鐐规璁板綍鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitachukujiaoyan/qitachukujiaoyan",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱鏍¢獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/mujudianjianjiludan/form",
-			"style": {
-				"navigationBarTitleText": "妯″叿鐐规璁板綍鍗�"
-			}
-		},
-		{
-			"path": "pages/MJGL/mujudianjianjiludan/table_son",
-			"style": {
-				"navigationBarTitleText": "妯″叿淇濆吇璁板綍瀛愯〃"
-			}
-		},
-		{
-			"path": "pages/MJGL/mujubaoyangjiludan/table",
-			"style": {
-				"navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗�",
-				"enablePullDownRefresh": true
-			}
-		}, {
-			"path": "pages/shengchanbuliaojiaoyan/form",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇琛ユ枡鍗曟牎楠�"
-			}
-		}, {
-			"path": "pages/MJGL/mujubaoyangjiludan/form",
-			"style": {
-				"navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗�"
-			}
-		}, {
-			"path": "pages/MJGL/mujubaoyangjiludan/table_son",
-			"style": {
-				"navigationBarTitleText": "妯″叿淇濆吇璁板綍瀛愯〃"
-			}
-		}, {
-			"path": "pages/qitachukujiaoyan/qitachukujiaoyan",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱鏍¢獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitachukujiaoyan/detail",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/shengchanbuliaojiaoyan/CacheList",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇琛ユ枡鏍¢獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanbuliaojiaoyan/form",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇琛ユ枡鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/xiaoshouchukujiaoyan/table",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴撴牎楠�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/xiaoshouchukujiaoyan/form",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴撳崟鏍¢獙"
-			}
-		},
-		{
-			"path": "pages/weiwailingliaojiaoyan/table",
-			"style": {
-				"navigationBarTitleText": "濮斿棰嗘枡鏍¢獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwailingliaojiaoyan/form",
-			"style": {
-				"navigationBarTitleText": "濮斿棰嗘枡鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/caigourukujiaoyan/table",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鏍¢獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/caigourukujiaoyan/form",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗曟牎楠�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/qitarukujiaoyan/table",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱鏍¢獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitarukujiaoyan/form",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/weiwaibuliaojiaoyan/table",
-			"style": {
-				"navigationBarTitleText": "濮斿琛ユ枡鏍¢獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwaibuliaojiaoyan/form",
-			"style": {
-				"navigationBarTitleText": "濮斿琛ユ枡鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/shengchanlingliaoshengdan/table",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇棰嗘枡",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanlingliaoshengdan/form",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇棰嗘枡鍗�"
-			}
-		},
-		{
-			"path": "pages/weiwailingliao/table",
-			"style": {
-				"navigationBarTitleText": "濮斿棰嗘枡",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwailingliao/form",
-			"style": {
-				"navigationBarTitleText": "濮斿棰嗘枡鍗�"
-			}
-		},
-		{
-			"path": "pages/shengchanrukushengdan/table",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanrukushengdan/form",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇鍏ュ簱鍗�"
-			}
-		},
-		{
-			"path": "pages/xiaoshouchukujiaoyan/form",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴撳崟鏍¢獙"
-			}
-		},
-		{
-			"path": "pages/weiwailingliaojiaoyan/table",
-			"style": {
-				"navigationBarTitleText": "濮斿棰嗘枡鏍¢獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwailingliaojiaoyan/form",
-			"style": {
-				"navigationBarTitleText": "濮斿棰嗘枡鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/caigourukujiaoyan/table",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鏍¢獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/caigourukujiaoyan/form",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗曟牎楠�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/qitarukujiaoyan/table",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱鏍¢獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitarukujiaoyan/form",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/weiwaibuliaojiaoyan/table",
-			"style": {
-				"navigationBarTitleText": "濮斿琛ユ枡鏍¢獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwaibuliaojiaoyan/form",
-			"style": {
-				"navigationBarTitleText": "濮斿琛ユ枡鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/shengchanlingliaoshengdan/table",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇棰嗘枡",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanlingliaoshengdan/form",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇棰嗘枡鍗�"
-			}
-		},
-		{
-			"path": "pages/weiwailingliao/table",
-			"style": {
-				"navigationBarTitleText": "濮斿棰嗘枡",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwailingliao/form",
-			"style": {
-				"navigationBarTitleText": "濮斿棰嗘枡鍗�"
-			}
-		},
-		{
-			"path": "pages/shengchanrukushengdan/table",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanrukushengdan/form",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇鍏ュ簱鍗�"
-			}
-		},
-		{
-			"path": "pages/shengchanbuliao/table",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇琛ユ枡",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanbuliao/form",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇琛ユ枡鍗�"
-			}
-		},
-		{
-			"path": "pages/qitaruku_v2/table",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		}, {
-			"path": "pages/qitaruku_v2/form",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
-			}
-		},
-		{
-			"path": "pages/qitachuku_v2/table",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitachuku_v2/form",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
-			}
-		},
-		{
-			"path": "pages/shengchanbuliao/table",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇琛ユ枡",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanbuliao/form",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇琛ユ枡鍗�"
-			}
-		},
-		{
-			"path": "pages/qitaruku_v2/table",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitaruku_v2/form",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
-			}
-		},
-		{
-			"path": "pages/qitachuku_v2/table",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitachuku_v2/form",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
-			}
-		},
-		{
-			"path": "pages/tiaomaguanli/table",
-			"style": {
-				"navigationBarTitleText": "鏉$爜绠$悊"
-			}
-		}, {
-			"path": "pages/weiwairuku/table",
-			"style": {
-				"navigationBarTitleText": "濮斿鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwairuku/form",
-			"style": {
-				"navigationBarTitleText": "濮斿鍏ュ簱鍗�"
-			}
-		},
-		{
-			"path": "pages/zhijiediaobo/table",
-			"style": {
-				"navigationBarTitleText": "鐩存帴璋冩嫧",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/zhijiediaobo/form",
-			"style": {
-				"navigationBarTitleText": "鐩存帴璋冩嫧鍗�"
-			}
-		},
-		{
-			"path": "pages/xiugaimima/index",
-			"style": {
-				"navigationBarTitleText": "淇敼瀵嗙爜"
-			}
-		},
-		{
-			"path": "pages/tiaomaguanli/table",
-			"style": {
-				"navigationBarTitleText": "鏉$爜绠$悊"
-			}
-		}, {
-			"path": "pages/weiwairuku/table",
-			"style": {
-				"navigationBarTitleText": "濮斿鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/quyangdan/table",
-			"style": {
-				"navigationBarTitleText": "鍙栨牱鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/quyangdan/form",
-			"style": {
-				"navigationBarTitleText": "鍙栨牱鍗�"
-			}
-		},
-		{
-			"path": "pages/huanyangdan/table",
-			"style": {
-				"navigationBarTitleText": "杩樻牱鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/huanyangdan/form",
-			"style": {
-				"navigationBarTitleText": "杩樻牱鍗�"
-			}
-		},
-		{
-			"path": "pages/InnerHtmlPage/index",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/white/white",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/zutuosaoma/form",
-			"style": {
-				"navigationBarTitleText": "缁勬墭鎵爜"
-			}
-		},
-		{
-			"path": "pages/zutuosaoma/table",
-			"style": {
-				"navigationBarTitleText": "缁勬墭鎵爜缂撳瓨"
-			}
-		},
-		{
-			"path": "pages/chaituosaoma/form",
-			"style": {
-				"navigationBarTitleText": "鎷嗘墭鎵爜"
-			}
-		},
-		{
-			"path": "pages/shengchantuiliao/table",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇閫�鏂�"
-			}
-		},
-		{
-			"path": "pages/shengchantuiliao/form",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇閫�鏂欏崟"
-			}
-		},
-		{
-			"path": "pages/ZLGL/shoujianjianyan/table",
-			"style": {
-				"navigationBarTitleText": "棣栦欢妫�楠屽崟缁存姢"
-			}
-		},
-		{
-			"path": "pages/ZLGL/shoujianjianyan/form",
-			"style": {
-				"navigationBarTitleText": "棣栦欢妫�楠屽崟"
-			}
-		},
-		{
-			"path": "pages/shoujishouming/table",
-			"style": {
-				"navigationBarTitleText": "鎵嬫満瀵垮懡鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shoujishouming/form",
-			"style": {
-				"navigationBarTitleText": "鎵嬫満瀵垮懡鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/mujulingliaochukudan/form",
-			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/mujulingliaochukudan/table",
-			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/mujulingliaotuikudan/table",
-			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/qijudiaobodan/table",
-			"style": {
-				"navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/qijudiaobodan/form",
-			"style": {
-				"navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/fenbushidiaorudan/form_test",
-			"style": {
-				"navigationBarTitleText": "鍒嗗竷璋冨叆鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/fenbushidiaorudan/table",
-			"style": {
-				"navigationBarTitleText": "鍒嗗竷璋冨叆鍗曠紦瀛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/fenbushidiaochudan/form_out",
-			"style": {
-				"navigationBarTitleText": "鍒嗗竷璋冨嚭鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/ZLGL/shoujianjianyan/table",
-			"style": {
-				"navigationBarTitleText": "棣栦欢妫�楠屽崟缁存姢"
-			}
-		},
-		{
-			"path": "pages/ZLGL/shoujianjianyan/form",
-			"style": {
-				"navigationBarTitleText": "棣栦欢妫�楠屽崟"
-			}
-		},
-		{
-			"path": "pages/shoujishouming/table",
-			"style": {
-				"navigationBarTitleText": "妯″叿瀵垮懡璋冩暣鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shoujishouming/form",
-			"style": {
-				"navigationBarTitleText": "妯″叿瀵垮懡璋冩暣鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/mujulingliaochukudan/form",
-			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/mujulingliaochukudan/table",
-			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/mujulingliaotuikudan/table",
-			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/qijudiaobodan/table",
-			"style": {
-				"navigationBarTitleText": "妯″叿璋冩嫧鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/MJGL/qijudiaobodan/form",
-			"style": {
-				"navigationBarTitleText": "妯″叿璋冩嫧鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/fenbushidiaorudan/form_test",
-			"style": {
-				"navigationBarTitleText": "鍒嗗竷璋冨叆鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/fenbushidiaorudan/table",
-			"style": {
-				"navigationBarTitleText": "鍒嗗竷璋冨叆鍗曠紦瀛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/fenbushidiaochudan/form_out",
-			"style": {
-				"navigationBarTitleText": "鍒嗗竷璋冨嚭鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weixiujilu/table",
-			"style": {
-				"navigationBarTitleText": "妯″叿缁翠慨璁板綍",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weixiujilu/form",
-			"style": {
-				"navigationBarTitleText": "妯″叿缁翠慨璁板綍鍗�"
-			}
-		},
-		{
-			"path": "pages/qijvguzhangdengji/table",
-			"style": {
-				"navigationBarTitleText": "妯″叿鏁呴殰鐧昏"
+    "pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
+        {
+            "path": "pages/index/login",
+            "style": {
+                "navigationBarTitleText": "鐧诲綍",
+                "navigationStyle": "custom"
+            }
+        },
+        {
+            "path": "pages/index/index",
+            "style": {
+                "navigationBarTitleText": "棣栭〉",
+                "navigationStyle": "custom"
+            }
+        },
+        {
+            "path": "pages/index/tab1",
+            "style": {
+                "navigationBarTitleText": "杞﹂棿宸ュ簭"
+            }
+        },
+        {
+            "path": "pages/index/tab2",
+            "style": {
+                "navigationBarTitleText": "鍗曟嵁鍒楄〃"
+            }
+        },
+        {
+            "path": "pages/index/mine",
+            "style": {
+                "navigationBarTitleText": "涓汉涓績",
+                // "navigationStyle": "custom"
+                "navigationBarTextStyle": "white",
+                "navigationBarBackgroundColor": "#65a2fb"
+            }
+        },
+        {
+            "path": "pages/shebeilvli/form",
+            "style": {
+                "navigationBarTitleText": "璁惧鐘舵�佸垎鏋�"
+            }
+        },
+        {
+            "path": "pages/shebeilvli/table",
+            "style": {
+                "navigationBarTitleText": "璁惧灞ュ巻",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeilvli/table_son",
+            "style": {
+                "navigationBarTitleText": "璁惧灞ュ巻瀛愯〃"
+            }
+        },
+        {
+            "path": "pages/baoyangjihua/form",
+            "style": {
+                "navigationBarTitleText": "璁惧淇濆吇璁″垝鍗�"
+            }
+        },
+        {
+            "path": "pages/baoyangjihua/table",
+            "style": {
+                "navigationBarTitleText": "璁惧淇濆吇璁″垝鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/baoyangjihua/table_son",
+            "style": {
+                "navigationBarTitleText": "淇濆吇璁″垝瀛愯〃"
+            }
+        },
+        {
+            "path": "pages/baoyangjilu/form",
+            "style": {
+                "navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�"
+            }
+        },
+        {
+            "path": "pages/baoyangjilu/table",
+            "style": {
+                "navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/baoyangjilu/table_son",
+            "style": {
+                "navigationBarTitleText": "淇濆吇璁板綍瀛愯〃"
+            }
+        },
+        {
+            "path": "pages/guzhangdengji/form",
+            "style": {
+                "navigationBarTitleText": "璁惧鏁呴殰鐧昏琛�"
+            }
+        },
+        {
+            "path": "pages/guzhangdengji/table",
+            "style": {
+                "navigationBarTitleText": "璁惧鏁呴殰鐧昏琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeidangan/form",
+            "style": {
+                "navigationBarTitleText": "璁惧妗f"
+            }
+        },
+        {
+            "path": "pages/shebeidangan/table",
+            "style": {
+                "navigationBarTitleText": "璁惧妗f",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeiweixiu/form",
+            "style": {
+                "navigationBarTitleText": "璁惧缁翠慨璁板綍鍗�"
+            }
+        },
+        {
+            "path": "pages/shebeiweixiu/table",
+            "style": {
+                "navigationBarTitleText": "璁惧缁翠慨璁板綍鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwaigxIn/form",
+            "style": {
+                "navigationBarTitleText": "濮斿宸ュ簭鍙戝嚭鍗�"
+            }
+        },
+        {
+            "path": "pages/weiwaigxIn/table",
+            "style": {
+                "navigationBarTitleText": "濮斿宸ュ簭鍙戝嚭鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwaigxOut/form",
+            "style": {
+                "navigationBarTitleText": "濮斿宸ュ簭鎺ユ敹鍗�"
+            }
+        },
+        {
+            "path": "pages/weiwaigxOut/table",
+            "style": {
+                "navigationBarTitleText": "濮斿宸ュ簭鎺ユ敹鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwaigxOut/firstCheck",
+            "style": {
+                "navigationBarTitleText": "棣栦欢妫�楠屽崟",
+                "enablePullDownRefresh": true
+            }
+        }, {
+            "path": "pages/gongxuIn/form",
+            "style": {
+                "navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�"
+            }
+        },
+        {
+            "path": "pages/gongxuIn/table",
+            "style": {
+                "navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�",
+                "enablePullDownRefresh": true
+            }
+        }, {
+            "path": "pages/gongxuOut/form",
+            "style": {
+                "navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�"
+            }
+        },
+        {
+            "path": "pages/gongxuOut/table",
+            "style": {
+                "navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/gongxuOutSendWork/table",
+            "style": {
+                "navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�(娲惧伐)",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/gongxuOut/moneystatistics",
+            "style": {
+                "navigationBarTitleText": "鎴戠殑宸ヨ祫(姹囨姤棰勪及)",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeiguanli/form",
+            "style": {
+                "navigationBarTitleText": "璁惧绠$悊",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeiguanli/table",
+            "style": {
+                "navigationBarTitleText": "璁惧绠$悊",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeiguanli/list",
+            "style": {
+                "navigationBarTitleText": "宸ュ崟鍒楄〃",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/baogong/form",
+            "style": {
+                "navigationBarTitleText": "浜ч噺姹囨姤鍗�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/baogong/table",
+            "style": {
+                "navigationBarTitleText": "鎶ュ伐骞冲彴",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/baogong/list",
+            "style": {
+                "navigationBarTitleText": "宸ュ崟鍒楄〃",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/baogong/abnormal",
+            "style": {
+                "navigationBarTitleText": "寮傚父鍙嶉鍗�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/yichang/table",
+            "style": {
+                "navigationBarTitleText": "寮傚父鍙嶉鍗曞垪琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/yichang/form",
+            "style": {
+                "navigationBarTitleText": "寮傚父鍙嶉鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/yichang/list",
+            "style": {
+                "navigationBarTitleText": "寮傚父鍙嶉澶勭悊鍗曞垪琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/caigouruku/table",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱鍒楄〃",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/caigouruku/form",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱鍗�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/caigoutuiliao/table",
+            "style": {
+                "navigationBarTitleText": "閲囪喘閫�鏂欏垪琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/caigoutuiliao/form",
+            "style": {
+                "navigationBarTitleText": "閲囪喘閫�鏂欏崟",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/xiaoshouchuku/table",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴撳垪琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/xiaoshouchuku/form",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴撳崟",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/xiaoshoutuihuo/table",
+            "style": {
+                "navigationBarTitleText": "閿�鍞��璐у垪琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/xiaoshoutuihuo/form",
+            "style": {
+                "navigationBarTitleText": "閿�鍞��璐у崟",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/shouliaotongzhi/table",
+            "style": {
+                "navigationBarTitleText": "鏀舵枡閫氱煡鍗�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/shouliaotongzhi/table_son",
+            "style": {
+                "navigationBarTitleText": "鏉$爜鐢熸垚",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/shengchanlingliao/table",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇棰嗘枡鏍¢獙鍒楄〃",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanlingliao/form",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇棰嗘枡鍗曟牎楠�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/shengchanruku/table",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇鍏ュ簱鏍¢獙鍒楄〃",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanruku/form",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇鍏ュ簱鍗曟牎楠�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/shengchandiaobo/table",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇璋冩嫧鏍¢獙鍒楄〃",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchandiaobo/form",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇璋冩嫧鍗曟牎楠�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/labelPrinter/index",
+            "style": {
+                "navigationBarTitleText": "鏍囩鎵撳嵃"
+            }
+        },
+        {
+            "path": "pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai",
+            "style": {
+                "navigationBarTitleText": "璁惧杩愯鐘舵��",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeiyunxingzhuangtai/detail",
+            "style": {
+                "navigationBarTitleText": "璁惧杩愯鐘舵�佽鎯�"
+            }
+        },
+        {
+            "path": "pages/mujvzhuangtai/mujvzhuangtai",
+            "style": {
+                "navigationBarTitleText": "妯″叿鐘舵�佸垎甯�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/mujvzhuangtai/detail",
+            "style": {
+                "navigationBarTitleText": "妯″叿鐘舵�佽鎯�"
+            }
+        },
+        {
+            "path": "pages/tiaomachaima/tiaomachaima",
+            "style": {
+                "navigationBarTitleText": "鏉$爜鎷嗙爜"
+            }
+        },
+        {
+            "path": "pages/tiaomachaima/tiaomachaima2",
+            "style": {
+                "navigationBarTitleText": "鏉$爜鎷嗙爜2"
+            }
+        },
+        {
+            "path": "pages/wuliaosaoma/wuliaosaoma",
+            "style": {
+                "navigationBarTitleText": "鐗╂枡娓呭崟"
+            }
+        },
+        {
+            "path": "pages/wuliaosaoma/detail",
+            "style": {
+                "navigationBarTitleText": "鏉$爜妗f"
+            }
+        },
+        {
+            "path": "pages/caigouruku/table",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/caigouruku/form",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱鍗�"
+            }
+        },
+        {
+            "path": "pages/caigoutuiliao/table",
+            "style": {
+                "navigationBarTitleText": "閲囪喘閫�鏂�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/caigoutuiliao/form",
+            "style": {
+                "navigationBarTitleText": "閲囪喘閫�鏂欏崟"
+            }
+        },
+        {
+            "path": "pages/xiaoshouchuku/table",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/xiaoshouchuku/form",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴撳崟"
+            }
+        },
+        {
+            "path": "pages/xiaoshoutuihuo/table",
+            "style": {
+                "navigationBarTitleText": "閿�鍞��璐�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/xiaoshoutuihuo/form",
+            "style": {
+                "navigationBarTitleText": "閿�鍞��璐у崟"
+            }
+        },
+        {
+            "path": "pages/qitachuku/qitachuku",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitachuku/form",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
+            }
+        },
+        {
+            "path": "pages/qitaruku/qitaruku",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitaruku/form",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
+            }
+        },
+        {
+            "path": "pages/tiaomadaying/tiaomadaying",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鏉$爜鎵撳嵃"
+            }
+        },
+        {
+            "path": "pages/caigoudingdan/generate",
+            "style": {
+                "navigationBarTitleText": "鏉$爜鐢熸垚"
+            }
+        },
+        {
+            "path": "pages/caigoudingdan/caigoudingdan",
+            "style": {
+                "navigationBarTitleText": "閲囪喘璁㈠崟"
+            }
+        },
+        {
+            "path": "pages/MJGL/shangmudan/table",
+            "style": {
+                "navigationBarTitleText": "涓婃ā鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/shangmudan/form",
+            "style": {
+                "navigationBarTitleText": "涓婃ā鍗�"
+            }
+        },
+        {
+            "path": "pages/MJGL/xiamodan/table",
+            "style": {
+                "navigationBarTitleText": "涓嬫ā鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/xiamodan/form",
+            "style": {
+                "navigationBarTitleText": "涓嬫ā鍗�"
+            }
+        },
+        {
+            "path": "pages/MJGL/mujudianjianjiludan/table",
+            "style": {
+                "navigationBarTitleText": "妯″叿鐐规璁板綍鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitachukujiaoyan/qitachukujiaoyan",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱鏍¢獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/mujudianjianjiludan/form",
+            "style": {
+                "navigationBarTitleText": "妯″叿鐐规璁板綍鍗�"
+            }
+        },
+        {
+            "path": "pages/MJGL/mujudianjianjiludan/table_son",
+            "style": {
+                "navigationBarTitleText": "妯″叿淇濆吇璁板綍瀛愯〃"
+            }
+        },
+        {
+            "path": "pages/MJGL/mujubaoyangjiludan/table",
+            "style": {
+                "navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗�",
+                "enablePullDownRefresh": true
+            }
+        }, {
+            "path": "pages/shengchanbuliaojiaoyan/form",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇琛ユ枡鍗曟牎楠�"
+            }
+        }, {
+            "path": "pages/MJGL/mujubaoyangjiludan/form",
+            "style": {
+                "navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗�"
+            }
+        }, {
+            "path": "pages/MJGL/mujubaoyangjiludan/table_son",
+            "style": {
+                "navigationBarTitleText": "妯″叿淇濆吇璁板綍瀛愯〃"
+            }
+        }, {
+            "path": "pages/qitachukujiaoyan/qitachukujiaoyan",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱鏍¢獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitachukujiaoyan/detail",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/shengchanbuliaojiaoyan/CacheList",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇琛ユ枡鏍¢獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanbuliaojiaoyan/form",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇琛ユ枡鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/xiaoshouchukujiaoyan/table",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴撴牎楠�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/xiaoshouchukujiaoyan/form",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴撳崟鏍¢獙"
+            }
+        },
+        {
+            "path": "pages/weiwailingliaojiaoyan/table",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡鏍¢獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwailingliaojiaoyan/form",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/caigourukujiaoyan/table",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱鏍¢獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/caigourukujiaoyan/form",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱鍗曟牎楠�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/qitarukujiaoyan/table",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱鏍¢獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitarukujiaoyan/form",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/weiwaibuliaojiaoyan/table",
+            "style": {
+                "navigationBarTitleText": "濮斿琛ユ枡鏍¢獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwaibuliaojiaoyan/form",
+            "style": {
+                "navigationBarTitleText": "濮斿琛ユ枡鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/shengchanlingliaoshengdan/table",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇棰嗘枡",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanlingliaoshengdan/form",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇棰嗘枡鍗�"
+            }
+        },
+        {
+            "path": "pages/weiwailingliao/table",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwailingliao/form",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡鍗�"
+            }
+        },
+        {
+            "path": "pages/shengchanrukushengdan/table",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanrukushengdan/form",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇鍏ュ簱鍗�"
+            }
+        },
+        {
+            "path": "pages/xiaoshouchukujiaoyan/form",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴撳崟鏍¢獙"
+            }
+        },
+        {
+            "path": "pages/weiwailingliaojiaoyan/table",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡鏍¢獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwailingliaojiaoyan/form",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/caigourukujiaoyan/table",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱鏍¢獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/caigourukujiaoyan/form",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱鍗曟牎楠�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/qitarukujiaoyan/table",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱鏍¢獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitarukujiaoyan/form",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/weiwaibuliaojiaoyan/table",
+            "style": {
+                "navigationBarTitleText": "濮斿琛ユ枡鏍¢獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwaibuliaojiaoyan/form",
+            "style": {
+                "navigationBarTitleText": "濮斿琛ユ枡鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/shengchanlingliaoshengdan/table",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇棰嗘枡",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanlingliaoshengdan/form",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇棰嗘枡鍗�"
+            }
+        },
+        {
+            "path": "pages/weiwailingliao/table",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwailingliao/form",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡鍗�"
+            }
+        },
+        {
+            "path": "pages/shengchanrukushengdan/table",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanrukushengdan/form",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇鍏ュ簱鍗�"
+            }
+        },
+        {
+            "path": "pages/shengchanbuliao/table",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇琛ユ枡",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanbuliao/form",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇琛ユ枡鍗�"
+            }
+        },
+        {
+            "path": "pages/qitaruku_v2/table",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        }, {
+            "path": "pages/qitaruku_v2/form",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
+            }
+        },
+        {
+            "path": "pages/qitachuku_v2/table",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitachuku_v2/form",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
+            }
+        },
+        {
+            "path": "pages/shengchanbuliao/table",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇琛ユ枡",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanbuliao/form",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇琛ユ枡鍗�"
+            }
+        },
+        {
+            "path": "pages/qitaruku_v2/table",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitaruku_v2/form",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
+            }
+        },
+        {
+            "path": "pages/qitachuku_v2/table",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitachuku_v2/form",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
+            }
+        },
+        {
+            "path": "pages/tiaomaguanli/table",
+            "style": {
+                "navigationBarTitleText": "鏉$爜绠$悊"
+            }
+        }, {
+            "path": "pages/weiwairuku/table",
+            "style": {
+                "navigationBarTitleText": "濮斿鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwairuku/form",
+            "style": {
+                "navigationBarTitleText": "濮斿鍏ュ簱鍗�"
+            }
+        },
+        {
+            "path": "pages/zhijiediaobo/table",
+            "style": {
+                "navigationBarTitleText": "鐩存帴璋冩嫧",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/zhijiediaobo/form",
+            "style": {
+                "navigationBarTitleText": "鐩存帴璋冩嫧鍗�"
+            }
+        },
+        {
+            "path": "pages/xiugaimima/index",
+            "style": {
+                "navigationBarTitleText": "淇敼瀵嗙爜"
+            }
+        },
+        {
+            "path": "pages/tiaomaguanli/table",
+            "style": {
+                "navigationBarTitleText": "鏉$爜绠$悊"
+            }
+        }, {
+            "path": "pages/weiwairuku/table",
+            "style": {
+                "navigationBarTitleText": "濮斿鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/quyangdan/table",
+            "style": {
+                "navigationBarTitleText": "鍙栨牱鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/quyangdan/form",
+            "style": {
+                "navigationBarTitleText": "鍙栨牱鍗�"
+            }
+        },
+        {
+            "path": "pages/huanyangdan/table",
+            "style": {
+                "navigationBarTitleText": "杩樻牱鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/huanyangdan/form",
+            "style": {
+                "navigationBarTitleText": "杩樻牱鍗�"
+            }
+        },
+        {
+            "path": "pages/InnerHtmlPage/index",
+            "style": {
+                "navigationBarTitleText": ""
+            }
+        },
+        {
+            "path": "pages/white/white",
+            "style": {
+                "navigationBarTitleText": ""
+            }
+        },
+        {
+            "path": "pages/zutuosaoma/form",
+            "style": {
+                "navigationBarTitleText": "缁勬墭鎵爜"
+            }
+        },
+        {
+            "path": "pages/zutuosaoma/table",
+            "style": {
+                "navigationBarTitleText": "缁勬墭鎵爜缂撳瓨"
+            }
+        },
+        {
+            "path": "pages/chaituosaoma/form",
+            "style": {
+                "navigationBarTitleText": "鎷嗘墭鎵爜"
+            }
+        },
+        {
+            "path": "pages/shengchantuiliao/table",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇閫�鏂�"
+            }
+        },
+        {
+            "path": "pages/shengchantuiliao/form",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇閫�鏂欏崟"
+            }
+        },
+        {
+            "path": "pages/ZLGL/shoujianjianyan/table",
+            "style": {
+                "navigationBarTitleText": "棣栦欢妫�楠屽崟缁存姢"
+            }
+        },
+        {
+            "path": "pages/ZLGL/shoujianjianyan/form",
+            "style": {
+                "navigationBarTitleText": "棣栦欢妫�楠屽崟"
+            }
+        },
+        {
+            "path": "pages/shoujishouming/table",
+            "style": {
+                "navigationBarTitleText": "鎵嬫満瀵垮懡鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shoujishouming/form",
+            "style": {
+                "navigationBarTitleText": "鎵嬫満瀵垮懡鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/mujulingliaochukudan/form",
+            "style": {
+                "navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/mujulingliaochukudan/table",
+            "style": {
+                "navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/mujulingliaotuikudan/table",
+            "style": {
+                "navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/qijudiaobodan/table",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/qijudiaobodan/form",
+            "style": {
+                "navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/fenbushidiaorudan/form_test",
+            "style": {
+                "navigationBarTitleText": "鍒嗗竷璋冨叆鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/fenbushidiaorudan/table",
+            "style": {
+                "navigationBarTitleText": "鍒嗗竷璋冨叆鍗曠紦瀛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/fenbushidiaochudan/form_out",
+            "style": {
+                "navigationBarTitleText": "鍒嗗竷璋冨嚭鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/ZLGL/shoujianjianyan/table",
+            "style": {
+                "navigationBarTitleText": "棣栦欢妫�楠屽崟缁存姢"
+            }
+        },
+        {
+            "path": "pages/ZLGL/shoujianjianyan/form",
+            "style": {
+                "navigationBarTitleText": "棣栦欢妫�楠屽崟"
+            }
+        },
+        {
+            "path": "pages/shoujishouming/table",
+            "style": {
+                "navigationBarTitleText": "妯″叿瀵垮懡璋冩暣鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shoujishouming/form",
+            "style": {
+                "navigationBarTitleText": "妯″叿瀵垮懡璋冩暣鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/mujulingliaochukudan/form",
+            "style": {
+                "navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/mujulingliaochukudan/table",
+            "style": {
+                "navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/mujulingliaotuikudan/table",
+            "style": {
+                "navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/qijudiaobodan/table",
+            "style": {
+                "navigationBarTitleText": "妯″叿璋冩嫧鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/MJGL/qijudiaobodan/form",
+            "style": {
+                "navigationBarTitleText": "妯″叿璋冩嫧鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/fenbushidiaorudan/form_test",
+            "style": {
+                "navigationBarTitleText": "鍒嗗竷璋冨叆鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/fenbushidiaorudan/table",
+            "style": {
+                "navigationBarTitleText": "鍒嗗竷璋冨叆鍗曠紦瀛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/fenbushidiaochudan/form_out",
+            "style": {
+                "navigationBarTitleText": "鍒嗗竷璋冨嚭鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weixiujilu/table",
+            "style": {
+                "navigationBarTitleText": "妯″叿缁翠慨璁板綍",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weixiujilu/form",
+            "style": {
+                "navigationBarTitleText": "妯″叿缁翠慨璁板綍鍗�"
+            }
+        },
+        {
+            "path": "pages/qijvguzhangdengji/table",
+            "style": {
+                "navigationBarTitleText": "妯″叿鏁呴殰鐧昏"
 
-			}
-		},
-		{
-			"path": "pages/qijvguzhangdengji/form",
-			"style": {
-				"navigationBarTitleText": "妯″叿鏁呴殰鐧昏鍗�"
-			}
-		},
-		{
+            }
+        },
+        {
+            "path": "pages/qijvguzhangdengji/form",
+            "style": {
+                "navigationBarTitleText": "妯″叿鏁呴殰鐧昏鍗�"
+            }
+        },
+        {
+            "path": "pages/zhuangxiangdan/form",
+            "style": {
+                "navigationBarTitleText": "瑁呯鍗�"
+
+
+{
 			"path": "pages/chaixiang/form",
 			"style": {
 				"navigationBarTitleText": "鎷嗙"
@@ -1240,44 +1246,63 @@
 				"navigationBarTitleText": "缁勬墭-灏忓崼"
 			}
 		}
-	],
-	"tabBar": {
-		"color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-		"selectedColor": "#2d7dee", //tab 涓婄殑鏂囧瓧閫変腑鏃剁殑棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-		"borderStyle": "black", //tabbar涓婅竟妗嗙殑棰滆壊锛� 浠呮敮鎸� black / white
-		"backgroundColor": "#ffffff", //tab 鐨勮儗鏅壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-		"list": [{
-				"pagePath": "pages/index/index",
-				"iconPath": "static/tabBar/home.png",
-				"selectedIconPath": "static/tabBar/home-default.png",
-				"text": "浠撳偍绠$悊"
-			},
-			{
-				"pagePath": "pages/index/tab1",
-				"iconPath": "static/tabBar/icon1.png",
-				"selectedIconPath": "static/tabBar/icon1-default.png",
-				"text": "杞﹂棿宸ュ簭"
-			},
-			{
-				"pagePath": "pages/index/tab2",
-				"iconPath": "static/tabBar/icon2.png",
-				"selectedIconPath": "static/tabBar/icon2-default.png",
-				"text": "鍗曟嵁鍒楄〃"
-			},
-			{
-				"pagePath": "pages/index/mine",
-				"iconPath": "static/tabBar/user.png",
-				"selectedIconPath": "static/tabBar/user-default.png",
-				"text": "鎴戠殑"
-			}
-		]
-	},
-	"globalStyle": {
-		"navigationBarTextStyle": "white",
-		"navigationBarTitleText": "璁惧绠$悊",
-		"navigationBarBackgroundColor": "#3A78FF",
-		"backgroundColor": "#F8F8F8",
-		"pageOrientation": "default"
-	},
-	"uniIdRouter": {}
+        },
+        {
+            "path": "pages/zhuangxiangdan/table",
+            "style": {
+                "navigationBarTitleText": "瑁呯鍗曠紦瀛�"
+            }
+        }, 
+        {
+            "path": "pages/ZLGL/xunjianjianyan/table",
+            "style": {
+                "navigationBarTitleText": "宸℃鍗曠紦瀛�"
+            }
+        },
+        {
+            "path": "pages/ZLGL/xunjianjianyan/form",
+            "style": {
+                "navigationBarTitleText": "宸℃鍗�"
+            }
+        }
+    ],
+    "tabBar": {
+        "color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+        "selectedColor": "#2d7dee", //tab 涓婄殑鏂囧瓧閫変腑鏃剁殑棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+        "borderStyle": "black", //tabbar涓婅竟妗嗙殑棰滆壊锛� 浠呮敮鎸� black / white
+        "backgroundColor": "#ffffff", //tab 鐨勮儗鏅壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+        "list": [{
+                "pagePath": "pages/index/index",
+                "iconPath": "static/tabBar/home.png",
+                "selectedIconPath": "static/tabBar/home-default.png",
+                "text": "浠撳偍绠$悊"
+            },
+            {
+                "pagePath": "pages/index/tab1",
+                "iconPath": "static/tabBar/icon1.png",
+                "selectedIconPath": "static/tabBar/icon1-default.png",
+                "text": "杞﹂棿宸ュ簭"
+            },
+            {
+                "pagePath": "pages/index/tab2",
+                "iconPath": "static/tabBar/icon2.png",
+                "selectedIconPath": "static/tabBar/icon2-default.png",
+                "text": "鍗曟嵁鍒楄〃"
+            },
+            {
+                "pagePath": "pages/index/mine",
+                "iconPath": "static/tabBar/user.png",
+                "selectedIconPath": "static/tabBar/user-default.png",
+                "text": "鎴戠殑"
+            }
+        ]
+    },
+    "globalStyle": {
+        "navigationBarTextStyle": "white",
+        "navigationBarTitleText": "璁惧绠$悊",
+        "navigationBarBackgroundColor": "#3A78FF",
+        "backgroundColor": "#F8F8F8",
+        "pageOrientation": "default"
+    },
+    "uniIdRouter": {}
 }
\ No newline at end of file
diff --git a/pages/MJGL/mujudianjianjiludan/form.vue b/pages/MJGL/mujudianjianjiludan/form.vue
index 1bb3243..075017e 100644
--- a/pages/MJGL/mujudianjianjiludan/form.vue
+++ b/pages/MJGL/mujudianjianjiludan/form.vue
@@ -97,7 +97,7 @@
 			
 			<view class="form-item" style="align-items: flex-start;">
 				<view class="title">寮傚父鎯呭喌璁板綍:</view>
-				<view class="right" style="min-height: 150rpx;">
+				<view class="right" style="min-height: 100rpx;">
 					<textarea name="HErrNote" v-model="hform.HErrNote" auto-height maxlength="-1"
 						placeholder="璇疯緭鍏ュ紓甯告儏鍐佃褰�"></textarea>
 				</view>
@@ -107,19 +107,9 @@
 			
 			<view class="form-item" style="align-items: flex-start;">
 				<view class="title">閲嶅ぇ瀹夊叏闅愭偅璁板綍:</view>
-				<view class="right" style="min-height: 150rpx;">
+				<view class="right" style="min-height: 100rpx;">
 					<textarea name="HBigSafeNote" v-model="hform.HBigSafeNote" auto-height maxlength="-1"
 						placeholder="璇疯緭鍏ラ噸澶у畨鍏ㄩ殣鎮h褰�"></textarea>
-				</view>
-			</view>
-
-			<view class="tab_area"></view>
-
-			<view class="form-item" style="align-items: flex-start;">
-				<view class="title">澶囨敞:</view>
-				<view class="right" style="min-height: 150rpx;">
-					<textarea name="HRemark" v-model="hform.HRemark" auto-height maxlength="-1"
-						placeholder="璇疯緭鍏ュ娉�"></textarea>
 				</view>
 			</view>
 			
@@ -127,11 +117,21 @@
 			
 			<view class="form-item" style="align-items: flex-start;">
 				<view class="title">鎽樿:</view>
-				<view class="right" style="min-height: 150rpx;">
+				<view class="right" style="min-height: 100rpx;">
 					<textarea name="HExplanation" v-model="hform.HExplanation" auto-height maxlength="-1"
 						placeholder="璇疯緭鍏ユ憳瑕�"></textarea>
 				</view>
 			</view>
+			
+			<view class="tab_area"></view>
+			
+			<view class="form-item" style="align-items: flex-start;">
+				<view class="title">澶囨敞:</view>
+				<view class="right" style="min-height: 100rpx;">
+					<textarea name="HRemark" v-model="hform.HRemark" auto-height maxlength="-1"
+						placeholder="璇疯緭鍏ュ娉�"></textarea>
+				</view>
+			</view>
 
 			<view class="tab_area"></view>
 
diff --git a/pages/MJGL/shangmudan/table.vue b/pages/MJGL/shangmudan/table.vue
index 6997398..d90c952 100644
--- a/pages/MJGL/shangmudan/table.vue
+++ b/pages/MJGL/shangmudan/table.vue
@@ -476,6 +476,7 @@
 			width: 450rpx;
 			border-radius: 22rpx;
 			border: 1px solid #acacac;
+			position: relative;
 		}
 
 		.righton {
diff --git a/pages/MJGL/xiamodan/table.vue b/pages/MJGL/xiamodan/table.vue
index a3a8cc6..1d17ddb 100644
--- a/pages/MJGL/xiamodan/table.vue
+++ b/pages/MJGL/xiamodan/table.vue
@@ -407,6 +407,7 @@
 			width: 450rpx;
 			border-radius: 22rpx;
 			border: 1px solid #acacac;
+			position: relative;
 		}
 
 		.righton {
diff --git a/pages/ZLGL/shoujianjianyan/form.vue b/pages/ZLGL/shoujianjianyan/form.vue
index 69b40bb..3893f38 100644
--- a/pages/ZLGL/shoujianjianyan/form.vue
+++ b/pages/ZLGL/shoujianjianyan/form.vue
@@ -4,8 +4,8 @@
         <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 == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">鍩烘湰淇℃伅</view>
+                <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍒跺崟淇℃伅</view>
             </view>
             <!-- 涓昏〃鍐呭 -->
             <view class="bill-main-contents">
@@ -22,8 +22,33 @@
                         <view class="left">鏃ユ湡</view>
                         <view class="right">
                             <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HDate">
-                                <view>{{hform.HDate}}</view>
+                                <view>{{ hform.HDate }}</view>
                             </uni-datetime-picker>
+                        </view>
+                    </view>
+                    <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" :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">
@@ -40,6 +65,11 @@
                                 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"></view>
+                    </view> -->
                     <view class="form-item">
                         <view class="left">浠诲姟鍗曞彿</view>
                         <view class="right disabled">
@@ -110,12 +140,12 @@
                         <view class="right none-border">
                             <radio-group @changer="checkResultChange">
                                 <label>
-                                    <radio value="0" :checked="judgeConclusion" /><text></text>
+                                    <radio value="0" :checked="hform.HLastResult" /><text></text>
                                     鍚堟牸
                                 </label>
-                                <view style="width: 20rpx;display: inline-block;"></view>
+                                <view style="width: 20rpx; display: inline-block"></view>
                                 <label>
-                                    <radio value="1" :checked="!judgeConclusion" /><text></text>
+                                    <radio value="1" :checked="!hform.HLastResult" /><text></text>
                                     涓嶅悎鏍�
                                 </label>
                             </radio-group>
@@ -147,61 +177,61 @@
                     <view class="form-item">
                         <view class="left">鍒跺崟浜�</view>
                         <view class="right disabled">
-                            <input type="text" value="" 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="" 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="" 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="" 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="" 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="" 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="" 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="" 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="" 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="" disabled />
+                            <input type="text" :value="hform.HDeleteDate" disabled />
                         </view>
                     </view>
                 </view>
@@ -211,48 +241,47 @@
         <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 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">
-                    <view class="buttons" @tap="addCheckItem">
-                        <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
+                    <!-- 闇�閫氳繃鏄惧紡璋冪敤蹇界暐$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"> <text>搴忓彿锛�</text>{{ checkItem.num }} </view>
                                 <view class="detail editable">
-                                    <view style="flex-shrink: 0;"><text>妫�楠岄」鐩細</text></view>
+                                    <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>
+                                    <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 style="width: 4em">
+                                        {{ checkItem.HResult == 1 ? "鍚堟牸" : "涓嶅悎鏍�" }}
                                     </view>
                                     <view>
-                                        <switch style="width: 2em; transform:scale(0.7);"
+                                        <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>
+                                <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)"
@@ -261,48 +290,48 @@
                                     </picker>
                                 </view>
                                 <view class="detail editable">
-                                    <view style="flex-shrink: 0;"><text>閲嶇偣妫�鏌ワ細</text></view>
+                                    <view style="flex-shrink: 0"><text>閲嶇偣妫�鏌ワ細</text></view>
                                     <view>
-                                        <switch type="checkbox" style="transform:scale(0.7);"
+                                        <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}}
+                                    <text>妫�楠屾爣鍑嗭細</text>{{ checkItem.HQCStd }}
                                 </view>
                                 <view class="detail" v-if="checkItem.HUnit">
-                                    <text>鍗曚綅锛�</text>{{checkItem.HUnit}}
+                                    <text>鍗曚綅锛�</text>{{ checkItem.HUnit }}
                                 </view>
                                 <view class="detail" v-if="checkItem.HQCStd">
-                                    <text>妫�楠屽�硷細</text>{{checkItem.HQCStd}}
+                                    <text>妫�楠屽�硷細</text>{{ checkItem.HQCStd }}
                                 </view>
                                 <view class="detail" v-if="checkItem.HQCNote">
-                                    <text>妫�楠岃褰曪細</text>{{checkItem.HQCNote}}
+                                    <text>妫�楠岃褰曪細</text>{{ checkItem.HQCNote }}
                                 </view>
                                 <view class="detail" v-if="checkItem.HTargetVal">
-                                    <text>鐩爣鍊硷細</text>{{checkItem.HTargetVal}}
+                                    <text>鐩爣鍊硷細</text>{{ checkItem.HTargetVal }}
                                 </view>
                                 <view class="detail" v-if="checkItem.HUpLimit">
-                                    <text>涓婇檺鍊硷細</text>{{checkItem.HUpLimit}}
+                                    <text>涓婇檺鍊硷細</text>{{ checkItem.HUpLimit }}
                                 </view>
                                 <view class="detail" v-if="checkItem.HDownLimit">
-                                    <text>涓嬮檺鍊硷細</text>{{checkItem.HDownLimit}}
+                                    <text>涓嬮檺鍊硷細</text>{{ checkItem.HDownLimit }}
                                 </view>
                                 <view class="detail" v-if="checkItem.HMax">
-                                    <text>鏈�澶у�硷細</text>{{checkItem.HMax}}
+                                    <text>鏈�澶у�硷細</text>{{ checkItem.HMax }}
                                 </view>
                                 <view class="detail" v-if="checkItem.HMin">
-                                    <text>鏈�灏忓�硷細</text>{{checkItem.HMin}}
+                                    <text>鏈�灏忓�硷細</text>{{ checkItem.HMin }}
                                 </view>
                                 <view class="detail" v-if="checkItem.HAvg">
-                                    <text>骞冲潎鍊硷細</text>{{checkItem.HAvg}}
+                                    <text>骞冲潎鍊硷細</text>{{ checkItem.HAvg }}
                                 </view>
                             </view>
-                            <view style="height: 20rpx;"></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;"
+                                <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>
@@ -315,49 +344,59 @@
                     <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"> <text>搴忓彿锛�</text>{{ SamplingItem.num }} </view>
                                 <view class="detail editable">
-                                    <text>妫�楠岄」鐩細</text>{{SamplingItem.HQCCheckItemName}}
+                                    <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>
+                                <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}}
+                                    <text>鎶芥牱绫诲瀷锛�</text>{{ SamplingItem.HSamplingType }}
                                 </view>
                                 <view class="detail editable">
-                                    <text>妫�楠屾按骞筹細</text>{{SamplingItem.HInspectionLevel}}
+                                    <text>妫�楠屾按骞筹細</text>{{ SamplingItem.HInspectionLevel }}
                                 </view>
                                 <view class="detail editable">
-                                    <text>涓ユ牸搴︼細</text>{{SamplingItem.HStrictness}}
+                                    <text>涓ユ牸搴︼細</text>{{ SamplingItem.HStrictness }}
                                 </view>
                                 <view class="detail editable">
-                                    <text>AQL锛�</text>{{SamplingItem.HAQL}}
+                                    <text>AQL锛�</text>{{ SamplingItem.HAQL }}
                                 </view>
-                                <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3;"></view>
+                                <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
                                 <view class="detail editable">
-                                    <text>鏍锋湰閲忥細</text>{{SamplingItem.HSampleQty}}
+                                    <text>鏍锋湰閲忥細</text>{{ SamplingItem.HSampleQty }}
                                 </view>
                                 <view class="detail editable">
-                                    <text>鍏佽鏁帮細</text>{{SamplingItem.HAcceptQty}}
+                                    <text>鍏佽鏁帮細</text>{{ SamplingItem.HAcceptQty }}
                                 </view>
                                 <view class="detail editable">
-                                    <text>鎷掔粷鏁帮細</text>{{SamplingItem.HRejectQty}}
+                                    <text>鎷掔粷鏁帮細</text>{{ SamplingItem.HRejectQty }}
                                 </view>
                                 <view class="detail editable">
-                                    <text>鏍锋湰涓嶅悎鏍兼暟锛�</text>{{SamplingItem.HSampleUnRightQty}}
+                                    <text>鏍锋湰涓嶅悎鏍兼暟锛�</text>{{ SamplingItem.HSampleUnRightQty }}
                                 </view>
                                 <view class="detail editable">
-                                    <text>鏍锋湰鐮村潖鏁帮細</text>{{SamplingItem.HSampleDamageQty}}
+                                    <text>鏍锋湰鐮村潖鏁帮細</text>
+                                    <view class="sampleDestory">
+                                        <input type="number" v-model="SamplingItem.HSampleDamageQty" />
+                                    </view>
                                 </view>
                                 <view class="detail editable">
-                                    <text>妫�楠岀粨鏋滐細</text>{{SamplingItem.HInspectResultToSee}}
+                                    <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>
@@ -366,18 +405,21 @@
                 <!-- 妫�娴嬪�� 鍛堢幇 -->
                 <view v-else v-for="item in InspectModules" :key="item.id">
                     <view v-if="subTabSelected == item.id">
-                        <InspectValueTemplateVue :bind-key="item.id"
-                            :bind-data="{data: checkItems[item.checkItemId], list: InspectValues[item.checkItemId]}"
-                            @update="InspectValueUpdate"></InspectValueTemplateVue>
+                        <InspectValueTemplateVue ref="InspectValueModules" :bind-key="item.id"
+                            @syncCheckData="InspectValueComplete" :bind-data="{
+                data: checkItems[item.checkItemId],
+                list: InspectValues[item.checkItemId],
+                mode: 1 // 棣栨妫�娴嬪�兼ā鍧�
+              }">
+                        </InspectValueTemplateVue>
                     </view>
                 </view>
-
             </view>
         </view>
-        <view style="height: 120rpx;"></view>
+        <view style="height: 120rpx"></view>
         <view class="bottom-btn">
             <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-            <view style="flex: 1;"></view>
+            <view style="flex: 1"></view>
             <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
             <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
         </view>
@@ -405,22 +447,25 @@
 </template>
 
 <script>
-    import dayjs from 'dayjs'
+    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'
+    } 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'
+    } from "../../../utils/auth";
+    import {
+        MpaasScan
+    } from "../../../utils/mpaasScan";
     export default {
         components: {
             InspectValueTemplateVue,
@@ -431,27 +476,37 @@
             ICMOBillPopupVue,
             ProcExchBillPopupVue,
             ProcessPopupVue,
-            CheckProjectPopupVue
+            CheckProjectPopupVue,
         },
         computed: {
             judgeConclusion: {
                 get() {
-                    return true
-                }
-            }
+                    return true;
+                },
+            },
         },
         data() {
             return {
                 operationType: 1,
-                linterid: 0,
 
                 mainTabSelected: 1,
                 subTabSelected: 1,
+                
+                // 婧愬崟鐘舵�佹帶鍒�
+                hasSourceBill: false,
 
                 // 鎺у埗褰撳墠鏄剧ず鐨勫脊绐楁ā鍧�
-                enablePopupModule: '',
-                PopupModuleNameList: ["", "SampleScheme", "CheckItem",
-                    "InspectMent", "Material", "ICMOBill", "ProcExchBill", "QCScheme", "Process"
+                enablePopupModule: "",
+                PopupModuleNameList: [
+                    "",
+                    "SampleScheme",
+                    "CheckItem",
+                    "InspectMent",
+                    "Material",
+                    "ICMOBill",
+                    "ProcExchBill",
+                    "QCScheme",
+                    "Process",
                 ],
                 // 褰撳墠鎿嶄綔鐨勬楠屽崟ID缂撳瓨
                 currentChechItemIDCache: -1,
@@ -469,345 +524,641 @@
 
                 // 妫�楠屾柟妗�
                 arrayAnalysisMethod: [{
-                    value: 1,
-                    name: '瀹氭�у垎鏋�'
-                }, {
-                    value: 2,
-                    name: '瀹氶噺鍒嗘瀽'
-                }, {
-                    value: 3,
-                    name: '鍏朵粬鍒嗘瀽'
-                }],
+                        value: 1,
+                        name: "瀹氭�у垎鏋�",
+                    },
+                    {
+                        value: 2,
+                        name: "瀹氶噺鍒嗘瀽",
+                    },
+                    {
+                        value: 3,
+                        name: "鍏朵粬鍒嗘瀽",
+                    },
+                ],
                 ArrayAnalysisMethodValue: [1, 2, 3],
                 // 瀛愯〃 椤电淇℃伅
                 subTabs: {
-                    "1": {
+                    1: {
                         id: "1",
-                        name: "妫�楠岄」鐩�"
+                        name: "妫�楠岄」鐩�",
                     },
-                    "2": {
+                    2: {
                         id: "2",
-                        name: "鎶芥牱妫�楠�"
-                    }
+                        name: "鎶芥牱妫�楠�",
+                    },
                 },
+
+                // 婧愬崟绫诲瀷
+                HSourceBillType: "宸ュ簭杩涚珯鎺ユ敹鍗�",
+                HSourceBillTypeValueList: ["3790", "3793", "3710", "3772"],
+                HSourceBillTypeNameList: [
+                    "宸ュ簭杩涚珯鎺ユ敹鍗�",
+                    "宸ュ簭濮斿鎺ユ敹鍗�",
+                    "鐢熶骇璁㈠崟",
+                    "宸ュ簭娴佽浆鍗�",
+                ],
                 // 涓昏〃灞炴��
                 hform: {
-                    "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": "2",
-                    // "HAnalysisMethod": "1",
-                    // "layTableCheckbox": "on",
-                    // "HEntryID": "1",
-                    // "HQCCheckItemName": "澶栬",
-                    // "HQCCheckItemID": "2",
-                    // "HSampleSchemeName": "",
-                    // "HSampleSchemeID": "0",
-                    // "HSampleQty": "0",
-                    // "HSampleDamageQty": "0",
-                    // "HSamplingType": "",
-                    // "HAcceptQty": "",
-                    // "HInspectResultToSee": "",
-                    // "HInspectionLevel": "",
-                    // "HRejectQty": "",
-                    // "HStrictness": "",
-                    // "HSampleUnRightQty": "0",
-                    // "HAQL": "",
-                    // "HSampleQty2": "0",
-                    // "HInspectResultToSee2": "",
-                    // "HSampleUnRightQty2": "0",
-                    // "HResDec": "2",
-                    // "HStatus": "1",
-                    // "HComparator": "=",
-                    // "HUnit": "",
-                    // "HUnitID": "0",
-                    // "HInspectVal": "",
-                    // "HInspectValB": "",
-                    // "HTargetVal": "",
-                    // "HTargetValB": "",
-                    // "HUpLimit": "0",
-                    // "HDownLimit": "0",
-                    // "HUpOffSet": "",
-                    // "HDownOffSet": "",
-                    // "HInSpectResult": "",
-                    "HMainSourceBillType": "",
-                    "HMainSourceInterID": "0",
-                    "HMainSourceEntryID": "1",
-                    "HMainSourceBillNo": ""
+                    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: "",
+
+                    HResDec: "",
+                    HStatus: 1,
+
+                    HMainSourceBillType: "",
+                    HMainSourceInterID: "0",
+                    HMainSourceEntryID: "1",
+                    HMainSourceBillNo: "",
                 },
                 // 妫�楠岄」鐩拰鎶芥牱妫�楠� 鍊�
-                checkItems: {
-
-                },
+                checkItems: {},
                 // 妫�娴嬪�兼ā鍧�
-                InspectModules: {
-
-                },
+                InspectModules: {},
                 // 妫�娴嬪��
-                InspectValues: {
-
-                }
-            }
+                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(HBarCode);
+                    }
+                });
+            },
+            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;
+
+                        if (count != 1) {
+                            CommonUtils.showTips({
+                                title: "娓╅Θ鎻愮ず",
+                                message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${Message}`,
+                            });
+                            return;
+                        }
+
+                        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"],
+                        },
+                    });
+
+                    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].鎵瑰彿;
+                    
+                    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;
+
+                    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;
+
+                    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"],
+                        },
+                    });
+
+                    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].褰撳墠宸ュ簭;
+                    
+                    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',
+                        url: "/Gy_Employee/list",
                         data: {
-                            sWhere: `  and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' order by 閮ㄩ棬浠g爜`,
-                            user: getUserInfo()['Czymc'],
-                            Organization: uni.getStorageSync("Organization")
-                        }
-                    })
+                            sWhere: `  and 缁勭粐鍚嶇О = '${uni.getStorageSync(
+              "Organization"
+            )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' order by 閮ㄩ棬浠g爜`,
+                            user: getUserInfo()["Czymc"],
+                            Organization: uni.getStorageSync("Organization"),
+                        },
+                    });
 
                     let {
                         data,
                         Message,
                         count
-                    } = res.data
+                    } = res.data;
 
                     if (count == 1) {
-                        console.log('data: ', data);
-                        this.GyFirstCheckEmpList = data
-                        this.GyFirstCheckEmpNameList = Array.from(data).map(e => e["鑱屽憳鍚嶇О"])
+                        console.log("data: ", data);
+                        this.GyFirstCheckEmpList = data;
+                        this.GyFirstCheckEmpNameList = Array.from(data).map((e) => e["鑱屽憳鍚嶇О"]);
                     } else {
                         CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: `鍒濆鍖栨楠屽憳澶辫触: ${Message}`
-                        })
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鍒濆鍖栨楠屽憳澶辫触: ${Message}`,
+                        });
                     }
-
                 } catch (err) {
                     CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: `鍒濆鍖栨楠屽憳澶辫触: ${err}`
-                    })
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鍒濆鍖栨楠屽憳澶辫触: ${err}`,
+                    });
                 }
             },
             async HFirstCheckEmpChange(e) {
-                console.log('閫変腑妫�楠屽憳: ', e);
-                let index = this.GyFirstCheckEmpList.findIndex(elem => elem["鑱屽憳鍚嶇О"] == 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 = 0;
+                    this.hform.HFirstCheckEmpName = "";
+                    return;
                 }
 
-                this.hform.HFirstCheckEmp = this.GyFirstCheckEmpList[index]["HItemID"]
-                this.hform.HFirstCheckEmpName = this.GyFirstCheckEmpList[index]["鑱屽憳鍚嶇О"]
+                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',
+                        url: "/Gy_ShiftsController/Get_Gy_WorkShiftList",
                         data: {
-                            sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'')  != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}'`,
-                            HMaker: getUserInfo()['Czymc']
-                        }
-                    })
+                            sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'')  != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync(
+              "Organization"
+            )}'`,
+                            HMaker: getUserInfo()["Czymc"],
+                        },
+                    });
 
                     let {
                         data,
                         Message,
                         count
-                    } = res.data
+                    } = res.data;
 
                     if (count == 1) {
-                        console.log('data: ', data);
-                        this.GyWorkShiftList = data
-                        this.GyWorkShiftNameList = Array.from(data).map(e => e["鐝鍚嶇О"])
+                        console.log("data: ", data);
+                        this.GyWorkShiftList = data;
+                        this.GyWorkShiftNameList = Array.from(data).map((e) => e["鐝鍚嶇О"]);
                     } else {
                         CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: `鍒濆鍖栫彮娆″け璐�: ${Message}`
-                        })
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鍒濆鍖栫彮娆″け璐�: ${Message}`,
+                        });
                     }
-
                 } catch (err) {
                     CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: `鍒濆鍖栫彮娆″け璐�: ${err}`
-                    })
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鍒濆鍖栫彮娆″け璐�: ${err}`,
+                    });
                 }
             },
             async HWorkShiftChange(e) {
-                console.log('閫変腑鐝: ', e);
-                let index = this.GyWorkShiftList.findIndex(elem => elem["鐝鍚嶇О"] == 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 = 0;
+                    this.hform.HWorkShiftName = "";
+                    return;
                 }
 
-                this.hform.HWorkShiftID = this.GySourceList[index]["HInterID"]
-                this.hform.HWorkShiftName = this.GySourceList[index]["鐝鍚嶇О"]
+                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',
+                        url: "/Gy_Source/list",
                         data: {
                             sWhere: `and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'')  != '' and HUSEORGID = '100038'`,
-                            user: getUserInfo()['Czymc']
-                        }
-                    })
+                            user: getUserInfo()["Czymc"],
+                        },
+                    });
 
                     let {
                         data,
                         Message,
                         count
-                    } = res.data
+                    } = res.data;
 
                     if (count == 1) {
-                        this.GySourceList = data
-                        this.GySourceNameList = Array.from(data).map(e => e["鐢熶骇璧勬簮鍚嶇О"])
+                        this.GySourceList = data;
+                        this.GySourceNameList = Array.from(data).map((e) => e["鐢熶骇璧勬簮鍚嶇О"]);
                     } else {
                         CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${Message}`
-                        })
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${Message}`,
+                        });
                     }
-
                 } catch (err) {
                     CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${err}`
-                    })
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${err}`,
+                    });
                 }
             },
             // 鐢熶骇璧勬簮鏇存柊
             async HSourceChange(e) {
-                console.log('閫変腑鐢熶骇璧勬簮: ', e);
-                let index = this.GySourceList.findIndex(elem => elem["鐢熶骇璧勬簮鍚嶇О"] == 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 = 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()
+                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.setRequiredInfo(item.HMaterName, item.HProcName);
                 }
 
-                this.$refs.listPopup.showPopup()
+                this.$refs.listPopup.showPopup();
             },
             getAnalysisMethodDisplay(val) {
-                console.log('AnalysisMethodVal: ', val);
+                console.log("AnalysisMethodVal: ", val);
                 if (val) {
-                    return this.arrayAnalysisMethod.find(e => e.value == val).name
+                    return this.arrayAnalysisMethod.find((e) => e.value == val).name;
                 }
-                return ''
+                return "";
             },
             checkResultChange(event) {
-                console.log('event: ', event);
+                console.log("event: ", event);
             },
             // 妫�楠岄」鐩柊澧炶
             addCheckItem(resource) {
-                let ordinal = this.getObjLength(this.checkItems) + 1
+                let ordinal = this.getObjLength(this.checkItems) + 1;
                 let checkItem = {
-                    "num": ordinal,
-                    "HQCCheckItemID": "",
-                    "HQCCheckItemNumber": "",
-                    "HQCCheckItemName": "",
-                    "HInspectInstruMentID": "0",
-                    "HInspectInstruMentNumber": "",
-                    "HInspectInstruMentName": "",
-                    "HQCStd": "",
-                    "HUnit": "",
-                    "HQCNote": "",
-                    "HAnalysisMethod": "",
-                    "HResult": false,
-                    "HMax": "",
-                    "HMin": "",
-                    "HAvg": "",
-                    "HRemark": "",
-                    "HKeyInspect": false,
-                    "HStatus": 0,
-                    "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": ""
+                    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);
                 }
-
-                if (resource) { // 閫氳繃涓昏〃妫�楠屾柟妗堝甫鍑虹殑妫�楠岄」鐩�
-                    Object.assign(checkItem, resource)
-                }
-
-                this.$set(this.checkItems, ordinal, checkItem)
-
+                this.$set(this.checkItems, ordinal, checkItem);
                 this.$nextTick(() => {
                     // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
-                    this.setInspectValModule(this.checkItems[ordinal])
-                })
-
-
+                    this.setInspectValModule(this.checkItems[ordinal]);
+                });
             },
             // 妫�楠岄」鐩垹闄よ
             removeCheckItem(item) {
@@ -816,293 +1167,421 @@
                     content: `纭瑕佸垹闄ょ${item.num}琛屽悧锛熷垹闄ゅ悗涓嶈兘鎭㈠`,
                     success: (res) => {
                         if (res.confirm) {
-                            this.$delete(this.checkItems, item.num)
-                            this.refreshCheckItemNum()
+                            this.$delete(this.checkItems, item.num);
+                            this.$delete(this.subTabs, `_${item.num}`);
+                            this.$forceUpdate();
+                            this.refreshCheckItemNum();
                         }
-                    }
-                })
+                    },
+                });
             },
             async refreshCheckItemNum() {
-                await this.$nextTick()
+                await this.$nextTick();
                 // 閲嶆帓搴忓彿
-                let num = 1
+                let num = 1;
+                let checkItemsCache = {};
                 for (let s in this.checkItems) {
-                    console.log('s: ', s);
-                    this.checkItems[s].num = num
-                    num++
+                    checkItemsCache[num] = this.checkItems[s];
+                    checkItemsCache[num].num = num;
+                    num++;
                 }
+                this.checkItems = checkItemsCache;
             },
             getObjLength(obj) {
-                return Object.keys(obj).length
+                return Object.keys(obj).length;
             },
             // 缁撹淇敼
             HResultChange(id, e) {
-                console.log('e: ', e);
-                this.checkItems[id]["HResult"] = e.detail.value
+                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++;
+                    }
+                }
+
+                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"]
+                console.log("e: ", e);
+                this.checkItems[id]["HAnalysisMethod"] = this.arrayAnalysisMethod[e.detail.value][
+                    "value"
+                ];
 
                 // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
-                this.setInspectValModule(this.checkItems[id])
+                this.setInspectValModule(this.checkItems[id]);
             },
             // 閲嶇偣妫�鏌ヤ慨鏀�
             HKeyInspectChange(id, e) {
-                console.log('e: ', e);
-                this.checkItems[id]["HKeyInspect"] = e.detail.value
+                console.log("e: ", e);
+                this.checkItems[id]["HKeyInspect"] = e.detail.value;
             },
             // 妫�楠岄」鐩繑鍥�
             async CheckItemComplete(e) {
-                console.log('CheckItemRet: ', e);
+                console.log("CheckItemRet: ", e);
                 for (var key in e["retVal"]) {
-                    let data = e["retVal"][key]
+                    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()
+                        HQCCheckItemID: data["HItemID"],
+                        HQCCheckItemNumber: data["浠g爜"],
+                        HQCCheckItemName: data["鍚嶇О"],
+                    });
+                    await this.$nextTick();
+                    this.$refs.listPopup.exit();
                     // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick()
-                    this.enablePopupModule = this.PopupModuleNameList[0]
+                    await this.$nextTick();
+                    this.enablePopupModule = this.PopupModuleNameList[0];
                 }
             },
             // 妫�楠屾柟妗堣繑鍥�
             async SampleSchemeComplete(e) {
-                console.log('SampleSchemeRet: ', e);
+                console.log("SampleSchemeRet: ", e);
                 for (var key in e["retVal"]) {
-                    let data = e["retVal"][key]
+                    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])
+                        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]
+                    await this.$nextTick();
+                    this.enablePopupModule = this.PopupModuleNameList[0];
                 }
             },
             // 妫�楠屼华鍣ㄨ繑鍥�
             async InspectMentComplete(e) {
-                console.log('InspectInstruMentRet: ', e);
+                console.log("InspectInstruMentRet: ", e);
                 for (var key in e["retVal"]) {
-                    let data = e["retVal"][key]
+                    let data = e["retVal"][key];
                     Object.assign(this.checkItems[key], {
-                        "HInspectInstruMentID": data["HItemID"],
-                        "HInspectInstruMentNumber": data["妫�楠屼华鍣ㄤ唬鐮�"],
-                        "HInspectInstruMentName": data["妫�楠屼华鍣ㄥ悕绉�"],
-                    })
-                    await this.$nextTick()
-                    this.$refs.listPopup.exit()
+                        HInspectInstruMentID: data["HItemID"],
+                        HInspectInstruMentNumber: data["妫�楠屼华鍣ㄤ唬鐮�"],
+                        HInspectInstruMentName: data["妫�楠屼华鍣ㄥ悕绉�"],
+                    });
+                    await this.$nextTick();
+                    this.$refs.listPopup.exit();
                     // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick()
-                    this.enablePopupModule = this.PopupModuleNameList[0]
+                    await this.$nextTick();
+                    this.enablePopupModule = this.PopupModuleNameList[0];
                 }
             },
             // 浜у搧浠g爜杩斿洖
             async MaterComplete(e) {
-                console.log('MaterRet: ', e);
+                console.log("MaterRet: ", e);
                 for (var key in e["retVal"]) {
-                    let data = e["retVal"][key]
+                    let data = e["retVal"][key];
                     Object.assign(this.hform, {
-                        "HMaterNumber": data["鐗╂枡浠g爜"],
-                        "HMaterName": data["鐗╂枡鍚嶇О"],
-                        "HMaterID": data["HItemID"],
-                    })
-                    await this.$nextTick()
-                    this.$refs.listPopup.exit()
+                        HMaterNumber: data["鐗╂枡浠g爜"],
+                        HMaterName: data["鐗╂枡鍚嶇О"],
+                        HMaterID: data["HItemID"],
+                    });
+                    await this.$nextTick();
+                    this.$refs.listPopup.exit();
                     // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick()
-                    this.enablePopupModule = this.PopupModuleNameList[0]
+                    await this.$nextTick();
+                    this.enablePopupModule = this.PopupModuleNameList[0];
+                    this.GetCheckItemID();
                 }
             },
             // 浠诲姟鍗曡繑鍥�
             async ICMOBillComplete(e) {
-                console.log('ICMOBillRet: ', e);
+                console.log("ICMOBillRet: ", e);
                 for (var key in e["retVal"]) {
-                    let data = e["retVal"][key]
+                    let data = e["retVal"][key];
                     Object.assign(this.hform, {
-                        "HICMOInterID": data.hmainid,
-                        "HICMOEntryID": data.HEntryID,
-                        "HICMOBillNo": data.鍗曟嵁鍙�,
-                        "HMaterNumber": data.浜у搧浠g爜,
-                        "HMaterName": data.浜у搧鍚嶇О,
-                        "HMaterID": data.HMaterID,
-                        "HICMOQty": data.鐢熶骇浠诲姟鍗曟暟閲�,
-                    })
-                    await this.$nextTick()
-                    this.$refs.listPopup.exit()
+                        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]
+                    await this.$nextTick();
+                    this.enablePopupModule = this.PopupModuleNameList[0];
                 }
             },
             // 娴佽浆鍗¤繑鍥�
             async ProcExchBillComplete(e) {
-                console.log('ProcExchBillRet: ', e);
+                console.log("ProcExchBillRet: ", e);
                 for (var key in e["retVal"]) {
-                    let data = e["retVal"][key]
+                    let data = e["retVal"][key];
                     Object.assign(this.hform, {
-                        "HProcExchInterID": data.hmainid,
-                        "HProcExchEntryID": data.hsubid,
-                        "HProcExchBillNo": data.鍗曟嵁鍙�,
-                    })
-                    await this.$nextTick()
-                    this.$refs.listPopup.exit()
+                        HProcExchInterID: data.hmainid,
+                        HProcExchEntryID: data.hsubid,
+                        HProcExchBillNo: data.鍗曟嵁鍙�,
+                    });
+                    await this.$nextTick();
+                    this.$refs.listPopup.exit();
                     // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick()
-                    this.enablePopupModule = this.PopupModuleNameList[0]
+                    await this.$nextTick();
+                    this.enablePopupModule = this.PopupModuleNameList[0];
                 }
             },
             // 妫�楠屾柟妗�(涓昏〃)杩斿洖
             async HQCSchemeComplete(e) {
-                console.log('HQCSchemeRet: ', e);
+                console.log("HQCSchemeRet: ", e);
                 for (var key in e["retVal"]) {
-                    let data = e["retVal"][key]
+                    let data = e["retVal"][key];
                     Object.assign(this.hform, {
                         HQCSchemeID: data.hmainid,
-                        HQCSchemeName: data.妫�楠屾柟妗堝悕绉�
-                    })
+                        HQCSchemeName: data.妫�楠屾柟妗堝悕绉�,
+                    });
                     await this.get_CheckItem();
-                    await this.$nextTick()
-                    this.$refs.listPopup.exit()
+                    await this.$nextTick();
+                    this.$refs.listPopup.exit();
                     // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick()
-                    this.enablePopupModule = this.PopupModuleNameList[0]
+                    await this.$nextTick();
+                    this.enablePopupModule = this.PopupModuleNameList[0];
                 }
             },
             // 宸ュ簭杩斿洖
             async HProcComplete(e) {
-                console.log(' HProcRet: ', e);
+                console.log(" HProcRet: ", e);
                 for (var key in e["retVal"]) {
-                    let data = e["retVal"][key]
+                    let data = e["retVal"][key];
                     Object.assign(this.hform, {
-                        "HProcName": data["宸ュ簭鍚嶇О"],
-                        "HProcID": data["HItemID"],
-                    })
-                    await this.$nextTick()
-                    this.$refs.listPopup.exit()
+                        HProcName: data["宸ュ簭鍚嶇О"],
+                        HProcID: data["HItemID"],
+                    });
+                    await this.$nextTick();
+                    this.$refs.listPopup.exit();
                     // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
-                    await this.$nextTick()
-                    this.enablePopupModule = this.PopupModuleNameList[0]
+                    await this.$nextTick();
+                    this.enablePopupModule = this.PopupModuleNameList[0];
+                    await this.GetCheckItemID();
+                    await this.get_ICMOBillStatusList();
+                    await this.get_QC_TakeSampleCheckBillList();
                 }
             },
-            setInspectValModule(checkItem) {
-                console.log('checkItem: ', checkItem);
-                if (!checkItem.HAnalysisMethod || !checkItem.HSampleSchemeID) {
-                    return
+            async get_QC_TakeSampleCheckBillList() {
+                // 鍙栨牱鍗曟煡璇�
+                let HProcID = this.hform.HProcID;
+                let HProcExchInterId = this.hform.HProcExchInterID;
+                let sWhere = "";
+
+                if (HProcID == "0" || HProcID == "") {
+                    CommonUtils.showTips({
+                        message: "璇烽�夋嫨宸ュ簭",
+                    });
+                    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.HSampleSchemeName}`
-                })
-            },
-            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() {
+
+                sWhere = " and 宸ュ簭娴佽浆鍗′富鍐呯爜='" + HProcExchInterID + "' and HProcID=" + HProcID;
+
                 try {
                     let res = await CommonUtils.doRequest2Async({
-                        url: '/Web/GetCheckItemByCheckProjectID',
+                        url: "//QC_TakeSampleCheckBill/QC_TakeSampleCheckBillMainList",
                         data: {
-                            CheckProjectID: this.hform.HQCSchemeID || 0,
-                            HBatchQty: this.hform.HProcExchQty
-                        }
-                    })
+                            sWhere: sWhere,
+                            user: getUserInfo()["Czymc"],
+                        },
+                    });
 
                     let {
                         data,
                         count,
                         Message
-                    } = res.data
+                    } = 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;
+
+                if (HProcID != "0") {
+                    sWhere += " and HProcID=" + HProcID;
+                }
+                if (HSourceID != "0") {
+                    sWhere += " and HSourceID=" + HSourceID;
+                }
+
+                sWhere += " and HSourceInterID=" + HProcExchInterID;
+
+                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}`,
+                        });
+                    }
+
+                    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",
+                        data: {
+                            CheckProjectID: this.hform.HQCSchemeID || 0,
+                            HBatchQty: this.hform.HProcExchQty || 0,
+                        },
+                    });
+
+                    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": "",
-                                "HAQL": data[i].AQL,
-                                "HSamplingType": data[i].鎶芥牱绫诲瀷
-                            }
+                                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)
+                            this.addCheckItem(checkItem);
                         }
-
                     } else {
                         CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${Message} `
-                        })
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${Message} `,
+                        });
                     }
                 } catch (err) {
                     CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${err} `
-                    })
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${err} `,
+                    });
                 }
             },
             async getMaxBillNo() {
@@ -1110,62 +1589,389 @@
                     let res = await CommonUtils.doRequest2Sync({
                         url: "/Web/GetMAXNum",
                         data: {
-                            "HBillType": '7505'
-                        }
-                    })
+                            HBillType: "7505",
+                        },
+                    });
 
                     if (!res) {
-                        return
+                        return;
                     }
 
                     let {
                         data,
                         Message,
                         count
-                    } = res.data
+                    } = res.data;
                     if (count == 1) {
-                        this.hform.HInterID = data[0].HInterID
-                        this.hform.HBillNo = data[0].HBillNo
+                        this.hform.HInterID = data[0].HInterID;
+                        this.hform.HBillNo = data[0].HBillNo;
                     } else {
-                        throw (Message)
+                        throw Message;
                     }
-
                 } catch (err) {
                     CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: "鑾峰彇鍗曟嵁鍙峰紓甯�: " + err
-                    })
+                        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();
+
+            },
+            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;
+                }
+
+                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;
+                    }
+                }
+
+                return true;
+            },
+            async submit() {
+                if (!this.checkSubmitValidate()) {
+                    return;
+                }
+                try {
+                    console.log('this.$refs: ',this.$refs);
+                    // 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
+                    if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules.length > 0) {
+                        // 鍔犺浇鏈夋楠屽�兼ā鍧�
+                        await this.$refs.InspectValueModules[0].set_SaveValue();
+                        this.InspectValues[0] = this.$refs.InspectValueModules[0].InSpectValues;
+                        await this.InspectValueComplete(this.$refs.InspectValueModules[0].checkData)
+                    }
+                    let InspectValuesTrans = [];
+                    let HInterID = this.hform.HInterID;
+                    for (let key in this.InspectValues) {
+                        let HEntryID = key;
+
+                        InspectValuesTrans.push(
+                            `${JSON.stringify(this.InspectValues[key])}`
+                        );
+                    }
+                    let checkItemsArray = [];
+                    for (var key in this.checkItems) {
+                        let checkItem = JSON.parse(JSON.stringify(this.checkItems[key])) 
+                        delete checkItem.data
+                        checkItemsArray.push(checkItem);
+                    }
+                    console.log('checkItemsArray: ',checkItemsArray);
+                    let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(
+          checkItemsArray
+        )};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0]}`;
+                    console.log("this.checkItems: ", this.checkItems);
+
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: "/QC_FirstPieceCheckBill/set_SaveBill",
+                        data: {
+                            sMainSub: sMainSub,
+                        },
+                        method: "POST",
+                    });
+
+                    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/shoujianjianyan/form?operationType=1",
+                                    });
+                                } else if (res.cancel) {
+                                    console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
+                                    // setTimeout(() => {
+                                    //     uni.navigateBack();
+                                    // }, 50)
+                                }
+                            },
+                        });
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `棣栦欢妫�楠屽崟淇濆瓨閿欒: ${Message}`,
+                        });
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `棣栦欢妫�楠屽崟淇濆瓨閿欒: ${err}`,
+                    });
+                }
+            },
+            addNew() {
+                uni.redirectTo({
+                    url: "/pages/ZLGL/shoujianjianyan/form?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;
+
+                    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].妫�楠岀粨鏋�
+                            });
+                            
+                        }
+                        
+                        
+                        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.linterid = e.linterid || 0
+            this.operationType = e.operationType || 1;
+            this.hform.HInterID = e.linterid || 0;
             if (this.operationType == 1) {
-                await this.getMaxBillNo()
+                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.InitHSource();
+            await this.InitHWorkShift();
+            await this.InitHEmp();
+        },
+    };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
     input {
         width: inherit;
         font-size: 26rpx;
     }
 
     .uni-input {
-        padding: 0
+        padding: 0;
     }
-
 
     .bill-main-tabs,
     .bill-sub-tabs {
@@ -1241,7 +2047,6 @@
                     height: inherit;
                     font-size: 26rpx;
                 }
-
             }
 
             .disabled {
@@ -1278,7 +2083,7 @@
         }
 
         .btn-a {
-            background-color: #3A78FF;
+            background-color: #3a78ff;
             color: #fff;
         }
 
@@ -1365,12 +2170,22 @@
                 display: inline-flex;
                 flex-direction: row;
                 align-items: center;
+
+                text {
+                    flex-shrink: 0;
+                }
+
+                .sampleDestory {
+                    border: 1px solid #acacac;
+                    border-radius: 10%;
+                    padding: 0 12rpx;
+                }
             }
         }
     }
 
     .icon-wrapper {
-        background-color: #3A78FF;
+        background-color: #3a78ff;
         border-radius: 100%;
         width: 40rpx;
         height: 40rpx;
@@ -1385,7 +2200,7 @@
     }
 
     .icon-wrapper-big {
-        background-color: #3A78FF;
+        background-color: #3a78ff;
         border-radius: 100%;
         width: 50rpx;
         height: 50rpx;
@@ -1412,4 +2227,14 @@
             text-align: center;
         }
     }
+
+    .pass-background {
+        background-color: #cee3f2;
+        border: none;
+    }
+
+    .unpass-background {
+        background-color: #f0d6e3;
+        border: none;
+    }
 </style>
\ No newline at end of file
diff --git a/pages/ZLGL/shoujianjianyan/table.vue b/pages/ZLGL/shoujianjianyan/table.vue
index 1c9728e..d77de6d 100644
--- a/pages/ZLGL/shoujianjianyan/table.vue
+++ b/pages/ZLGL/shoujianjianyan/table.vue
@@ -53,13 +53,13 @@
                         <view class="detail" v-if="item['鐗╂枡鍚嶇О']">
                             <text>鐗╂枡鍚嶇О锛�</text>{{item['鐗╂枡鍚嶇О']}}
                         </view>
-                        <view class="detail" v-if="item['瑙勬牸鍨嬪彿'].trim()">
+                        <view class="detail" v-if="item['瑙勬牸鍨嬪彿']">
                             <text>瑙勬牸鍨嬪彿锛�</text>{{item['瑙勬牸鍨嬪彿']}}
                         </view>
-                        <view class="detail" v-if="item['妫�楠屾柟妗�'].trim()">
+                        <view class="detail" v-if="item['妫�楠屾柟妗�']">
                             <text>妫�楠屾柟妗堬細</text>{{item['妫�楠屾柟妗�']}}
                         </view>
-                        <view class="detail" v-if="item['瑙勬牸鍨嬪彿'].trim()">
+                        <view class="detail" v-if="item['瑙勬牸鍨嬪彿']">
                             <text>瑙勬牸鍨嬪彿锛�</text>{{item['瑙勬牸鍨嬪彿']}}
                         </view>
                     </view>
@@ -192,7 +192,7 @@
                 uni.navigateBack()
             },
             cmdAdd() {
-                uni.navigateTo({
+                uni.redirectTo({
                     url: "/pages/ZLGL/shoujianjianyan/form?operationType=1"
                 })
             },
@@ -207,7 +207,7 @@
                 }
                 try {
                     let res = await CommonUtils.doRequest2Sync({
-                        url: '/QC_POStockInCheckBill/GetPOStockInCheckBill',
+                        url: '/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList',
                         data: {
                             "sWhere": sWhere,
                             "user": getUserInfo()["Czymc"]
@@ -301,7 +301,7 @@
                             console.log('鐢ㄦ埛鐐瑰嚮纭畾');
                             try {
                                 let res = await CommonUtils.doRequest2Sync({
-                                    url: '/Sc_MouldConkBookBill/DeltetMouldConkBookBill',
+                                    url: '/DeltetQC_FirstPieceCheck',
                                     data: {
                                         "HInterID": item.hmainid,
                                         "user": getUserInfo()["Czymc"]
@@ -344,12 +344,11 @@
             edit(item) {
                 console.log("editItem:", item)
                 uni.navigateTo({
-                    url: `/pages/ZLGL/shoujianjianyan/form?operationType=2&linterid=${item.hmainid}`
+                    url: `/pages/ZLGL/shoujianjianyan/form?operationType=3&linterid=${item.hmainid}`
                 })
             }
         },
-        onLoad() {
-
+        onShow() {
             this.$nextTick(() => {
                 this.cmdSearch()
             })
diff --git a/pages/ZLGL/xunjianjianyan/form.vue b/pages/ZLGL/xunjianjianyan/form.vue
new file mode 100644
index 0000000..02ca5ed
--- /dev/null
+++ b/pages/ZLGL/xunjianjianyan/form.vue
@@ -0,0 +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>
+            <!-- 涓昏〃鍐呭 -->
+            <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" 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" :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">
+                            <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"></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">
+                            <input type="number" v-model="hform.HICMOQty" />
+                        </view>
+                    </view>
+                    <view class="form-item">
+                        <view class="left">娴佽浆鍗″彿</view>
+                        <view class="right disabled">
+                            <input type="text" :value="hform.HProcExchBillNo" disabled />
+                        </view>
+                        <view class="icon-wrapper-big"><uni-icons type="search" size="20"
+                                @click="showSelectorModule(hform, 6)"></uni-icons></view>
+                    </view>
+                    <view class="form-item">
+                        <view class="left">娴佽浆鍗℃暟閲�</view>
+                        <view class="right">
+                            <input type="number" v-model="hform.HProcExchQty" />
+                        </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">
+                            <input type="text" value="" />
+                        </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">
+                            <input type="text" value="" />
+                        </view>
+                    </view>
+                    <view class="form-item">
+                        <view class="left">寮傚父涓存椂澶勭悊鏂规</view>
+                        <view class="right">
+                            <input type="text" value="" />
+                        </view>
+                    </view>
+                </view>
+                <!-- 鍒跺崟淇℃伅 -->
+                <view class="bill-main-content" v-if="mainTabSelected == 2">
+                    <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="{
+                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>
+</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,
+
+                mainTabSelected: 1,
+                subTabSelected: 1,
+                
+                // 婧愬崟鐘舵�佹帶鍒�
+                hasSourceBill: false,
+
+                // 鎺у埗褰撳墠鏄剧ず鐨勫脊绐楁ā鍧�
+                enablePopupModule: "",
+                PopupModuleNameList: [
+                    "",
+                    "SampleScheme",
+                    "CheckItem",
+                    "InspectMent",
+                    "Material",
+                    "ICMOBill",
+                    "ProcExchBill",
+                    "QCScheme",
+                    "Process",
+                ],
+                // 褰撳墠鎿嶄綔鐨勬楠屽崟ID缂撳瓨
+                currentChechItemIDCache: -1,
+
+                // 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: "鎶芥牱妫�楠�",
+                    },
+                },
+
+                // 婧愬崟绫诲瀷
+                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: "",
+
+                    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(HBarCode);
+                    }
+                });
+            },
+            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;
+
+                        if (count != 1) {
+                            CommonUtils.showTips({
+                                title: "娓╅Θ鎻愮ず",
+                                message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${Message}`,
+                            });
+                            return;
+                        }
+
+                        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"],
+                        },
+                    });
+
+                    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].鎵瑰彿;
+                    
+                    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;
+
+                    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;
+
+                    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"],
+                        },
+                    });
+
+                    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].褰撳墠宸ュ簭;
+                    
+                    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"),
+                        },
+                    });
+
+                    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;
+                }
+
+                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;
+
+                    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"],
+                        },
+                    });
+
+                    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;
+                }
+
+                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.$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++;
+                    }
+                }
+
+                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]);
+
+                    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;
+                }
+
+                sWhere = " and 宸ュ簭娴佽浆鍗′富鍐呯爜='" + HProcExchInterID + "' and HProcID=" + HProcID;
+
+                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}`,
+                        });
+                    }
+
+                    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;
+                }
+
+                sWhere += " and HSourceInterID=" + HProcExchInterID;
+
+                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}`,
+                        });
+                    }
+
+                    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",
+                        data: {
+                            CheckProjectID: this.hform.HQCSchemeID || 0,
+                            HBatchQty: this.hform.HProcExchQty || 0,
+                        },
+                    });
+
+                    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,
+                            };
+
+                            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;
+                    }
+
+                    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();
+
+            },
+            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;
+                }
+
+                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;
+                    }
+                }
+
+                return true;
+            },
+            async submit() {
+                if (!this.checkSubmitValidate()) {
+                    return;
+                }
+                try {
+                    console.log('this.$refs: ',this.$refs);
+                    // 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
+                    if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules.length > 0) {
+                        // 鍔犺浇鏈夋楠屽�兼ā鍧�
+                        await this.$refs.InspectValueModules[0].set_SaveValue();
+                        this.InspectValues[0] = this.$refs.InspectValueModules[0].InSpectValues;
+                        await this.InspectValueComplete(this.$refs.InspectValueModules[0].checkData)
+                    }
+                    let InspectValuesTrans = [];
+                    let HInterID = this.hform.HInterID;
+                    for (let key in this.InspectValues) {
+                        let HEntryID = key;
+
+                        InspectValuesTrans.push(
+                            `${JSON.stringify(this.InspectValues[key])}`
+                        );
+                    }
+                    let checkItemsArray = [];
+                    for (var key in this.checkItems) {
+                        let checkItem = JSON.parse(JSON.stringify(this.checkItems[key])) 
+                        delete checkItem.data
+                        checkItemsArray.push(checkItem);
+                    }
+                    console.log('checkItemsArray: ',checkItemsArray);
+                    let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(
+          checkItemsArray
+        )};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0]}`;
+                    console.log("this.checkItems: ", this.checkItems);
+
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: "/QC_PatrolProcCheckOtherBill/set_SaveBill",
+                        data: {
+                            sMainSub: sMainSub,
+                        },
+                        method: "POST",
+                    });
+
+                    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/form?operationType=1",
+                                    });
+                                } else if (res.cancel) {
+                                    console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
+                                    // setTimeout(() => {
+                                    //     uni.navigateBack();
+                                    // }, 50)
+                                }
+                            },
+                        });
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `宸℃妫�楠屽崟淇濆瓨閿欒: ${Message}`,
+                        });
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `宸℃妫�楠屽崟淇濆瓨閿欒: ${err}`,
+                    });
+                }
+            },
+            addNew() {
+                uni.redirectTo({
+                    url: "/pages/ZLGL/xunjianjianyan/form?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;
+
+                    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].妫�楠岀粨鏋�
+                            });
+                            
+                        }
+                        
+                        
+                        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();
+        },
+    };
+</script>
+
+<style lang="scss" scoped>
+    input {
+        width: inherit;
+        font-size: 26rpx;
+    }
+
+    .uni-input {
+        padding: 0;
+    }
+
+    .bill-main-tabs,
+    .bill-sub-tabs {
+        box-sizing: border-box;
+        width: 730rpx;
+        display: flex;
+        flex-direction: row;
+        flex-wrap: nowrap;
+        gap: 20rpx;
+        flex-shrink: 0;
+        overflow-x: auto;
+        border-bottom: 1px solid #ddd;
+        padding: 20rpx 10rpx;
+        white-space: nowrap;
+
+        view {
+            width: auto;
+            font-size: 26rpx;
+            color: #555;
+            text-align: center;
+            padding: 16rpx 0;
+        }
+
+        .selected {
+            color: #3a78ff;
+            font-weight: bold;
+            border-bottom: 3px solid #3a78ff;
+        }
+    }
+
+    .bill-main-content,
+    .bill-sub-content {
+        box-sizing: border-box;
+        padding: 0 30rpx 0 30rpx;
+        display: flex;
+        flex-direction: column;
+
+        .form-item {
+            width: 100%;
+            display: flex;
+            align-items: center;
+            font-size: 26rpx;
+            padding: 6rpx 0;
+
+            .left {
+                width: 208rpx;
+
+                text {
+                    color: red;
+                    font-weight: bold;
+                }
+            }
+
+            .right {
+                // width: 450rpx;
+                padding: 8rpx 20rpx;
+                font-size: 26rpx;
+                flex: 1;
+                border-radius: 22rpx;
+                border: 1px solid #acacac;
+
+                .uni-combox {
+                    padding: 0;
+                    height: auto;
+
+                    .uni-input-placeholder,
+                    .uni-input-input {
+                        font-size: 26rpx;
+                    }
+                }
+
+                .uni-combox::v-deep input {
+                    height: inherit;
+                    font-size: 26rpx;
+                }
+            }
+
+            .disabled {
+                border: 1px solid #e4e4e4;
+                background-color: #e4e4e4;
+            }
+
+            .none-border {
+                border: none;
+            }
+        }
+    }
+
+    .bottom-btn {
+        box-sizing: border-box;
+        width: 100%;
+        height: 120rpx;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        background-color: #fff;
+        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+        padding: 30rpx 40rpx 40rpx 40rpx;
+        display: flex;
+        flex-direction: row;
+        gap: 10rpx;
+
+        button {
+            border-radius: 50rpx;
+            width: 180rpx;
+            height: 66rpx;
+            line-height: 66rpx;
+            font-size: 28rpx;
+        }
+
+        .btn-a {
+            background-color: #3a78ff;
+            color: #fff;
+        }
+
+        .btn-b {
+            background-color: #41a863;
+            color: #fff;
+        }
+
+        .btn-c {
+            background-color: #acacac;
+            color: #fff;
+            // position: absolute;
+            // right: 120rpx;
+        }
+
+        .btn-d {
+            background-color: #ff8901;
+            color: #fff;
+        }
+    }
+
+    .buttons {
+        box-sizing: border-box;
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        padding: 10rpx 0;
+
+        button {
+            border-radius: 50rpx;
+            width: 180rpx;
+            height: 66rpx;
+            line-height: 66rpx;
+            font-size: 26rpx;
+        }
+
+        .btn-a {
+            background-color: #acacac;
+            color: #fff;
+        }
+
+        .btn-b {
+            background-color: #41a863;
+            color: #fff;
+        }
+
+        .btn-c {
+            background-color: #3a78ff;
+            color: #fff;
+        }
+    }
+
+    .list {
+        width: 100%;
+
+        .card-detail {
+            width: 100%;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            align-items: center;
+            line-height: 120%;
+            gap: 10rpx 0;
+
+            input {
+                font-size: 26rpx;
+            }
+
+            .detail {
+                // width: 50%;
+                box-sizing: border-box;
+                font-size: 26rpx;
+                color: #555;
+                padding-right: 20rpx;
+
+                text {
+                    color: #999;
+                    font-size: 26rpx;
+                }
+            }
+
+            .editable {
+                width: 50%;
+                display: inline-flex;
+                flex-direction: row;
+                align-items: center;
+
+                text {
+                    flex-shrink: 0;
+                }
+
+                .sampleDestory {
+                    border: 1px solid #acacac;
+                    border-radius: 10%;
+                    padding: 0 12rpx;
+                }
+            }
+        }
+    }
+
+    .icon-wrapper {
+        background-color: #3a78ff;
+        border-radius: 100%;
+        width: 40rpx;
+        height: 40rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex-shrink: 0;
+
+        .uni-icons {
+            color: #fff !important;
+        }
+    }
+
+    .icon-wrapper-big {
+        background-color: #3a78ff;
+        border-radius: 100%;
+        width: 50rpx;
+        height: 50rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex-shrink: 0;
+        margin-left: 20rpx;
+
+        .uni-icons {
+            color: #fff !important;
+        }
+    }
+
+    .more {
+        color: #888;
+        font-size: 22rpx;
+        display: flex;
+        border-top: 1px solid #eee;
+        padding-top: 10rpx;
+
+        .part {
+            width: 100%;
+            text-align: center;
+        }
+    }
+
+    .pass-background {
+        background-color: #cee3f2;
+        border: none;
+    }
+
+    .unpass-background {
+        background-color: #f0d6e3;
+        border: none;
+    }
+</style>
\ No newline at end of file
diff --git a/pages/ZLGL/xunjianjianyan/table.vue b/pages/ZLGL/xunjianjianyan/table.vue
new file mode 100644
index 0000000..9c218e8
--- /dev/null
+++ b/pages/ZLGL/xunjianjianyan/table.vue
@@ -0,0 +1,572 @@
+<template>
+    <view class="page" id="pageContent">
+        <view class="search-condition-zone">
+            <view class="form-item">
+                <view class="left">
+                    鏃ユ湡:
+                </view>
+                <view class="daterange" style="flex: 1;">
+                    <view class="right general">
+                        <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
+                            <view>{{hform.HBeginDate}}</view>
+                        </uni-datetime-picker>
+                    </view>
+                    <view>鈥�</view>
+                    <view class="right general">
+                        <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HEndDate">
+                            <view>{{hform.HEndDate}}</view>
+                        </uni-datetime-picker>
+                    </view>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="left">
+                    鍗曟嵁鍙�:
+                </view>
+                <view class="right general">
+                    <input type="text" v-model="hform.HBillNo" />
+                </view>
+            </view>
+        </view>
+        <view class="button-zone">
+            <button type="default" class="btn-a" size="mini" @tap="cmdAdd">鏂板</button>
+            <button type="default" class="btn-a" size="mini" @tap="cmdSearch">鏌ヨ</button>
+            <button type="default" class="btn-c" size="mini" @tap="exit">閫�鍑�</button>
+        </view>
+        <view class="info-list-zone" id="scroll-content" :style="{height: scrollContentHeight + 'px'}">
+            <view class="card-item" v-for="(item, index) in listData">
+                <uni-card :title="item['鍗曟嵁鍙�']" :extra="'鏃ユ湡:' + item['鏃ユ湡'].split('T')[0]"
+                    @tap="showDetail = showDetail==index?-1:index">
+                    <view class="card-detail">
+                        <view class="detail" v-if="item['鍗曟嵁绫诲瀷']">
+                            <text>鍗曟嵁绫诲瀷锛�</text>{{item['鍗曟嵁绫诲瀷']}}
+                        </view>
+                        <view class="detail" v-if="item['鍗曟嵁鐘舵��']">
+                            <text>鍗曟嵁鐘舵�侊細</text>{{item['鍗曟嵁鐘舵��']}}
+                        </view>
+                        <view class="detail" v-if="item['鍒ゆ柇缁撹']">
+                            <text>鍒ゆ柇缁撹锛�</text>{{item['鍒ゆ柇缁撹']}}
+                        </view>
+                        <view class="detail" v-if="item['鐗╂枡浠g爜']">
+                            <text>鐗╂枡浠g爜锛�</text>{{item['鐗╂枡浠g爜']}}
+                        </view>
+                        <view class="detail" v-if="item['鐗╂枡鍚嶇О']">
+                            <text>鐗╂枡鍚嶇О锛�</text>{{item['鐗╂枡鍚嶇О']}}
+                        </view>
+                        <view class="detail" v-if="item['瑙勬牸鍨嬪彿']">
+                            <text>瑙勬牸鍨嬪彿锛�</text>{{item['瑙勬牸鍨嬪彿']}}
+                        </view>
+                        <view class="detail" v-if="item['妫�楠屾柟妗�']">
+                            <text>妫�楠屾柟妗堬細</text>{{item['妫�楠屾柟妗�']}}
+                        </view>
+                        <view class="detail" v-if="item['瑙勬牸鍨嬪彿']">
+                            <text>瑙勬牸鍨嬪彿锛�</text>{{item['瑙勬牸鍨嬪彿']}}
+                        </view>
+                    </view>
+                    <view class="card-detail" v-if="showDetail == index">
+                        <view class="detail" v-if="item['璐ㄦ鍛�']">
+                            <text>璐ㄦ鍛橈細</text>{{item['璐ㄦ鍛�']}}
+                        </view>
+                        <view class="detail" v-if="item['閮ㄩ棬']">
+                            <text>閮ㄩ棬锛�</text>{{item['閮ㄩ棬']}}
+                        </view>
+                        <view class="detail" v-if="item['鐢熶骇璁㈠崟']">
+                            <text>鐢熶骇璁㈠崟锛�</text>{{item['鐢熶骇璁㈠崟']}}
+                        </view>
+                        <view class="detail" v-if="item['宸ュ簭娴佽浆鍗″彿']">
+                            <text>宸ュ簭娴佽浆鍗″彿锛�</text>{{item['宸ュ簭娴佽浆鍗″彿']}}
+                        </view>
+                        <view class="detail" v-if="item['鐢熶骇璧勬簮鍚嶇О']">
+                            <text>鐢熶骇璧勬簮鍚嶇О锛�</text>{{item['鐢熶骇璧勬簮鍚嶇О']}}
+                        </view>
+                        <view class="detail" v-if="item['鍒涘缓浜�']">
+                            <text>鍒涘缓浜猴細</text>{{item['鍒涘缓浜�']}}
+                        </view>
+                        <view class="detail" v-if="item['瀹℃牳浜�']">
+                            <text>瀹℃牳浜猴細</text>{{item['瀹℃牳浜�']}}
+                        </view>
+                        <view class="detail" v-if="item['缁勭粐鍚嶇О']">
+                            <text>缁勭粐鍚嶇О锛�</text>{{item['缁勭粐鍚嶇О']}}
+                        </view>
+                        <view class="detail" v-if="item['澶囨敞']">
+                            <text>澶囨敞锛�</text>{{item['澶囨敞']}}
+                        </view>
+                        <view class="detail" v-if="item['婧愬崟鍙�']">
+                            <text>婧愬崟鍙凤細</text>{{item['婧愬崟鍙�']}}
+                        </view>
+                        <view class="detail" v-if="item['鍒跺崟鏃ユ湡']">
+                            <text>鍒跺崟鏃ユ湡锛�</text>{{item['鍒跺崟鏃ユ湡']}}
+                        </view>
+                        <view class="detail" v-if="item['瀹℃牳鏃ユ湡']">
+                            <text>瀹℃牳鏃ユ湡锛�</text>{{item['瀹℃牳鏃ユ湡']}}
+                        </view>
+
+                    </view>
+                    <view class="more" v-if="showDetail == index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+                    <view class="more" v-if="showDetail != index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+                    <view class="op" v-if="operations == index">
+                        <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
+                        <button class="op3" size="mini" plain @tap.stop="audit(item, 1)" v-if="!listData[index]['瀹℃牳浜�']">瀹℃牳</button>
+                        <button class="op3" size="mini" plain @tap.stop="audit(item, 2)" v-if="listData[index]['瀹℃牳浜�']">鍙嶅鏍�</button>
+                        <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+                        <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+                    </view>
+                </uni-card>
+            </view>
+            <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+        </view>
+
+        <view class="pagination-zone" id="pagination-zone">
+            <uni-pagination show-icon :page-size="paginationMeta.pageSize" :total="paginationMeta.total"
+                v-model="paginationMeta.current" @change="onPaginationChangeHandler"></uni-pagination>
+        </view>
+    </view>
+</template>
+
+<script>
+    import {
+        CommonUtils
+    } from '@/utils/common'
+    import {
+        getUserInfo
+    } from '@/utils/auth'
+    import dayjs, {
+        Dayjs
+    } from 'dayjs'
+    export default {
+        data() {
+            return {
+
+                navHeight: 0,
+                scrollTop: 0,
+
+                showDetail: -1,
+                operations: -1,
+
+                hform: {
+                    HBeginDate: dayjs(new Date).subtract(30, 'd').format('YYYY-MM-DD'),
+                    HEndDate: dayjs(new Date).format('YYYY-MM-DD'),
+                    HBillNo: ''
+                },
+
+                paginationMeta: {
+                    current: 1,
+                    total: 0,
+                    // pageSize: 30,
+                    pageSize: 10,
+                },
+
+                pageMeta: {
+                    scrollContentTop: 0,
+                    bottomBtnTop: 0,
+                },
+
+                listData: [],
+                listDataShow: [],
+            }
+        },
+        computed: {
+            scrollContentHeight: {
+                get() {
+                    return this.pageMeta.bottomBtnTop - this.pageMeta.scrollContentTop
+                }
+            }
+        },
+        methods: {
+            exit() {
+                uni.navigateBack()
+            },
+            cmdAdd() {
+                uni.navigateTo({
+                    url: "/pages/ZLGL/xunjianjianyan/form?operationType=1"
+                })
+            },
+            async cmdSearch() {
+                let sWhere = ''
+                if (this.hform.HBeginDate != "" && this.hform.HEndDate != "") {
+                    sWhere += " and  CONVERT(varchar(100),鏃ユ湡, 23) between '" + this.hform.HBeginDate + "' and '" +
+                        this.hform.HEndDate + "' ";
+                }
+                if (this.hform.HBillNo != "") {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'"
+                }
+                try {
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: '/QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillListPage',
+                        data: {
+                            "sWhere": sWhere,
+                            "user": getUserInfo()["Czymc"],
+                            "page": this.paginationMeta.current,
+                            "size": this.paginationMeta.pageSize
+                        },
+                    })
+
+                    if (!res) {
+                        return
+                    }
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count > 0) {
+                        this.listData = data
+                        this.paginationMeta.total = count
+                        
+                    } else {
+                        uni.showToast({
+                            icon: 'none',
+                            title: Message
+                        })
+                    }
+                } catch (err) {
+                    console.warn(err);
+                    uni.showToast({
+                        title: '鎺ュ彛璇锋眰澶辫触:' + err,
+                        icon: 'none'
+                    })
+                }
+            },
+            async onPaginationChangeHandler({
+                current
+            }) {
+                
+                this.paginationMeta.current = current
+                this.cmdSearch()
+
+            },
+            async audit(item, mode) {
+                console.log('瀹℃牳鍗曟嵁: ',item);
+                
+                try{
+                    let res = await CommonUtils.doRequest2Sync({
+                        method: 'GET',
+                        url: '/QC_PatrolProcCheckOtherBill/AuditQC_PatrolProcCheckOtherBill',
+                        data: {
+                            HInterID: item["hmainid"],
+                            type: mode,
+                            user: getUserInfo()["Czymc"]
+                        }
+                    })
+                    
+                    if(!res) {
+                        return
+                    }
+                    
+                    let {count, data, Message} = res.data
+                    
+                    if(count == 1) {
+                        CommonUtils.showTips({
+                            message: `${item["瀹℃牳浜�"]?'鍙嶅鏍�':'瀹℃牳'}鎴愬姛`
+                        })
+                        this.$forceUpdate()
+                        setTimeout(() => {
+                            this.cmdSearch()
+                        }, 2000)
+                    }else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鍗曟嵁${item["瀹℃牳浜�"]?'鍙嶅鏍�':'瀹℃牳'}澶辫触: ${Message}`
+                        })
+                    }
+                }catch(err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鍗曟嵁${item["瀹℃牳浜�"]?'鍙嶅鏍�':'瀹℃牳'}閿欒: ${err}`
+                    })
+                }
+            },
+            async del(item) {
+                console.log("delItem: ", item);
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+                    success: async (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            try {
+                                let res = await CommonUtils.doRequest2Sync({
+                                    url: '/QC_PatrolProcCheckOtherBill/DeltetQC_PatrolProcCheckOtherBill',
+                                    data: {
+                                        "HInterID": item.hmainid,
+                                        "user": getUserInfo()["Czymc"]
+                                    }
+                                })
+
+                                if (!res) {
+                                    return
+                                }
+
+                                let {
+                                    count,
+                                    code,
+                                    Message
+                                } = res.data
+                                if (count == 0) {
+                                    return uni.showModal({
+                                        title: '閿欒鎻愮ず',
+                                        content: `鍒犻櫎閿欒: ${Message}`,
+                                        showCancel: false
+                                    })
+                                }
+                                uni.showToast({
+                                    title: '鍒犻櫎鎴愬姛',
+                                    icon: 'none'
+                                })
+                                this.cmdSearch()
+                            } catch (err) {
+                                uni.showModal({
+                                    title: '閿欒鎻愮ず',
+                                    content: `鎺ュ彛璇锋眰澶辫触: ${err}`,
+                                    showCancel: false
+                                })
+                            }
+                        }
+                    },
+                })
+
+            },
+            edit(item) {
+                console.log("editItem:", item)
+                uni.navigateTo({
+                    url: `/pages/ZLGL/xunjianjianyan/form?operationType=3&linterid=${item.hmainid}`
+                })
+            }
+        },
+        onShow() {
+            this.$nextTick(() => {
+                this.cmdSearch()
+            })
+        },
+        onReady() {
+            // #ifndef MP-WEIXIN
+            let query = uni.createSelectorQuery().in(this)
+            query.select("#scroll-content").boundingClientRect((data) => {
+                this.pageMeta.scrollContentTop = data.top
+            }).exec()
+            query.select("#pagination-zone").boundingClientRect((data) => {
+                this.pageMeta.bottomBtnTop = data.top
+            }).exec()
+            // #endif
+            // #ifdef MP-WEIXIN
+            // 寰俊涓嶆敮鎸� uni.createSelectorQuery().in(this)
+            // #endif
+
+        },
+    }
+</script>
+
+<style lang="scss" scoped>
+    .page {
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        gap: 20rpx;
+        padding: 20rpx 0;
+        position: relative;
+
+        .button-zone {
+            height: auto;
+            box-sizing: border-box;
+            padding-top: 20rpx;
+            display: flex;
+            flex-direction: row;
+            justify-content: space-between;
+            flex-wrap: wrap;
+
+            button {
+                border-radius: 50rpx;
+                width: 180rpx;
+                height: 66rpx;
+                line-height: 66rpx;
+                font-size: 28rpx;
+            }
+
+            .btn-a {
+                background-color: #3a78ff;
+                color: #fff;
+            }
+
+            .btn-c {
+                background-color: #ff5722;
+                color: #fff;
+            }
+        }
+
+        .search-condition-zone {
+            height: auto;
+            box-sizing: border-box;
+            padding: 0 60rpx;
+            display: flex;
+            flex-direction: column;
+            gap: 20rpx;
+
+            .form-item {
+                display: flex;
+                flex-direction: row;
+                gap: 20rpx;
+                align-items: center;
+                font-size: 28rpx;
+
+                .left {
+                    width: 4rem;
+                }
+
+                .right {
+                    flex: 1;
+                    padding: 8rpx 16rpx;
+
+                    .search {
+                        width: 28rpx;
+                        height: 28rpx;
+                    }
+
+                    input {
+                        font-size: 28rpx;
+                    }
+
+                    .uni-combox {
+                        padding: 0;
+                        margin: 0;
+
+                        ::v-deep .uni-combox__input {
+                            font-size: 28rpx;
+                            height: auto;
+                        }
+                    }
+                }
+
+                .general {
+                    border-radius: 22rpx;
+                    border: 1px solid #acacac;
+                }
+
+                .disabled {
+                    border-radius: 22rpx;
+                    border: 1px solid #e4e4e4;
+                    background-color: #e4e4e4;
+                }
+            }
+        }
+
+        .info-list-zone {
+            overflow-y: auto;
+
+            .card-item {
+                .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;
+                        }
+                    }
+                }
+            }
+        }
+
+        .daterange {
+            display: flex;
+            flex-direction: row;
+            gap: 10rpx;
+            justify-content: center;
+            align-items: center;
+        }
+
+        .more {
+            color: #888;
+            font-size: 24rpx;
+            display: flex;
+            border-top: 1px solid #eee;
+            padding-top: 20rpx;
+
+            .part {
+                width: 50%;
+                text-align: center;
+            }
+        }
+
+        .op {
+            display: flex;
+            justify-content: space-between;
+            gap: 20rpx;
+            margin-top: 20rpx;
+            flex-wrap: wrap;
+            align-content: flex-start;
+            button {
+                margin: 0;
+                flex-shrink: 0;
+                padding: 0;
+                width: 150rpx;
+                flex-basis: 150rpx;
+                font-size: 25rpx;
+            }
+
+            .op1 {
+                border: 1px solid #41a863;
+                color: #41a863;
+            }
+
+            .op2 {
+                border: 1px solid #d98d00;
+                color: #d98d00;
+            }
+
+            .op3 {
+                border: 1px solid #3a78ff;
+                color: #3a78ff;
+            }
+
+            .op4 {
+                border: 1px solid #da0000;
+                color: #da0000;
+            }
+
+            .op5 {
+                border: 1px solid #888;
+                color: #888;
+            }
+        }
+
+        .pagination-zone {
+            position: fixed;
+            bottom: 0;
+            box-sizing: border-box;
+            background-color: #fff;
+            box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+            padding: 20rpx 40rpx 20rpx 40rpx;
+            display: flex;
+            flex-direction: column;
+            gap: 20rpx;
+            justify-content: space-between;
+            width: 100%;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6528138..9c2ef99 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,251 +1,251 @@
 <template>
-    <view class="content">
-        <view class="header">鏅轰簯L-MES鍒堕�犳墽琛岀郴缁�
-            <view class="switch-button">
-                <uni-icons type="loop" @click="switchIconsModeHandler"></uni-icons>
-            </view>
-        </view>
-        <view class="mains">
-            <view v-if="!canEdit" :hidden="item.hidden" class="box" v-for="(item,index) in itemData" :key="index"
-                @tap="toUrl(item)">
-                <image :src="item.img" mode=""></image>
-                <view class="texts">
-                    {{item.text}}
-                </view>
-            </view>
-            <view :enable-hidden="item.hidden" v-if="canEdit" class="box edit" v-for="(item,index) in itemData"
-                :key="index" @tap="switchHidden(index)">
-                <uni-icons class="edit-mark" color="red" type="closeempty"></uni-icons>
-                <image :src="item.img" mode=""></image>
-                <view class="texts">
-                    {{item.text}}
-                </view>
-            </view>
-        </view>
+	<view class="content">
+		<view class="header">鏅轰簯L-MES鍒堕�犳墽琛岀郴缁�
+			<view class="switch-button">
+				<uni-icons type="loop" @click="switchIconsModeHandler"></uni-icons>
+			</view>
+		</view>
+		<view class="mains">
+			<view v-if="!canEdit" :hidden="item.hidden" class="box" v-for="(item,index) in itemData" :key="index"
+				@tap="toUrl(item)">
+				<image :src="item.img" mode=""></image>
+				<view class="texts">
+					{{item.text}}
+				</view>
+			</view>
+			<view :enable-hidden="item.hidden" v-if="canEdit" class="box edit" v-for="(item,index) in itemData"
+				:key="index" @tap="switchHidden(index)">
+				<uni-icons class="edit-mark" color="red" type="closeempty"></uni-icons>
+				<image :src="item.img" mode=""></image>
+				<view class="texts">
+					{{item.text}}
+				</view>
+			</view>
+		</view>
 
-        <vers></vers>
-    </view>
+		<vers></vers>
+	</view>
 </template>
 
 <script>
-    import vers from './vers.vue';
-    import {
-        setMenuList,
-        getMenuList
-    } from '../../utils/menuListApp';
-    import {
-        CommonUtils
-    } from '../../utils/common';
-    import {
-        getUserInfo
-    } from '../../utils/auth';
-    export default {
-        components: {
-            vers,
-        },
-        data() {
-            return {
-                updateCount: 0,
-                menuListName: 'index',
-                canEdit: false,
-                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-                itemData: [{
-                        img: '../../static/icon/icon8.png',
-                        text: '鏀舵枡閫氱煡鍗曟潯鐮佹墦鍗�',
-                        url: '/pages/tiaomaguanli/table?HBillType=1103',
-                        id: 1,
-                        hidden: false,
-                    },
-                    {
-                        img: '../../static/icon/icon8.png',
-                        text: '閲囪喘璁㈠崟鏉$爜鎵撳嵃',
-                        url: '/pages/tiaomaguanli/table?HBillType=1102',
-                        id: 2,
-                        hidden: false,
-                    },
+	import vers from './vers.vue';
+	import {
+		setMenuList,
+		getMenuList
+	} from '../../utils/menuListApp';
+	import {
+		CommonUtils
+	} from '../../utils/common';
+	import {
+		getUserInfo
+	} from '../../utils/auth';
+	export default {
+		components: {
+			vers,
+		},
+		data() {
+			return {
+				updateCount: 0,
+				menuListName: 'index',
+				canEdit: false,
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				itemData: [{
+						img: '../../static/icon/icon8.png',
+						text: '鏀舵枡閫氱煡鍗曟潯鐮佹墦鍗�',
+						url: '/pages/tiaomaguanli/table?HBillType=1103',
+						id: 1,
+						hidden: false,
+					},
+					{
+						img: '../../static/icon/icon8.png',
+						text: '閲囪喘璁㈠崟鏉$爜鎵撳嵃',
+						url: '/pages/tiaomaguanli/table?HBillType=1102',
+						id: 2,
+						hidden: false,
+					},
 
-                    // {
-                    //     img: '../../static/icon/icon8.png',
-                    //     text: '鎵爜鍑哄簱',
-                    //     url: '/pages/saomachuku/table',
-                    //     id: 1,
-                    //     hidden: false,
-                    // }, 
-                    // {
-                    //     img: '../../static/icon/icon8.png',
-                    //     text: '閲囪喘璁㈠崟鏍囩',
-                    //     url: '/pages/caigoudingdan/caigoudingdan',
-                    //     id: 1,
-                    //     hidden: true,
-                    // },
-                    // {
-                    //     img: '../../static/icon/icon4.png',
-                    //     text: '閲囪喘璁㈠崟瀛愭爣绛�',
-                    //     url: '/pages/tiaomadaying/tiaomadaying',
-                    //     id: 2,
-                    //     hidden: true,
-                    // },
-                    {
-                        img: '../../static/icon/icon11.png',
-                        text: '鏀舵枡閫氱煡鍗曟爣绛�',
-                        url: '/pages/shouliaotongzhi/table',
-                        id: 3,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon17.png',
-                        text: '閲囪喘鍏ュ簱鏂板',
-                        url: '/pages/caigouruku/form?OperationType=1',
-                        id: 4,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon20.png',
-                        text: '閲囪喘閫�鏂欐柊澧�',
-                        url: '/pages/caigoutuiliao/form?OperationType=1',
-                        id: 5,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon32.png',
-                        text: '鐩存帴璋冩嫧鏂板',
-                        url: '/pages/zhijiediaobo/form?OperationType=1',
-                        id: 6,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon30.png',
-                        text: '鐢熶骇棰嗘枡鏂板',
-                        url: '/pages/shengchanlingliaoshengdan/form?OperationType=1',
-                        id: 7,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon31.png',
-                        text: '鐢熶骇琛ユ枡鏂板',
-                        url: '/pages/shengchanbuliao/form?OperationType=1',
-                        id: 8,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon8.png',
-                        text: '鐢熶骇閫�鏂欐柊澧�',
-                        url: `/pages/shengchantuiliao/form`,
-                        id: 27,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon17.png',
-                        text: '鐢熶骇鍏ュ簱鏂板',
-                        url: '/pages/shengchanrukushengdan/form?OperationType=1',
-                        id: 9,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon30.png',
-                        text: '濮斿棰嗘枡鏂板',
-                        url: '/pages/weiwailingliao/form?OperationType=1',
-                        id: 10,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon17.png',
-                        text: '鍏朵粬鍏ュ簱鏂板',
-                        url: '/pages/qitaruku_v2/form?OperationType=1',
-                        id: 11,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon18.png',
-                        text: '鍏朵粬鍑哄簱鏂板',
-                        url: '/pages/qitachuku_v2/form?OperationType=1',
-                        id: 12,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon18.png',
-                        text: '閿�鍞嚭搴撴柊澧�',
-                        url: '/pages/xiaoshouchuku/form?OperationType=1',
-                        id: 13,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon19.png',
-                        text: '閿�鍞��璐ф柊澧�',
-                        url: '/pages/xiaoshoutuihuo/form?OperationType=1',
-                        id: 14,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon19.png',
-                        text: '濮斿鍏ュ簱鏂板',
-                        url: '/pages/weiwairuku/form?OperationType=1',
-                        id: 15,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon30.png',
-                        text: '鐢熶骇棰嗘枡妫�楠�',
-                        url: '/pages/shengchanlingliao/form?OperationType=1',
-                        id: 16,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon31.png',
-                        text: '鐢熶骇琛ユ枡鏍¢獙',
-                        url: '/pages/shengchanbuliaojiaoyan/form?OperationType=1',
-                        id: 17,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon32.png',
-                        text: '鐢熶骇璋冩嫧鏍¢獙',
-                        url: '/pages/shengchandiaobo/form?OperationType=1',
-                        id: 18,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon18.png',
-                        text: '鍏朵粬鍑哄簱鏍¢獙',
-                        url: '/pages/qitachukujiaoyan/detail?OperationType=1',
-                        id: 19,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon17.png',
-                        text: '鐢熶骇鍏ュ簱鏍¢獙',
-                        url: '/pages/shengchanruku/form?OperationType=1',
-                        id: 20,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon18.png',
-                        text: '閿�鍞嚭搴撴牎楠�',
-                        url: '/pages/xiaoshouchukujiaoyan/form?OperationType=1',
-                        id: 21,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon30.png',
-                        text: '濮斿棰嗘枡鏍¢獙',
-                        url: '/pages/weiwailingliaojiaoyan/form?OperationType=1',
-                        id: 22,
-                        hidden: false,
-                    },
-                    {
-                        img: '../../static/icon/icon16.png',
-                        text: '閲囪喘鍏ュ簱鏍¢獙',
-                        url: '/pages/caigourukujiaoyan/form?OperationType=1',
-                        id: 23,
-                        hidden: false,
-                    },
-                    {
-                        img: '../../static/icon/icon16.png',
-                        text: '鍏朵粬鍏ュ簱鏍¢獙',
-                        url: '/pages/qitarukujiaoyan/table',
-                        id: 27,
-                        hidden: false,
-                    },
-                    {
-                        img: '../../static/icon/icon8.png',
-                        text: '妫�楠屾姤鍛�',
-                        url: `/pages/InnerHtmlPage/index?src=http://172.16.72.15:8999/index.aspx?name=${getUserInfo()['HICNumber']}&pageTitle=妫�楠屾姤鍛�&pageMode=horizontal`,
-                        id: 24,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon8.png',
-                        text: '缁勬墭鎵爜',
-                        url: `/pages/zutuosaoma/form`,
-                        id: 25,
-                        hidden: false,
-                    },
-                    {
-                        img: '../../static/icon/icon8.png',
-                        text: '鎷嗘墭鎵爜',
-                        url: `/pages/chaituosaoma/form`,
-                        id: 26,
-                        hidden: false,
-                    },
+					// {
+					//     img: '../../static/icon/icon8.png',
+					//     text: '鎵爜鍑哄簱',
+					//     url: '/pages/saomachuku/table',
+					//     id: 1,
+					//     hidden: false,
+					// }, 
+					// {
+					//     img: '../../static/icon/icon8.png',
+					//     text: '閲囪喘璁㈠崟鏍囩',
+					//     url: '/pages/caigoudingdan/caigoudingdan',
+					//     id: 1,
+					//     hidden: true,
+					// },
+					// {
+					//     img: '../../static/icon/icon4.png',
+					//     text: '閲囪喘璁㈠崟瀛愭爣绛�',
+					//     url: '/pages/tiaomadaying/tiaomadaying',
+					//     id: 2,
+					//     hidden: true,
+					// },
+					{
+						img: '../../static/icon/icon11.png',
+						text: '鏀舵枡閫氱煡鍗曟爣绛�',
+						url: '/pages/shouliaotongzhi/table',
+						id: 3,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon17.png',
+						text: '閲囪喘鍏ュ簱鏂板',
+						url: '/pages/caigouruku/form?OperationType=1',
+						id: 4,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon20.png',
+						text: '閲囪喘閫�鏂欐柊澧�',
+						url: '/pages/caigoutuiliao/form?OperationType=1',
+						id: 5,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon32.png',
+						text: '鐩存帴璋冩嫧鏂板',
+						url: '/pages/zhijiediaobo/form?OperationType=1',
+						id: 6,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon30.png',
+						text: '鐢熶骇棰嗘枡鏂板',
+						url: '/pages/shengchanlingliaoshengdan/form?OperationType=1',
+						id: 7,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon31.png',
+						text: '鐢熶骇琛ユ枡鏂板',
+						url: '/pages/shengchanbuliao/form?OperationType=1',
+						id: 8,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon8.png',
+						text: '鐢熶骇閫�鏂欐柊澧�',
+						url: `/pages/shengchantuiliao/form`,
+						id: 27,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon17.png',
+						text: '鐢熶骇鍏ュ簱鏂板',
+						url: '/pages/shengchanrukushengdan/form?OperationType=1',
+						id: 9,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon30.png',
+						text: '濮斿棰嗘枡鏂板',
+						url: '/pages/weiwailingliao/form?OperationType=1',
+						id: 10,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon17.png',
+						text: '鍏朵粬鍏ュ簱鏂板',
+						url: '/pages/qitaruku_v2/form?OperationType=1',
+						id: 11,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon18.png',
+						text: '鍏朵粬鍑哄簱鏂板',
+						url: '/pages/qitachuku_v2/form?OperationType=1',
+						id: 12,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon18.png',
+						text: '閿�鍞嚭搴撴柊澧�',
+						url: '/pages/xiaoshouchuku/form?OperationType=1',
+						id: 13,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon19.png',
+						text: '閿�鍞��璐ф柊澧�',
+						url: '/pages/xiaoshoutuihuo/form?OperationType=1',
+						id: 14,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon19.png',
+						text: '濮斿鍏ュ簱鏂板',
+						url: '/pages/weiwairuku/form?OperationType=1',
+						id: 15,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon30.png',
+						text: '鐢熶骇棰嗘枡妫�楠�',
+						url: '/pages/shengchanlingliao/form?OperationType=1',
+						id: 16,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon31.png',
+						text: '鐢熶骇琛ユ枡鏍¢獙',
+						url: '/pages/shengchanbuliaojiaoyan/form?OperationType=1',
+						id: 17,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon32.png',
+						text: '鐢熶骇璋冩嫧鏍¢獙',
+						url: '/pages/shengchandiaobo/form?OperationType=1',
+						id: 18,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon18.png',
+						text: '鍏朵粬鍑哄簱鏍¢獙',
+						url: '/pages/qitachukujiaoyan/detail?OperationType=1',
+						id: 19,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon17.png',
+						text: '鐢熶骇鍏ュ簱鏍¢獙',
+						url: '/pages/shengchanruku/form?OperationType=1',
+						id: 20,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon18.png',
+						text: '閿�鍞嚭搴撴牎楠�',
+						url: '/pages/xiaoshouchukujiaoyan/form?OperationType=1',
+						id: 21,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon30.png',
+						text: '濮斿棰嗘枡鏍¢獙',
+						url: '/pages/weiwailingliaojiaoyan/form?OperationType=1',
+						id: 22,
+						hidden: false,
+					},
+					{
+						img: '../../static/icon/icon16.png',
+						text: '閲囪喘鍏ュ簱鏍¢獙',
+						url: '/pages/caigourukujiaoyan/form?OperationType=1',
+						id: 23,
+						hidden: false,
+					},
+					{
+						img: '../../static/icon/icon16.png',
+						text: '鍏朵粬鍏ュ簱鏍¢獙',
+						url: '/pages/qitarukujiaoyan/table',
+						id: 27,
+						hidden: false,
+					},
+					{
+						img: '../../static/icon/icon8.png',
+						text: '妫�楠屾姤鍛�',
+						url: `/pages/InnerHtmlPage/index?src=http://172.16.72.15:8999/index.aspx?name=${getUserInfo()['HICNumber']}&pageTitle=妫�楠屾姤鍛�&pageMode=horizontal`,
+						id: 24,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon8.png',
+						text: '缁勬墭鎵爜',
+						url: `/pages/zutuosaoma/form`,
+						id: 25,
+						hidden: false,
+					},
+					{
+						img: '../../static/icon/icon8.png',
+						text: '鎷嗘墭鎵爜',
+						url: `/pages/chaituosaoma/form`,
+						id: 26,
+						hidden: false,
+					},
 					{
 						img: '../../static/icon/icon16.png',
 						text: '鍒嗗竷寮忚皟鍏ュ崟',
@@ -253,13 +253,13 @@
 						id: 27,
 						hidden: false,
 					},
-                    {
-                    	img: '../../static/icon/icon16.png',
-                    	text: '鍒嗗竷寮忚皟鍏ュ崟缂撳瓨',
-                    	url: '/pages/fenbushidiaorudan/table',
-                    	id: 28,
-                    	hidden: false,
-                    },
+					{
+						img: '../../static/icon/icon16.png',
+						text: '鍒嗗竷寮忚皟鍏ュ崟缂撳瓨',
+						url: '/pages/fenbushidiaorudan/table',
+						id: 28,
+						hidden: false,
+					},
 					{
 						img: '../../static/icon/icon16.png',
 						text: '鍒嗗竷寮忚皟鍑哄崟',
@@ -286,358 +286,362 @@
 						url: '/pages/zutuo_xiaowei/form_xiaowei',
 						id: 32,
 						hidden: false,
+					},{
+						text: '瑁呯鍗�',
+						url: '/pages/zhuangxiangdan/form',
+						id: 30,
+						hidden: false,
 					},
 
+				],
+				// itemData: [{
+				// 		img: '../../static/icon/icon1.png',
+				// 		text: '璁惧妗f',
+				// 		url: '/pages/shebeidangan/table',
+				// 		id: 1
+				// 	}, {
+				// 		img: '../../static/icon/icon8.png',
+				// 		text: '璁惧灞ュ巻',
+				// 		url: '/pages/shebeilvli/table',
+				// 		id: 0,
+				// 	}, {
+				// 		img: '../../static/icon/icon2.png',
+				// 		text: '璁惧淇濆吇璁″垝鍗�',
+				// 		url: '/pages/baoyangjihua/table',
+				// 		id: 2
+				// 	}, {
+				// 		img: '../../static/icon/icon3.png',
+				// 		text: '璁惧淇濆吇璁板綍鍗�',
+				// 		url: '/pages/baoyangjilu/table',
+				// 		id: 3
+				// 	}, {
+				// 		img: '../../static/icon/icon4.png',
+				// 		text: '璁惧鐐规璁″垝鍗�',
+				// 		url: '',
+				// 		id: 4
+				// 	}, {
+				// 		img: '../../static/icon/icon5.png',
+				// 		text: '璁惧鐐规璁板綍鍗�',
+				// 		url: '',
+				// 		id: 5,
+				// 	}, {
+				// 		img: '../../static/icon/icon6.png',
+				// 		text: '璁惧鏁呴殰鐧昏琛�',
+				// 		url: '/pages/guzhangdengji/table',
+				// 		id: 6
+				// 	}, {
+				// 		img: '../../static/icon/icon7.png',
+				// 		text: '璁惧缁翠慨璁板綍鍗�',
+				// 		url: '/pages/shebeiweixiu/table',
+				// 		id: 7,
+				// 		// },{
+				// 		//  img:'../../static/icon/icon8.png',
+				// 		//  text:'璁惧灞ュ巻',
+				// 		//  url:'/pages/shebeilvli/table',
+				// 		//  id:8,
+				// 	}, {
+				// 		img: '../../static/icon/icon9.png',
+				// 		text: '宸ュ簭杩涚珯鎺ユ敹鍗�',
+				// 		url: '/pages/gongxuIn/table',
+				// 		id: 9,
+				// 	}, {
+				// 		img: '../../static/icon/icon10.png',
+				// 		text: '宸ュ簭鍑虹珯姹囨姤鍗�',
+				// 		url: '/pages/gongxuOut/table',
+				// 		id: 10,
+				// 	}, {
+				// 		img: '../../static/icon/icon11.png',
+				// 		text: '宸ュ簭濮斿鍙戝嚭鍗�',
+				// 		url: '/pages/weiwaigxIn/table',
+				// 		id: 11,
+				// 	}, {
+				// 		img: '../../static/icon/icon12.png',
+				// 		text: '宸ュ簭濮斿鎺ユ敹鍗�',
+				// 		url: '/pages/weiwaigxOut/table',
+				// 		id: 12,
+				// 		// }, {
+				// 		// 	img: '../../static/icon/icon13.png',
+				// 		// 	text: '璁惧绠$悊',
+				// 		// 	url: '/pages/shebeiguanli/table',
+				// 		// 	id: 13,
+				// 	}, {
+				// 		img: '../../static/icon/icon14.png',
+				// 		text: '鎶ュ伐骞冲彴',
+				// 		url: '/pages/baogong/table',
+				// 		id: 14,
+				// 	}, {
+				// 		img: '../../static/icon/icon15.png',
+				// 		text: '寮傚父鍙嶉鍗�',
+				// 		url: '/pages/yichang/table',
+				// 		id: 15,
+				// 	}, {
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '寮傚父鍙嶉澶勭悊鍗�',
+				// 		url: '/pages/yichang/list',
+				// 		id: 16,
+				// 	}, {
+				// 		img: '../../static/icon/icon17.png',
+				// 		text: '閲囪喘鍏ュ簱',
+				// 		url: '/pages/caigouruku/table',
+				// 		id: 17,
+				// 	}, {
+				// 		img: '../../static/icon/icon18.png',
+				// 		text: '閲囪喘閫�鏂�',
+				// 		url: '/pages/caigoutuiliao/table',
+				// 		id: 18,
+				// 	}, {
+				// 		img: '../../static/icon/icon19.png',
+				// 		text: '閿�鍞嚭搴�',
+				// 		url: '/pages/xiaoshouchuku/table',
+				// 		id: 19,
+				// 	}, {
+				// 		img: '../../static/icon/icon20.png',
+				// 		text: '閿�鍞��璐�',
+				// 		url: '/pages/xiaoshoutuihuo/table',
+				// 		id: 20,
+				// 	}, {
+				// 		img: '../../static/icon/icon21.png',
+				// 		text: '鏀舵枡閫氱煡鍗�',
+				// 		url: '/pages/shouliaotongzhi/table',
+				// 		id: 21,
+				// 	},{
+				// 		img: '../../static/icon/icon30.png',
+				// 		text: '鐢熶骇棰嗘枡鏍¢獙',
+				// 		url: '/pages/shengchanlingliao/table',
+				// 		id: 30,
+				// 	},{
+				// 		img: '../../static/icon/icon31.png',
+				// 		text: '鐢熶骇鍏ュ簱鏍¢獙',
+				// 		url: '/pages/shengchanruku/table',
+				// 		id: 31,
+				// 	},{
+				// 		img: '../../static/icon/icon32.png',
+				// 		text: '鐢熶骇璋冩嫧鏍¢獙',
+				// 		url: '/pages/shengchandiaobo/table',
+				// 		id: 32,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鏍囩鎵撳嵃',
+				// 		url: '/pages/labelPrinter/index',
+				// 		id: 22,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '璁惧杩愯鐘舵��',
+				// 		url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
+				// 		id: 23,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '妯″叿杩愯鐘舵��',
+				// 		url: '/pages/mujvzhuangtai/mujvzhuangtai',
+				// 		id: 24,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鏉$爜鎷嗙爜',
+				// 		url: '/pages/tiaomachaima/tiaomachaima',
+				// 		id: 25,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鍏朵粬鍏ュ簱',
+				// 		url: '/pages/qitaruku/qitaruku',
+				// 		id: 26,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鍏朵粬鍑哄簱',
+				// 		url: '/pages/qitachuku/qitachuku',
+				// 		id: 27,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鏉ユ枡鏉$爜鎵撳嵃',
+				// 		url: '/pages/tiaomadaying/tiaomadaying',
+				// 		id: 28,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '涓婃ā鍗�',
+				// 		url: '/pages/MJGL/shangmudan/table',
+				// 		id: 29,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '閲囪喘璁㈠崟',
+				// 		url: '/pages/caigoudingdan/caigoudingdan',
+				// 		id: 30,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鍏朵粬鍑哄簱鏍¢獙',
+				// 		url: '/pages/qitachukujiaoyan/qitachukujiaoyan',
+				// 		id: 31,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鐢熶骇琛ユ枡鏍¢獙',
+				// 		url: '/pages/shengchanbuliaojiaoyan/CacheList',
+				// 		id: 32,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '閿�鍞嚭搴撴牎楠�',
+				// 		url: '/pages/xiaoshouchukujiaoyan/table',
+				// 		id: 33,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '濮斿棰嗘枡鏍¢獙',
+				// 		url: '/pages/weiwailingliaojiaoyan/table',
+				// 		id: 34,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '閲囪喘鍏ュ簱鏍¢獙',
+				// 		url: '/pages/caigourukujiaoyan/table',
+				// 		id: 35,
+				// 	},
 
-                ],
-                // itemData: [{
-                // 		img: '../../static/icon/icon1.png',
-                // 		text: '璁惧妗f',
-                // 		url: '/pages/shebeidangan/table',
-                // 		id: 1
-                // 	}, {
-                // 		img: '../../static/icon/icon8.png',
-                // 		text: '璁惧灞ュ巻',
-                // 		url: '/pages/shebeilvli/table',
-                // 		id: 0,
-                // 	}, {
-                // 		img: '../../static/icon/icon2.png',
-                // 		text: '璁惧淇濆吇璁″垝鍗�',
-                // 		url: '/pages/baoyangjihua/table',
-                // 		id: 2
-                // 	}, {
-                // 		img: '../../static/icon/icon3.png',
-                // 		text: '璁惧淇濆吇璁板綍鍗�',
-                // 		url: '/pages/baoyangjilu/table',
-                // 		id: 3
-                // 	}, {
-                // 		img: '../../static/icon/icon4.png',
-                // 		text: '璁惧鐐规璁″垝鍗�',
-                // 		url: '',
-                // 		id: 4
-                // 	}, {
-                // 		img: '../../static/icon/icon5.png',
-                // 		text: '璁惧鐐规璁板綍鍗�',
-                // 		url: '',
-                // 		id: 5,
-                // 	}, {
-                // 		img: '../../static/icon/icon6.png',
-                // 		text: '璁惧鏁呴殰鐧昏琛�',
-                // 		url: '/pages/guzhangdengji/table',
-                // 		id: 6
-                // 	}, {
-                // 		img: '../../static/icon/icon7.png',
-                // 		text: '璁惧缁翠慨璁板綍鍗�',
-                // 		url: '/pages/shebeiweixiu/table',
-                // 		id: 7,
-                // 		// },{
-                // 		//  img:'../../static/icon/icon8.png',
-                // 		//  text:'璁惧灞ュ巻',
-                // 		//  url:'/pages/shebeilvli/table',
-                // 		//  id:8,
-                // 	}, {
-                // 		img: '../../static/icon/icon9.png',
-                // 		text: '宸ュ簭杩涚珯鎺ユ敹鍗�',
-                // 		url: '/pages/gongxuIn/table',
-                // 		id: 9,
-                // 	}, {
-                // 		img: '../../static/icon/icon10.png',
-                // 		text: '宸ュ簭鍑虹珯姹囨姤鍗�',
-                // 		url: '/pages/gongxuOut/table',
-                // 		id: 10,
-                // 	}, {
-                // 		img: '../../static/icon/icon11.png',
-                // 		text: '宸ュ簭濮斿鍙戝嚭鍗�',
-                // 		url: '/pages/weiwaigxIn/table',
-                // 		id: 11,
-                // 	}, {
-                // 		img: '../../static/icon/icon12.png',
-                // 		text: '宸ュ簭濮斿鎺ユ敹鍗�',
-                // 		url: '/pages/weiwaigxOut/table',
-                // 		id: 12,
-                // 		// }, {
-                // 		// 	img: '../../static/icon/icon13.png',
-                // 		// 	text: '璁惧绠$悊',
-                // 		// 	url: '/pages/shebeiguanli/table',
-                // 		// 	id: 13,
-                // 	}, {
-                // 		img: '../../static/icon/icon14.png',
-                // 		text: '鎶ュ伐骞冲彴',
-                // 		url: '/pages/baogong/table',
-                // 		id: 14,
-                // 	}, {
-                // 		img: '../../static/icon/icon15.png',
-                // 		text: '寮傚父鍙嶉鍗�',
-                // 		url: '/pages/yichang/table',
-                // 		id: 15,
-                // 	}, {
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '寮傚父鍙嶉澶勭悊鍗�',
-                // 		url: '/pages/yichang/list',
-                // 		id: 16,
-                // 	}, {
-                // 		img: '../../static/icon/icon17.png',
-                // 		text: '閲囪喘鍏ュ簱',
-                // 		url: '/pages/caigouruku/table',
-                // 		id: 17,
-                // 	}, {
-                // 		img: '../../static/icon/icon18.png',
-                // 		text: '閲囪喘閫�鏂�',
-                // 		url: '/pages/caigoutuiliao/table',
-                // 		id: 18,
-                // 	}, {
-                // 		img: '../../static/icon/icon19.png',
-                // 		text: '閿�鍞嚭搴�',
-                // 		url: '/pages/xiaoshouchuku/table',
-                // 		id: 19,
-                // 	}, {
-                // 		img: '../../static/icon/icon20.png',
-                // 		text: '閿�鍞��璐�',
-                // 		url: '/pages/xiaoshoutuihuo/table',
-                // 		id: 20,
-                // 	}, {
-                // 		img: '../../static/icon/icon21.png',
-                // 		text: '鏀舵枡閫氱煡鍗�',
-                // 		url: '/pages/shouliaotongzhi/table',
-                // 		id: 21,
-                // 	},{
-                // 		img: '../../static/icon/icon30.png',
-                // 		text: '鐢熶骇棰嗘枡鏍¢獙',
-                // 		url: '/pages/shengchanlingliao/table',
-                // 		id: 30,
-                // 	},{
-                // 		img: '../../static/icon/icon31.png',
-                // 		text: '鐢熶骇鍏ュ簱鏍¢獙',
-                // 		url: '/pages/shengchanruku/table',
-                // 		id: 31,
-                // 	},{
-                // 		img: '../../static/icon/icon32.png',
-                // 		text: '鐢熶骇璋冩嫧鏍¢獙',
-                // 		url: '/pages/shengchandiaobo/table',
-                // 		id: 32,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '鏍囩鎵撳嵃',
-                // 		url: '/pages/labelPrinter/index',
-                // 		id: 22,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '璁惧杩愯鐘舵��',
-                // 		url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
-                // 		id: 23,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '妯″叿杩愯鐘舵��',
-                // 		url: '/pages/mujvzhuangtai/mujvzhuangtai',
-                // 		id: 24,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '鏉$爜鎷嗙爜',
-                // 		url: '/pages/tiaomachaima/tiaomachaima',
-                // 		id: 25,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '鍏朵粬鍏ュ簱',
-                // 		url: '/pages/qitaruku/qitaruku',
-                // 		id: 26,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '鍏朵粬鍑哄簱',
-                // 		url: '/pages/qitachuku/qitachuku',
-                // 		id: 27,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '鏉ユ枡鏉$爜鎵撳嵃',
-                // 		url: '/pages/tiaomadaying/tiaomadaying',
-                // 		id: 28,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '涓婃ā鍗�',
-                // 		url: '/pages/MJGL/shangmudan/table',
-                // 		id: 29,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '閲囪喘璁㈠崟',
-                // 		url: '/pages/caigoudingdan/caigoudingdan',
-                // 		id: 30,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '鍏朵粬鍑哄簱鏍¢獙',
-                // 		url: '/pages/qitachukujiaoyan/qitachukujiaoyan',
-                // 		id: 31,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '鐢熶骇琛ユ枡鏍¢獙',
-                // 		url: '/pages/shengchanbuliaojiaoyan/CacheList',
-                // 		id: 32,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '閿�鍞嚭搴撴牎楠�',
-                // 		url: '/pages/xiaoshouchukujiaoyan/table',
-                // 		id: 33,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '濮斿棰嗘枡鏍¢獙',
-                // 		url: '/pages/weiwailingliaojiaoyan/table',
-                // 		id: 34,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '閲囪喘鍏ュ簱鏍¢獙',
-                // 		url: '/pages/caigourukujiaoyan/table',
-                // 		id: 35,
-                // 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '濮斿琛ユ枡鏍¢獙',
+				// 		url: '/pages/weiwaibuliaojiaoyan/table',
+				// 		id: 37,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon17.png',
+				// 		text: '鐢熶骇棰嗘枡',
+				// 		url: '/pages/shengchanlingliaoshengdan/table',
+				// 		id: 38,
+				// 	}, 
+				// ]
+			}
+		},
+		onLoad() {
+			this.getHiddenItem()
+		},
+		methods: {
+			checkCardShow(item) {
+				if (item.HMaker && item.HMaker != getUserInfo()['Czymc'] && item.hidden == true) {
+					return false
+				}
+				return true
+			},
+			async getHiddenItem() {
+				// let itemCache = uni.getStorageSync('HIndexItemData') || ''
+				// console.log('itemCache: ',itemCache);
+				// if(itemCache !== '') {
+				// 	this.itemData = itemCache
+				// }
 
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '濮斿琛ユ枡鏍¢獙',
-                // 		url: '/pages/weiwaibuliaojiaoyan/table',
-                // 		id: 37,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon17.png',
-                // 		text: '鐢熶骇棰嗘枡',
-                // 		url: '/pages/shengchanlingliaoshengdan/table',
-                // 		id: 38,
-                // 	}, 
-                // ]
-            }
-        },
-        onLoad() {
-            this.getHiddenItem()
-        },
-        methods: {
-            checkCardShow(item) {
-                if (item.HMaker && item.HMaker != getUserInfo()['Czymc'] && item.hidden == true) {
-                    return false
-                }
-                return true
-            },
-            async getHiddenItem() {
-                // let itemCache = uni.getStorageSync('HIndexItemData') || ''
-                // console.log('itemCache: ',itemCache);
-                // if(itemCache !== '') {
-                // 	this.itemData = itemCache
-                // }
+				let data = await getMenuList({
+					menuName: this.menuListName
+				})
+				Array.from(data).forEach(e => {
+					this.itemData[e["HIndex"]].hidden = !CommonUtils.stringToBoolean(e["HShowMode"])
+					this.itemData[e["HIndex"]].HMaker = e["HMaker"]
+				})
+			},
+			switchHidden(index) {
+				this.updateCount++;
+				this.itemData[index].hidden = !this.itemData[index].hidden
+			},
+			switchIconsModeHandler() {
+				this.canEdit = !this.canEdit
+				if (this.canEdit == false && this.updateCount > 0) {
+					this.$nextTick(() => {
+						// uni.setStorageSync("HIndexItemData", this.itemData)
+						setMenuList({
+							menuName: this.menuListName,
+							payload: this.itemData
+						})
 
-                let data = await getMenuList({
-                    menuName: this.menuListName
-                })
-                Array.from(data).forEach(e => {
-                    this.itemData[e["HIndex"]].hidden = !CommonUtils.stringToBoolean(e["HShowMode"])
-                    this.itemData[e["HIndex"]].HMaker = e["HMaker"]
-                })
-            },
-            switchHidden(index) {
-                this.updateCount++;
-                this.itemData[index].hidden = !this.itemData[index].hidden
-            },
-            switchIconsModeHandler() {
-                this.canEdit = !this.canEdit
-                if (this.canEdit == false && this.updateCount > 0) {
-                    this.$nextTick(() => {
-                        // uni.setStorageSync("HIndexItemData", this.itemData)
-                        setMenuList({
-                            menuName: this.menuListName,
-                            payload: this.itemData
-                        })
-
-                        this.updateCount = 0
-                    })
-                }
-                this.$forceUpdate()
-            },
-            toUrl(item) {
-                if (item.url) {
-                    uni.navigateTo({
-                        url: item.url
-                    })
-                } else {
-                    uni.showToast({
-                        title: '鍔熻兘寮�鍙戜腑銆傘�傘��',
-                        icon: 'none'
-                    })
-                }
-            }
-        }
-    }
+						this.updateCount = 0
+					})
+				}
+				this.$forceUpdate()
+			},
+			toUrl(item) {
+				if (item.url) {
+					uni.navigateTo({
+						url: item.url
+					})
+				} else {
+					uni.showToast({
+						title: '鍔熻兘寮�鍙戜腑銆傘�傘��',
+						icon: 'none'
+					})
+				}
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-    .header {
-        width: 750rpx;
-        background: linear-gradient(0deg, #71AFFC 0%, #3A78FF 100%);
-        font-size: 47rpx;
-        font-weight: bold;
-        color: #FFFFFF;
-        text-align: center;
-        padding: 9vh 0 6vh 0;
-        position: relative;
-    }
+	.header {
+		width: 750rpx;
+		background: linear-gradient(0deg, #71AFFC 0%, #3A78FF 100%);
+		font-size: 47rpx;
+		font-weight: bold;
+		color: #FFFFFF;
+		text-align: center;
+		padding: 9vh 0 6vh 0;
+		position: relative;
+	}
 
-    .switch-button {
-        position: absolute;
-        right: 10rpx;
-        bottom: 0;
-    }
+	.switch-button {
+		position: absolute;
+		right: 10rpx;
+		bottom: 0;
+	}
 
-    .mains {
-        width: 720rpx;
-        margin: 0 auto;
-        display: flex;
-        flex-wrap: wrap;
-        margin-top: 3vh;
-        padding-bottom: 5vh;
+	.mains {
+		width: 720rpx;
+		margin: 0 auto;
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: 3vh;
+		padding-bottom: 5vh;
 
-        .box {
-            width: 25%;
-            margin-top: 2.5vh;
-            text-align: center;
+		.box {
+			width: 25%;
+			margin-top: 2.5vh;
+			text-align: center;
 
-            image {
-                width: 18vw;
-                height: 18vw;
-            }
+			image {
+				width: 18vw;
+				height: 18vw;
+			}
 
-            .texts {
-                width: 120rpx;
-                margin: 0 auto;
-                font-size: 29rpx;
-                font-weight: normal;
-                color: #333333;
-                margin-top: .2vh;
-            }
-        }
+			.texts {
+				width: 120rpx;
+				margin: 0 auto;
+				font-size: 29rpx;
+				font-weight: normal;
+				color: #333333;
+				margin-top: .2vh;
+			}
+		}
 
-        .edit {
-            position: relative;
-        }
+		.edit {
+			position: relative;
+		}
 
-        .edit-mark {
-            position: absolute;
-            top: 0;
-            right: 0;
-        }
+		.edit-mark {
+			position: absolute;
+			top: 0;
+			right: 0;
+		}
 
-        view[enable-hidden] {
-            opacity: .4 !important;
-        }
+		view[enable-hidden] {
+			opacity: .4 !important;
+		}
 
-        view[hidden] {
-            display: none;
-        }
-    }
+		view[hidden] {
+			display: none;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/login.vue b/pages/index/login.vue
index a9dbb10..4096323 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -87,6 +87,8 @@
                     "浣欏鍏磋揪璧峰姩鍣�": 'http://121.37.133.104/API/',
  					"鏉庢灄淇婃湰鍦版祴璇�": 'http://localhost:8082/LuBaoAPI/',
 					"鑻忓窞鍗櫤绉戞妧": 'http://221.224.60.42:8082/API_WW/',
+					"鏉窞鍑礉濂堢壒": 'http://192.168.50.253:8080/API/',
+					"鏉窞鍑礉濂堢壒澶栫綉": 'http://erp.hzcabinet.cn:9090/API/',
 					"缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
 					"闄堥晲鍝叉湰鍦版祴璇�": 'http://localhost:81/API/',
 					"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index 56196ef..7b63f2f 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -395,7 +395,28 @@
 						"url": "/pages/MJGL/qijudiaobodan/table",
 						"id": 47,
 						"hidden": false
-					}
+					},
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "瑁呯鍗曟殏瀛樺垪琛�",
+						"url": "/pages/zhuangxiangdan/table",
+						"id": 48,
+						"hidden": false
+					},
+                    {
+                        "img": "../../static/icon/icon8.png",
+                        "text": "宸℃鍗曟殏瀛樺垪琛�",
+                        "url": "/pages/ZLGL/xunjianjianyan/table",
+                        "id": 49,
+                        "hidden": false
+                    },
+                    {
+                        "img": "../../static/icon/icon8.png",
+                        "text": "宸℃鍗�",
+                        "url": "/pages/ZLGL/xunjianjianyan/form?operationType=1",
+                        "id": 50,
+                        "hidden": false
+                    }
 				]
 			}
 		},
diff --git a/pages/qijvguzhangdengji/form.vue b/pages/qijvguzhangdengji/form.vue
index f895ca5..74c11f2 100644
--- a/pages/qijvguzhangdengji/form.vue
+++ b/pages/qijvguzhangdengji/form.vue
@@ -13,6 +13,9 @@
                         <input type="text" :disabled="barcodeReadOnly" :focus="barCodeFocus" v-model="hform.HBarCode"
                             @confirm="getHBarCodeData(hform.HBarCode)" />
                     </view>
+                    <uni-icons type="scan"
+                    	style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;flex-shrink: 0;"
+                    	size="20" @click="toScanCode"></uni-icons>
                 </view>
                 <view class="form-item">
                     <view class="title">鏁呴殰鍙戠敓鏃ユ湡</view>
@@ -175,6 +178,7 @@
     import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
     import BillSelectPopupXiaoWeiVue from '../../components/BillSelectPopupXiaoWei/BillSelectPopupXiaoWei.vue';
     import dayjs from 'dayjs';
+    import { MpaasScan } from '../../utils/mpaasScan';
     export default {
         components: {
             BillListPopupVue,
@@ -571,407 +575,6 @@
                     })
                 }
 
-            },
-            //鎵潯鐮佸鐞�
-            async getCode(HBarCode) {
-                //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
-                if (!this.hform.HWHName) {
-                    this.hform.HWHID = 0
-                }
-                if (!this.hform.HStockPlaceName) {
-                    this.hform.HStockPlaceID = 0
-                }
-                var sOldBarCode = HBarCode
-                var HDeleteFlag = sOldBarCode.substring(0, 1);
-                var sBarCode = sOldBarCode.slice(1);
-
-                var sHWHID = this.hform.HWHID
-                var sHSPID = this.hform.HStockPlaceID
-                var sHQty = this.hform.HQty
-                var sSourceBillNo = this.hform.HSourceBillNo
-                var sSourceBillType = this.hform.HMainSourceBillType
-                var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
-                console.log(this.hform.HSourceBillNo, HSourceFlag)
-                if (HDeleteFlag == "*") {
-                    if (sBarCode == "") {
-                        this.playSound(0)
-                        this.refreshBarCodeState()
-                        uni.showToast({
-                            title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
-                            icon: 'none'
-                        })
-                    } else {
-                        try {
-                            let res = await CommonUtils.doRequest2Sync({
-                                url: '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_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.playSound(1)
-                                this.hform.HQty = ''
-                                this.DisBillEntryList()
-                            } else {
-                                this.playSound(0)
-                                this.refreshBarCodeState()
-                                uni.showToast({
-                                    title: res.data.Message,
-                                    icon: 'none'
-                                })
-                            }
-                        } catch (err) {
-                            this.refreshBarCodeState()
-                            this.playSound(0)
-                            uni.showToast({
-                                title: '鎺ュ彛璇锋眰澶辫触: ' + err,
-                                icon: 'none'
-                            })
-                        }
-
-                        // uni.request({
-                        //     url: this.serverUrl +
-                        //         '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
-                        //     data: {
-                        //         HInterID: this.hform.HInterID,
-                        //         HBillType: this.hform.HBillType,
-                        //         HBarCode: sBarCode
-                        //     },
-                        //     success: (res) => {
-                        //         console.log('鍒犻櫎鏉$爜', res.data);
-                        //         this.hform.HBarCode = ''
-                        //         if (res.data.count == 1) {
-                        //             this.playSound(1)
-                        //             this.hform.HQty = ''
-                        //             CommonUtils.playSound(1)
-                        //             this.DisBillEntryList()
-                        //         } else {
-                        //             this.playSound(0)
-                        //             this.refreshBarCodeState()
-                        //             uni.showToast({
-                        //                 title: res.data.Message,
-                        //                 icon: 'none'
-                        //             })
-                        //         }
-                        //     },
-                        //     fail: (res) => {
-                        //         this.playSound(0)
-                        //         this.refreshBarCodeState()
-                        //         console.log(res);
-                        //         uni.showToast({
-                        //             title: '鎺ュ彛璇锋眰澶辫触',
-                        //             icon: 'none'
-                        //         })
-                        //     },
-                        // });
-                    }
-                } else {
-                    var sBarCode = this.hform.HBarCode
-                    if (sHQty == "") {
-                        sHQty = 0;
-                    }
-
-                    try {
-                        let res = await CommonUtils.doRequest2Sync({
-                            url: '/WEBSController/Get_BarCode_Json',
-                            data: {
-                                sBarCode: sBarCode,
-                                HInterID: this.hform.HInterID,
-                                HBillType: this.hform.HBillType,
-                                HBillNo: this.hform.HBillNo,
-                                HMaker: this.hform.HMaker,
-                                HWhID: sHWHID,
-                                HSPID: sHSPID,
-                                HQty: sHQty,
-                                HRedBlueFlag: this.hform.HRedBlueFlag,
-                                SourceFlag: HSourceFlag,
-                                HSourceBillNo: sSourceBillNo,
-                                HSourceBillType: sSourceBillType,
-                                HStockOrgID: this.hform.HStockOrgID,
-                                HScanStyle: "",
-                                HCustom1: "",
-                                HCustom2: ""
-                            },
-                        })
-                        if (!res) {
-                            return
-                        }
-                        console.log('鎵爜杩斿洖', res.data);
-                        this.hform.HBarCode = ''
-                        if (res.data.count == 1) {
-                            this.playSound(1)
-                            var data = res.data.data
-                            if (data.hBarTypeField == '浠撳簱鏉$爜') {
-                                this.hform.HWHName = data.hWhNameField
-                                this.hform.HWHID = data.hWhIDField
-                                this.hform.HStockPlaceName = ''
-                                this.hform.HStockPlaceID = 0
-                                if (data.hSPFlagField == 0) {
-                                    this.showHStockPlaceName = false
-                                } else {
-                                    this.showHStockPlaceName = true
-                                }
-                            } else if (data.hBarTypeField == '浠撲綅鏉$爜') {
-                                this.hform.HWHName = data.hWhNameField
-                                this.hform.HWHID = data.hWhIDField
-                                this.hform.HStockPlaceName = data.hSPNameField
-                                this.hform.HStockPlaceID = data.hSPIDField
-                            } else if (data.hBarTypeField == '閮ㄩ棬鏉$爜') {
-                                this.hform.HDeptName = data.hDeptNameField
-                                this.hform.HDeptID = data.hDeptIDField
-                                this.tabs = 1
-                            } else if (data.hBarTypeField == '婧愬崟鏉$爜') {
-                                this.hform.HSupName = data.hSupNameField
-                                this.hform.HSupID = data.hSupIDField
-                                if (data.hDeptIDField != 0) {
-                                    this.hform.HDeptID = data.hDeptIDField
-                                    this.hform.HDeptName = data.hDeptNameField
-                                }
-                                this.hform.HSourceBillNo = data.hSourceBillNoField
-                                //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                this.hform.HMainSourceBillType = data.hSourceBillTypeField
-                                if (data.hSourceBillTypeField == "1105") {
-                                    this.HMainSourceBillType = '閫�鏂欓�氱煡鍗�'
-                                    this.hform.HMainSourceBillType = 1105
-                                    this.showHMainSourceBillType = false
-                                } else if (data.hSourceBillTypeField == "1102") {
-                                    this.HMainSourceBillType = '閲囪喘璁㈠崟'
-                                    this.hform.HMainSourceBillType = 1102
-                                    this.showHMainSourceBillType = false
-                                } else if (data.hSourceBillType == 1201) {
-                                    this.HMainSourceBillType = '閲囪喘鍏ュ簱鍗�'
-                                    this.hform.HMainSourceBillType = 1201
-                                    this.showHMainSourceBillType = false
-                                } else {
-                                    this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-                                    this.hform.HMainSourceBillType = -1
-                                    this.showHMainSourceBillType = false
-                                }
-                                if (data.hMulSourceFlagField == 0) {
-                                    this.showHSourceBillNo = false
-                                }
-                                //渚涘簲鍟嗕笉鍙紪杈�
-                                this.showHSupName = false
-                                this.tabs = 2
-                            } else { //鐗╂枡鏉$爜
-                                this.tabs = 2
-                                if (!this.hform.HSourceBillNo) {
-                                    this.hform.HSupName = data.hSupNameField
-                                    this.hform.HSupID = data.hSupIDField
-                                    this.hform.HSourceBillNo = data.hSourceBillNoField
-                                    if (data.hDeptIDField != 0) {
-                                        this.hform.HDeptID = data.hDeptIDField
-                                        this.hform.HDeptName = data.hDeptNameField
-                                    }
-                                    console.log(data)
-                                    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                    this.hform.HMainSourceBillType = data.hSourceBillTypeField
-
-                                    let index = this.arrayHMainSourceBillValue.findIndex(e => e ==
-                                        data
-                                        .hSourceBillTypeField)
-                                    if (index != -1) {
-                                        this.HMainSourceBillType = this.arrayHMainSourceBillType[
-                                            index]
-                                        this.hform.HMainSourceBillType = data.hSourceBillTypeField
-                                        this.showHMainSourceBillType = false
-                                    }
-                                    // if (data.hSourceBillTypeField == "1103") {
-                                    // 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
-                                    // 	this.hform.HMainSourceBillType = 1103
-                                    // 	this.showHMainSourceBillType = false
-                                    // } else if (data.hSourceBillTypeField == "1102") {
-                                    // 	this.HMainSourceBillType = '閲囪喘璁㈠崟'
-                                    // 	this.hform.HMainSourceBillType = 1102
-                                    // 	this.showHMainSourceBillType = false
-                                    // } else {
-                                    // 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-                                    // 	this.hform.HMainSourceBillType = -1
-                                    // 	this.showHMainSourceBillType = false
-                                    // }
-                                    if (data.hMulSourceFlagField == 0) {
-                                        this.showHSourceBillNo = false
-                                    }
-                                    //渚涘簲鍟嗕笉鍙紪杈�
-                                    this.showHSupName = false
-                                }
-                            }
-                            //鏄剧ず琛ㄤ綋鏄庣粏
-                            this.DisBillEntryList()
-                            //娓呯┖鏁伴噺
-                            this.hform.HQty = ''
-                        } else {
-                            this.playSound(0)
-                            this.refreshBarCodeState()
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    } catch (err) {
-                        this.playSound(0)
-                        this.refreshBarCodeState()
-                        console.log(err);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触: ' + err,
-                            icon: 'none'
-                        })
-                    }
-
-                    // uni.request({
-                    //     url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
-                    //     data: {
-                    //         sBarCode: sBarCode,
-                    //         HInterID: this.hform.HInterID,
-                    //         HBillType: this.hform.HBillType,
-                    //         HBillNo: this.hform.HBillNo,
-                    //         HMaker: this.hform.HMaker,
-                    //         HWhID: sHWHID,
-                    //         HSPID: sHSPID,
-                    //         HQty: sHQty,
-                    //         HRedBlueFlag: this.hform.HRedBlueFlag,
-                    //         SourceFlag: HSourceFlag,
-                    //         HSourceBillNo: sSourceBillNo,
-                    //         HSourceBillType: sSourceBillType,
-                    //         HStockOrgID: this.hform.HStockOrgID,
-                    //         HScanStyle: "",
-                    //         HCustom1: "",
-                    //         HCustom2: ""
-                    //     },
-                    //     success: (res) => {
-                    //         console.log('鎵爜杩斿洖', res.data);
-                    //         this.hform.HBarCode = ''
-                    //         if (res.data.count == 1) {
-                    //             this.playSound(1)
-                    //             var data = res.data.data
-                    //             if (data.hBarTypeField == '浠撳簱鏉$爜') {
-                    //                 this.hform.HWHName = data.hWhNameField
-                    //                 this.hform.HWHID = data.hWhIDField
-                    //                 this.hform.HStockPlaceName = ''
-                    //                 this.hform.HStockPlaceID = 0
-                    //                 if (data.hSPFlagField == 0) {
-                    //                     this.showHStockPlaceName = false
-                    //                 } else {
-                    //                     this.showHStockPlaceName = true
-                    //                 }
-                    //             } else if (data.hBarTypeField == '浠撲綅鏉$爜') {
-                    //                 this.hform.HWHName = data.hWhNameField
-                    //                 this.hform.HWHID = data.hWhIDField
-                    //                 this.hform.HStockPlaceName = data.hSPNameField
-                    //                 this.hform.HStockPlaceID = data.hSPIDField
-                    //             } else if (data.hBarTypeField == '閮ㄩ棬鏉$爜') {
-                    //                 this.hform.HDeptName = data.hDeptNameField
-                    //                 this.hform.HDeptID = data.hDeptIDField
-                    //                 this.tabs = 1
-                    //             } else if (data.hBarTypeField == '婧愬崟鏉$爜') {
-                    //                 this.hform.HSupName = data.hSupNameField
-                    //                 this.hform.HSupID = data.hSupIDField
-                    //                 if (data.hDeptIDField != 0) {
-                    //                     this.hform.HDeptID = data.hDeptIDField
-                    //                     this.hform.HDeptName = data.hDeptNameField
-                    //                 }
-                    //                 this.hform.HSourceBillNo = data.hSourceBillNoField
-                    //                 //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                    //                 this.hform.HMainSourceBillType = data.hSourceBillTypeField
-                    //                 if (data.hSourceBillTypeField == "1105") {
-                    //                     this.HMainSourceBillType = '閫�鏂欓�氱煡鍗�'
-                    //                     this.hform.HMainSourceBillType = 1105
-                    //                     this.showHMainSourceBillType = false
-                    //                 } else if (data.hSourceBillTypeField == "1102") {
-                    //                     this.HMainSourceBillType = '閲囪喘璁㈠崟'
-                    //                     this.hform.HMainSourceBillType = 1102
-                    //                     this.showHMainSourceBillType = false
-                    //                 } else if (data.hSourceBillType == 1201) {
-                    //                     this.HMainSourceBillType = '閲囪喘鍏ュ簱鍗�'
-                    //                     this.hform.HMainSourceBillType = 1201
-                    //                     this.showHMainSourceBillType = false
-                    //                 } else {
-                    //                     this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-                    //                     this.hform.HMainSourceBillType = -1
-                    //                     this.showHMainSourceBillType = false
-                    //                 }
-                    //                 if (data.hMulSourceFlagField == 0) {
-                    //                     this.showHSourceBillNo = false
-                    //                 }
-                    //                 //渚涘簲鍟嗕笉鍙紪杈�
-                    //                 this.showHSupName = false
-                    //                 this.tabs = 2
-                    //             } else { //鐗╂枡鏉$爜
-                    //                 this.tabs = 2
-                    //                 if (!this.hform.HSourceBillNo) {
-                    //                     this.hform.HSupName = data.hSupNameField
-                    //                     this.hform.HSupID = data.hSupIDField
-                    //                     this.hform.HSourceBillNo = data.hSourceBillNoField
-                    //                     if (data.hDeptIDField != 0) {
-                    //                         this.hform.HDeptID = data.hDeptIDField
-                    //                         this.hform.HDeptName = data.hDeptNameField
-                    //                     }
-                    //                     console.log(data)
-                    //                     //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                    //                     this.hform.HMainSourceBillType = data.hSourceBillTypeField
-                    // 
-                    //                     let index = this.arrayHMainSourceBillValue.findIndex(e => e ==
-                    //                         data
-                    //                         .hSourceBillTypeField)
-                    //                     if (index != -1) {
-                    //                         this.HMainSourceBillType = this.arrayHMainSourceBillType[
-                    //                             index]
-                    //                         this.hform.HMainSourceBillType = data.hSourceBillTypeField
-                    //                         this.showHMainSourceBillType = false
-                    //                     }
-                    //                     // if (data.hSourceBillTypeField == "1103") {
-                    //                     // 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
-                    //                     // 	this.hform.HMainSourceBillType = 1103
-                    //                     // 	this.showHMainSourceBillType = false
-                    //                     // } else if (data.hSourceBillTypeField == "1102") {
-                    //                     // 	this.HMainSourceBillType = '閲囪喘璁㈠崟'
-                    //                     // 	this.hform.HMainSourceBillType = 1102
-                    //                     // 	this.showHMainSourceBillType = false
-                    //                     // } else {
-                    //                     // 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-                    //                     // 	this.hform.HMainSourceBillType = -1
-                    //                     // 	this.showHMainSourceBillType = false
-                    //                     // }
-                    //                     if (data.hMulSourceFlagField == 0) {
-                    //                         this.showHSourceBillNo = false
-                    //                     }
-                    //                     //渚涘簲鍟嗕笉鍙紪杈�
-                    //                     this.showHSupName = false
-                    //                 }
-                    //             }
-                    //             //鏄剧ず琛ㄤ綋鏄庣粏
-                    //             this.DisBillEntryList()
-                    //             //娓呯┖鏁伴噺
-                    //             this.hform.HQty = ''
-                    //         } else {
-                    //             this.playSound(0)
-                    //             this.refreshBarCodeState()
-                    //             uni.showToast({
-                    //                 title: res.data.Message,
-                    //                 icon: 'none'
-                    //             })
-                    //         }
-                    //     },
-                    //     fail: (res) => {
-                    //         this.playSound(0)
-                    //         this.refreshBarCodeState()
-                    //         console.log(res);
-                    //         uni.showToast({
-                    //             title: '鎺ュ彛璇锋眰澶辫触',
-                    //             icon: 'none'
-                    //         })
-                    //     },
-                    // });
-                }
             },
             //鐗╂枡淇℃伅
             DisBillEntryList() {
diff --git a/pages/weixiujilu/form.vue b/pages/weixiujilu/form.vue
index d19c653..8287c88 100644
--- a/pages/weixiujilu/form.vue
+++ b/pages/weixiujilu/form.vue
@@ -13,6 +13,9 @@
                         <input type="text" name="HBarCode" v-model="hform.HBarCode"
                             @confirm="getHBarCodeData(hform.HBarCode)" />
                     </view>
+                    <uni-icons type="scan"
+                    	style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;flex-shrink: 0;"
+                    	size="20" @click="toScanCode"></uni-icons>
                 </view>
                 <view class="form-item">
                     <view class="title">婧愬崟绫诲瀷</view>
@@ -714,7 +717,7 @@
                         this.hform.HBarCode = ret.resp_result
                     }
 
-                    this.getCode(this.hform.HBarCode)
+                    this.getHBarCodeData(this.hform.HBarCode)
                 })
             },
             //鏃ユ湡
@@ -774,407 +777,6 @@
                 }
 
 
-            },
-            //鎵潯鐮佸鐞�
-            async getCode(HBarCode) {
-                //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
-                if (!this.hform.HWHName) {
-                    this.hform.HWHID = 0
-                }
-                if (!this.hform.HStockPlaceName) {
-                    this.hform.HStockPlaceID = 0
-                }
-                var sOldBarCode = HBarCode
-                var HDeleteFlag = sOldBarCode.substring(0, 1);
-                var sBarCode = sOldBarCode.slice(1);
-
-                var sHWHID = this.hform.HWHID
-                var sHSPID = this.hform.HStockPlaceID
-                var sHQty = this.hform.HQty
-                var sSourceBillNo = this.hform.HSourceBillNo
-                var sSourceBillType = this.hform.HMainSourceBillType
-                var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
-                console.log(this.hform.HSourceBillNo, HSourceFlag)
-                if (HDeleteFlag == "*") {
-                    if (sBarCode == "") {
-                        this.playSound(0)
-                        this.refreshBarCodeState()
-                        uni.showToast({
-                            title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
-                            icon: 'none'
-                        })
-                    } else {
-                        try {
-                            let res = await CommonUtils.doRequest2Sync({
-                                url: '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_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.playSound(1)
-                                this.hform.HQty = ''
-                                this.DisBillEntryList()
-                            } else {
-                                this.playSound(0)
-                                this.refreshBarCodeState()
-                                uni.showToast({
-                                    title: res.data.Message,
-                                    icon: 'none'
-                                })
-                            }
-                        } catch (err) {
-                            this.refreshBarCodeState()
-                            this.playSound(0)
-                            uni.showToast({
-                                title: '鎺ュ彛璇锋眰澶辫触: ' + err,
-                                icon: 'none'
-                            })
-                        }
-
-                        // uni.request({
-                        //     url: this.serverUrl +
-                        //         '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
-                        //     data: {
-                        //         HInterID: this.hform.HInterID,
-                        //         HBillType: this.hform.HBillType,
-                        //         HBarCode: sBarCode
-                        //     },
-                        //     success: (res) => {
-                        //         console.log('鍒犻櫎鏉$爜', res.data);
-                        //         this.hform.HBarCode = ''
-                        //         if (res.data.count == 1) {
-                        //             this.playSound(1)
-                        //             this.hform.HQty = ''
-                        //             CommonUtils.playSound(1)
-                        //             this.DisBillEntryList()
-                        //         } else {
-                        //             this.playSound(0)
-                        //             this.refreshBarCodeState()
-                        //             uni.showToast({
-                        //                 title: res.data.Message,
-                        //                 icon: 'none'
-                        //             })
-                        //         }
-                        //     },
-                        //     fail: (res) => {
-                        //         this.playSound(0)
-                        //         this.refreshBarCodeState()
-                        //         console.log(res);
-                        //         uni.showToast({
-                        //             title: '鎺ュ彛璇锋眰澶辫触',
-                        //             icon: 'none'
-                        //         })
-                        //     },
-                        // });
-                    }
-                } else {
-                    var sBarCode = this.hform.HBarCode
-                    if (sHQty == "") {
-                        sHQty = 0;
-                    }
-
-                    try {
-                        let res = await CommonUtils.doRequest2Sync({
-                            url: '/WEBSController/Get_BarCode_Json',
-                            data: {
-                                sBarCode: sBarCode,
-                                HInterID: this.hform.HInterID,
-                                HBillType: this.hform.HBillType,
-                                HBillNo: this.hform.HBillNo,
-                                HMaker: this.hform.HMaker,
-                                HWhID: sHWHID,
-                                HSPID: sHSPID,
-                                HQty: sHQty,
-                                HRedBlueFlag: this.hform.HRedBlueFlag,
-                                SourceFlag: HSourceFlag,
-                                HSourceBillNo: sSourceBillNo,
-                                HSourceBillType: sSourceBillType,
-                                HStockOrgID: this.hform.HStockOrgID,
-                                HScanStyle: "",
-                                HCustom1: "",
-                                HCustom2: ""
-                            },
-                        })
-                        if (!res) {
-                            return
-                        }
-                        console.log('鎵爜杩斿洖', res.data);
-                        this.hform.HBarCode = ''
-                        if (res.data.count == 1) {
-                            this.playSound(1)
-                            var data = res.data.data
-                            if (data.hBarTypeField == '浠撳簱鏉$爜') {
-                                this.hform.HWHName = data.hWhNameField
-                                this.hform.HWHID = data.hWhIDField
-                                this.hform.HStockPlaceName = ''
-                                this.hform.HStockPlaceID = 0
-                                if (data.hSPFlagField == 0) {
-                                    this.showHStockPlaceName = false
-                                } else {
-                                    this.showHStockPlaceName = true
-                                }
-                            } else if (data.hBarTypeField == '浠撲綅鏉$爜') {
-                                this.hform.HWHName = data.hWhNameField
-                                this.hform.HWHID = data.hWhIDField
-                                this.hform.HStockPlaceName = data.hSPNameField
-                                this.hform.HStockPlaceID = data.hSPIDField
-                            } else if (data.hBarTypeField == '閮ㄩ棬鏉$爜') {
-                                this.hform.HDeptName = data.hDeptNameField
-                                this.hform.HDeptID = data.hDeptIDField
-                                this.tabs = 1
-                            } else if (data.hBarTypeField == '婧愬崟鏉$爜') {
-                                this.hform.HSupName = data.hSupNameField
-                                this.hform.HSupID = data.hSupIDField
-                                if (data.hDeptIDField != 0) {
-                                    this.hform.HDeptID = data.hDeptIDField
-                                    this.hform.HDeptName = data.hDeptNameField
-                                }
-                                this.hform.HSourceBillNo = data.hSourceBillNoField
-                                //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                this.hform.HMainSourceBillType = data.hSourceBillTypeField
-                                if (data.hSourceBillTypeField == "1105") {
-                                    this.HMainSourceBillType = '閫�鏂欓�氱煡鍗�'
-                                    this.hform.HMainSourceBillType = 1105
-                                    this.showHMainSourceBillType = false
-                                } else if (data.hSourceBillTypeField == "1102") {
-                                    this.HMainSourceBillType = '閲囪喘璁㈠崟'
-                                    this.hform.HMainSourceBillType = 1102
-                                    this.showHMainSourceBillType = false
-                                } else if (data.hSourceBillType == 1201) {
-                                    this.HMainSourceBillType = '閲囪喘鍏ュ簱鍗�'
-                                    this.hform.HMainSourceBillType = 1201
-                                    this.showHMainSourceBillType = false
-                                } else {
-                                    this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-                                    this.hform.HMainSourceBillType = -1
-                                    this.showHMainSourceBillType = false
-                                }
-                                if (data.hMulSourceFlagField == 0) {
-                                    this.showHSourceBillNo = false
-                                }
-                                //渚涘簲鍟嗕笉鍙紪杈�
-                                this.showHSupName = false
-                                this.tabs = 2
-                            } else { //鐗╂枡鏉$爜
-                                this.tabs = 2
-                                if (!this.hform.HSourceBillNo) {
-                                    this.hform.HSupName = data.hSupNameField
-                                    this.hform.HSupID = data.hSupIDField
-                                    this.hform.HSourceBillNo = data.hSourceBillNoField
-                                    if (data.hDeptIDField != 0) {
-                                        this.hform.HDeptID = data.hDeptIDField
-                                        this.hform.HDeptName = data.hDeptNameField
-                                    }
-                                    console.log(data)
-                                    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                    this.hform.HMainSourceBillType = data.hSourceBillTypeField
-
-                                    let index = this.arrayHMainSourceBillValue.findIndex(e => e ==
-                                        data
-                                        .hSourceBillTypeField)
-                                    if (index != -1) {
-                                        this.HMainSourceBillType = this.arrayHMainSourceBillType[
-                                            index]
-                                        this.hform.HMainSourceBillType = data.hSourceBillTypeField
-                                        this.showHMainSourceBillType = false
-                                    }
-                                    // if (data.hSourceBillTypeField == "1103") {
-                                    // 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
-                                    // 	this.hform.HMainSourceBillType = 1103
-                                    // 	this.showHMainSourceBillType = false
-                                    // } else if (data.hSourceBillTypeField == "1102") {
-                                    // 	this.HMainSourceBillType = '閲囪喘璁㈠崟'
-                                    // 	this.hform.HMainSourceBillType = 1102
-                                    // 	this.showHMainSourceBillType = false
-                                    // } else {
-                                    // 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-                                    // 	this.hform.HMainSourceBillType = -1
-                                    // 	this.showHMainSourceBillType = false
-                                    // }
-                                    if (data.hMulSourceFlagField == 0) {
-                                        this.showHSourceBillNo = false
-                                    }
-                                    //渚涘簲鍟嗕笉鍙紪杈�
-                                    this.showHSupName = false
-                                }
-                            }
-                            //鏄剧ず琛ㄤ綋鏄庣粏
-                            this.DisBillEntryList()
-                            //娓呯┖鏁伴噺
-                            this.hform.HQty = ''
-                        } else {
-                            this.playSound(0)
-                            this.refreshBarCodeState()
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    } catch (err) {
-                        this.playSound(0)
-                        this.refreshBarCodeState()
-                        console.log(err);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触: ' + err,
-                            icon: 'none'
-                        })
-                    }
-
-                    // uni.request({
-                    //     url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
-                    //     data: {
-                    //         sBarCode: sBarCode,
-                    //         HInterID: this.hform.HInterID,
-                    //         HBillType: this.hform.HBillType,
-                    //         HBillNo: this.hform.HBillNo,
-                    //         HMaker: this.hform.HMaker,
-                    //         HWhID: sHWHID,
-                    //         HSPID: sHSPID,
-                    //         HQty: sHQty,
-                    //         HRedBlueFlag: this.hform.HRedBlueFlag,
-                    //         SourceFlag: HSourceFlag,
-                    //         HSourceBillNo: sSourceBillNo,
-                    //         HSourceBillType: sSourceBillType,
-                    //         HStockOrgID: this.hform.HStockOrgID,
-                    //         HScanStyle: "",
-                    //         HCustom1: "",
-                    //         HCustom2: ""
-                    //     },
-                    //     success: (res) => {
-                    //         console.log('鎵爜杩斿洖', res.data);
-                    //         this.hform.HBarCode = ''
-                    //         if (res.data.count == 1) {
-                    //             this.playSound(1)
-                    //             var data = res.data.data
-                    //             if (data.hBarTypeField == '浠撳簱鏉$爜') {
-                    //                 this.hform.HWHName = data.hWhNameField
-                    //                 this.hform.HWHID = data.hWhIDField
-                    //                 this.hform.HStockPlaceName = ''
-                    //                 this.hform.HStockPlaceID = 0
-                    //                 if (data.hSPFlagField == 0) {
-                    //                     this.showHStockPlaceName = false
-                    //                 } else {
-                    //                     this.showHStockPlaceName = true
-                    //                 }
-                    //             } else if (data.hBarTypeField == '浠撲綅鏉$爜') {
-                    //                 this.hform.HWHName = data.hWhNameField
-                    //                 this.hform.HWHID = data.hWhIDField
-                    //                 this.hform.HStockPlaceName = data.hSPNameField
-                    //                 this.hform.HStockPlaceID = data.hSPIDField
-                    //             } else if (data.hBarTypeField == '閮ㄩ棬鏉$爜') {
-                    //                 this.hform.HDeptName = data.hDeptNameField
-                    //                 this.hform.HDeptID = data.hDeptIDField
-                    //                 this.tabs = 1
-                    //             } else if (data.hBarTypeField == '婧愬崟鏉$爜') {
-                    //                 this.hform.HSupName = data.hSupNameField
-                    //                 this.hform.HSupID = data.hSupIDField
-                    //                 if (data.hDeptIDField != 0) {
-                    //                     this.hform.HDeptID = data.hDeptIDField
-                    //                     this.hform.HDeptName = data.hDeptNameField
-                    //                 }
-                    //                 this.hform.HSourceBillNo = data.hSourceBillNoField
-                    //                 //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                    //                 this.hform.HMainSourceBillType = data.hSourceBillTypeField
-                    //                 if (data.hSourceBillTypeField == "1105") {
-                    //                     this.HMainSourceBillType = '閫�鏂欓�氱煡鍗�'
-                    //                     this.hform.HMainSourceBillType = 1105
-                    //                     this.showHMainSourceBillType = false
-                    //                 } else if (data.hSourceBillTypeField == "1102") {
-                    //                     this.HMainSourceBillType = '閲囪喘璁㈠崟'
-                    //                     this.hform.HMainSourceBillType = 1102
-                    //                     this.showHMainSourceBillType = false
-                    //                 } else if (data.hSourceBillType == 1201) {
-                    //                     this.HMainSourceBillType = '閲囪喘鍏ュ簱鍗�'
-                    //                     this.hform.HMainSourceBillType = 1201
-                    //                     this.showHMainSourceBillType = false
-                    //                 } else {
-                    //                     this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-                    //                     this.hform.HMainSourceBillType = -1
-                    //                     this.showHMainSourceBillType = false
-                    //                 }
-                    //                 if (data.hMulSourceFlagField == 0) {
-                    //                     this.showHSourceBillNo = false
-                    //                 }
-                    //                 //渚涘簲鍟嗕笉鍙紪杈�
-                    //                 this.showHSupName = false
-                    //                 this.tabs = 2
-                    //             } else { //鐗╂枡鏉$爜
-                    //                 this.tabs = 2
-                    //                 if (!this.hform.HSourceBillNo) {
-                    //                     this.hform.HSupName = data.hSupNameField
-                    //                     this.hform.HSupID = data.hSupIDField
-                    //                     this.hform.HSourceBillNo = data.hSourceBillNoField
-                    //                     if (data.hDeptIDField != 0) {
-                    //                         this.hform.HDeptID = data.hDeptIDField
-                    //                         this.hform.HDeptName = data.hDeptNameField
-                    //                     }
-                    //                     console.log(data)
-                    //                     //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                    //                     this.hform.HMainSourceBillType = data.hSourceBillTypeField
-                    // 
-                    //                     let index = this.arrayHMainSourceBillValue.findIndex(e => e ==
-                    //                         data
-                    //                         .hSourceBillTypeField)
-                    //                     if (index != -1) {
-                    //                         this.HMainSourceBillType = this.arrayHMainSourceBillType[
-                    //                             index]
-                    //                         this.hform.HMainSourceBillType = data.hSourceBillTypeField
-                    //                         this.showHMainSourceBillType = false
-                    //                     }
-                    //                     // if (data.hSourceBillTypeField == "1103") {
-                    //                     // 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
-                    //                     // 	this.hform.HMainSourceBillType = 1103
-                    //                     // 	this.showHMainSourceBillType = false
-                    //                     // } else if (data.hSourceBillTypeField == "1102") {
-                    //                     // 	this.HMainSourceBillType = '閲囪喘璁㈠崟'
-                    //                     // 	this.hform.HMainSourceBillType = 1102
-                    //                     // 	this.showHMainSourceBillType = false
-                    //                     // } else {
-                    //                     // 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-                    //                     // 	this.hform.HMainSourceBillType = -1
-                    //                     // 	this.showHMainSourceBillType = false
-                    //                     // }
-                    //                     if (data.hMulSourceFlagField == 0) {
-                    //                         this.showHSourceBillNo = false
-                    //                     }
-                    //                     //渚涘簲鍟嗕笉鍙紪杈�
-                    //                     this.showHSupName = false
-                    //                 }
-                    //             }
-                    //             //鏄剧ず琛ㄤ綋鏄庣粏
-                    //             this.DisBillEntryList()
-                    //             //娓呯┖鏁伴噺
-                    //             this.hform.HQty = ''
-                    //         } else {
-                    //             this.playSound(0)
-                    //             this.refreshBarCodeState()
-                    //             uni.showToast({
-                    //                 title: res.data.Message,
-                    //                 icon: 'none'
-                    //             })
-                    //         }
-                    //     },
-                    //     fail: (res) => {
-                    //         this.playSound(0)
-                    //         this.refreshBarCodeState()
-                    //         console.log(res);
-                    //         uni.showToast({
-                    //             title: '鎺ュ彛璇锋眰澶辫触',
-                    //             icon: 'none'
-                    //         })
-                    //     },
-                    // });
-                }
             },
             //鐗╂枡淇℃伅
             DisBillEntryList() {
@@ -1278,7 +880,7 @@
             // 鏂板鍥炶皟
             addNew() {
                 uni.redirectTo({
-                    url: '/pages/caigoutuiliao/form?OperationType=1'
+                    url: '/pages/weixiujilu/form?OperationType=1'
                 })
             },
             //鏂板
diff --git a/pages/zhuangxiangdan/form.vue b/pages/zhuangxiangdan/form.vue
new file mode 100644
index 0000000..101667e
--- /dev/null
+++ b/pages/zhuangxiangdan/form.vue
@@ -0,0 +1,1062 @@
+<template>
+	<view class="form">
+		<view class="form-base-info">
+			<view class="form-item">
+				<view class="title">绠辨潯鐮�</view>
+				<!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
+				<view class="right" :class="disableBarCodePack ? 'disabled' : ''">
+					<input type="text" :focus="HBarCodePackFocus" v-model="HBarCode_Pack"
+						@confirm="GetMeesageByBarCode_Pack(HBarCode_Pack)" :disabled="disableBarCodePack" />
+				</view>
+				<view class="right-icon">
+					<uni-icons class="right-icon" :class="disableBarCodePack ? 'disabled':''" type="scan"
+						style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
+						@click="toScanCode" :disabled="disableBarCodePack"></uni-icons>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">浜у搧鐮�</view>
+				<!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
+				<view class="right" :class="disableBarCode ? 'disabled' : ''">
+					<input type="text" :focus="HBarCodeFocus" v-model="HBarCode"
+						@confirm="GetMeesageByBarCode(HBarCode)" :disabled="disableBarCode" />
+				</view>
+				<view class="right-icon">
+					<uni-icons class="right-icon" :class="[disableBarCode ? 'disabled':'']" type="scan"
+						style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
+						@click="toScanCode2" :disabled="disableBarCode"></uni-icons>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">宸叉壂鏁伴噺</view>
+				<view class="right disabled">
+					<input type="text" disabled :value="hform.HQtySum" />
+				</view>
+
+			</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="bill-info">
+				<view class="form-item">
+					<view class="title">婧愬崟绫诲瀷:</view>
+					<view class="right" v-show="showHMainSourceBillType" style='position: relative;'>
+						<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillTypeIndex"
+							@change="HMainSourceBillTypeChange">
+							<input name="HMainSourceBillType" disabled :value="HMainSourceBillType"
+								placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+							<view class="picker-overlay"></view>
+						</picker>
+					</view>
+					<view class="righton" v-show="!showHMainSourceBillType">
+						<input name="HMainSourceBillType" disabled :value="HMainSourceBillType" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+					</view>
+				</view>
+			</view>
+			<view class="bill-info">
+				<view class="form-item">
+					<view class="title">婧愬崟鍗曞彿:</view>
+					<view class="right" v-show="showHSourceBillNo">
+						<input :focus="HSourcebillNoFocus" type="text" @confirm="onHSourceBillNoConfirmHandler"
+							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="icon-wrapper" v-show="showHSourceBillNo">
+						<uni-icons type="right" size="20" @click="onHSourceBillNoConfirmHandler"></uni-icons>
+					</view>
+					<view class="righton" v-show="!showHSourceBillNo">
+						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+					</view>
+				</view>
+			</view>
+			<view class="bill-info">
+				<view class="form-item">
+					<view class="title">婧愬崟鐗╂枡</view>
+					<view class="right disabled">
+						<input type="text" disabled :value="hform.HMaterName" />
+					</view>
+
+				</view>
+			</view>
+			<view class="bill-info">
+				<view class="form-item">
+					<view class="title">鍗曟嵁鏃ユ湡</view>
+					<view class="right">
+						<uni-datetime-picker type="date" v-model="hform.HDate">
+							<input type="text" v-model="hform.HDate" />
+						</uni-datetime-picker>
+					</view>
+				</view>
+			</view>
+			<view class="bill-info">
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�</view>
+					<view class="right disabled">
+						<input type="text" disabled :value="hform.HMaker" />
+					</view>
+				</view>
+			</view>
+			<view class="bill-info">
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�</view>
+					<view class="right disabled">
+						<input type="text" disabled :value="hform.HBillNo" />
+					</view>
+				</view>
+			</view>
+			<view class="bill-info">
+				<view class="form-item">
+					<view class="title">鍗曟嵁ID</view>
+					<view class="right disabled">
+						<input type="text" disabled :value="hform.HInterID" />
+					</view>
+				</view>
+			</view>
+			<view class="bill-info">
+				<view class="form-item">
+					<view class="title">缁勭粐</view>
+					<view class="right disabled">
+						<input type="text" disabled :value="hform.HStockOrgName" />
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 瑁呯淇℃伅 -->
+		<view v-if="tabs == 1">
+			<zb-table id="list-table" :checked-highlight="true" :fit="true" :style="{height: `${listTableHeight}px`}"
+				:columns="columns" :data="listData" :show-header="true" :border="true" :row-key="row => row.index"
+				@toggleRowSelection="handleSelect" @toggleAllSelection="handleSelectAll"
+				@rowClick="onTableRowClickHandler" />
+		</view>
+		<view class="bottom-btn" id="bottom-btn">
+			<button :class="EnableSubmit?'btn-a':'btn-c'" :disabled="!EnableSubmit" size="mini"
+				@tap="cmdSubmit">鎻愪氦</button>
+			<view style="flex: 1;"></view>
+			<button class="btn-d" size="mini" @tap="cmdDelete">鍒犻櫎</button>
+			<button class="btn-c" size="mini" @tap="cmdExit">閫�鍑�</button>
+		</view>
+		<!-- 寮圭獥缁勪欢 -->
+		<BillListPopupVue ref="billList" :HBillType="HBillType" :HSourceBillType="hform.HMainSourceBillType || 3710"
+			:HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
+			
+	</view>
+</template>
+<script>
+	import dayjs from 'dayjs'
+	import {
+		getUserInfo
+	} from "../../utils/auth";
+	import {
+		CommonUtils
+	} from "@/utils/common.js"
+	import {
+		MpaasScan
+	} from "@/utils/mpaasScan.js"
+	import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
+
+	export default {
+		data() {
+			return {
+				// ==================== 甯冨眬璁$畻鐩稿叧 ====================
+				// 璁$畻鍒楄〃楂樺害
+				bottomBtnTop: 0,
+				listTableTop: 0,
+
+				// ==================== 鐣岄潰鐘舵�佹帶鍒� ====================
+				EnableSubmit: true, // 鏄惁鍏佽鎻愪氦
+				disableBarCodePack: true, // 绠辨潯鐮佺鐢ㄧ姸鎬�
+				disableBarCode: true, // 浜у搧鐮佺鐢ㄧ姸鎬�
+				HBarCodePackFocus: false, // 绠辨潯鐮佽緭鍏ユ鑱氱劍鐘舵��
+				HBarCodeFocus: false, // 浜у搧鐮佽緭鍏ユ鑱氱劍鐘舵��
+				tabs: 0, // 褰撳墠閫夐」鍗�(0:鍗曟嵁淇℃伅,1:瑁呯淇℃伅)
+
+
+				// ==================== 涓氬姟鏁版嵁 ====================
+				HBarCode_Pack: '', // 绠辨潯鐮�
+				HBarCode: '', // 浜у搧鐮�
+				HBillType: '3783', // 鍗曟嵁绫诲瀷
+				HBillSubType: '1', // 瀛愮被鍨嬶紙1瑁呯銆�2缁勬墭锛�
+				OperationType: 1, // 鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+				HMaterNumber_Pack: "", // 鎵樻潯鐮佸搴旂墿鏂欎唬鐮�
+				HBarCode_Pack_Temp: "", // 浠庣紦瀛樺垪琛ㄤ腑杩斿洖绠辨潯鐮�
+				BarCodeType: 1, // 鏉$爜绫诲瀷(1:瑁呯,2:缁勬墭)
+
+				HSourcebillNoFocus: false, // 婧愬崟鍗曞彿杈撳叆妗嗚仛鐒︾姸鎬� - 鏂板杩欎釜灞炴��
+				showHMainSourceBillType: true,
+				showHSourceBillNo: true,
+				HMainSourceBillTypeIndex: 0,
+				HMainSourceBillType: '鐢熶骇璁㈠崟',
+				arrayHMainSourceBillType: ['鐢熶骇璁㈠崟', '鎵嬪伐褰曞叆'],
+				arrayHMainSourceBillValue: [3710, -1],
+
+				// ==================== 鍒楄〃鏁版嵁 ====================
+				listOption: [], // 鍒楄〃閫夐」
+				listData: [], // 琛ㄦ牸鏁版嵁
+				selectedRows: [], // 琛ㄦ牸閫変腑鐨勬暟鎹�
+				columns: [ // 琛ㄦ牸鍒楅厤缃�
+					{
+						type: 'selection',
+						fixed: true,
+						width: 50
+					},
+					{
+						name: 'index',
+						label: '搴忓彿',
+						width: 60,
+						hidden: true
+					},
+					{
+						name: '鏉$爜缂栧彿',
+						label: '鏉$爜缂栧彿',
+						width: 100
+					},
+					{
+						name: '鏁伴噺',
+						label: '鏁伴噺',
+						width: 100
+					},
+					{
+						name: '鐗╂枡浠g爜',
+						label: '鐗╂枡浠g爜',
+						width: 100
+					},
+					{
+						name: '鐗╂枡鍚嶇О',
+						label: '鐗╂枡鍚嶇О',
+						width: 100
+					},
+					{
+						name: '鏉$爜涓暟',
+						label: '鏉$爜涓暟',
+						width: 100
+					}
+				],
+
+				// ==================== 涓昏〃鍗曟暟鎹� ====================
+				hform: {
+					HDate: dayjs(new Date()).format('YYYY-MM-DD'), // 鍗曟嵁鏃ユ湡
+					HMaker: getUserInfo()['Czymc'], // 鍒跺崟浜�
+					HBillNo: '', // 鍗曟嵁鍙�
+					HInterID: '', // 鍗曟嵁ID
+					HStockOrgName: uni.getStorageSync("Organization"), // 缁勭粐鍚嶇О
+					HStockOrgID: uni.getStorageSync("OrganizationID"), // 缁勭粐ID
+					HMainSourceBillType: 3710, //婧愬崟绫诲瀷
+					HMaterName: '', //婧愬崟鐗╂枡
+					HMaterID: '', //婧愬崟鐗╂枡id
+					HQtySum: '', //澶栫鐮佹暟閲�
+					totalQty: 0, // 鎬绘暟
+				},
+
+				// ==================== 绯荤粺閰嶇疆 ====================
+				HModName: "Sc_PackUnionBill_Packing_PDA", // 妯″潡鍚嶇О
+				ModRightName: "CE_PackUnionBill_Packing", // 妯″潡鏉冮檺鍙傛暟
+				titleData: [] // 涓嶉渶瑕佹樉绀虹殑瀛楁
+			}
+		},
+		components: {
+			BillListPopupVue,
+		},
+		// ==================== 璁$畻灞炴�� ====================
+		computed: {
+			// 璁$畻琛ㄦ牸楂樺害
+			listTableHeight: {
+				get() {
+					return this.bottomBtnTop - this.listTableTop - 10
+				}
+			}
+		},
+
+		// ==================== 鏂规硶 ====================
+		methods: {
+			// 澶嶉�夋鍙樺寲澶勭悊
+			checkboxGroupChangeHandler(e) {
+				let checkBoxValues = Array.from(e.detail.value)
+				this.hform.HQualityApproval = checkBoxValues.includes('qualityApproval')
+			},
+
+			// 琛ㄦ牸琛岀偣鍑诲鐞�
+			onTableRowClickHandler(row, index) {
+				if (!this.listData[index].checked) {
+					this.$set(this.listData[index], 'checked', true)
+				} else {
+					this.listData[index].checked = !this.listData[index].checked
+				}
+			},
+
+			// 鍒锋柊浜у搧鐮佽緭鍏ユ鐒︾偣
+			async HBarCodeFocusRefresh() {
+				this.HBarCode = ''
+				this.HBarCodeFocus = false
+				await this.$nextTick()
+				this.HBarCodeFocus = true
+			},
+
+			// 鍒锋柊绠辨潯鐮佽緭鍏ユ鐒︾偣
+			async HBarCodePackFocusRefresh() {
+				this.HBarCode_Pack = ''
+				this.HBarCodePackFocus = false
+				await this.$nextTick()
+				this.HBarCodePackFocus = true
+			},
+
+			// 鎵弿绠辨潯鐮�
+			toScanCode() {
+				MpaasScan.scanCode((scanCode) => {
+					this.HBarCode_Pack = scanCode
+					this.GetMeesageByBarCode_Pack(this.HBarCode_Pack)
+				})
+			},
+
+			// 鏍规嵁绠辨潯鐮佽幏鍙栦俊鎭�
+			GetMeesageByBarCode_Pack(HBarCode_Pack) {
+				CommonUtils.doRequest2({
+					url: '/WEBSController/Get_PackBarCode_PackUnionBill_New_Json_Cus',
+					data: {
+						HInterID: this.hform.HInterID || 0,
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.HBillType,
+						HBillSubType: this.HBillSubType,
+						HBarCode_Pack: HBarCode_Pack,
+						HSourceBillNo: this.hform.HSourceBillNo,
+					},
+					resFunction: (res) => {
+						let {
+							data,
+							count,
+							Message,
+							list
+						} = res.data
+						if (count == 1) {
+							CommonUtils.playSound(1)
+							this.hform.HBillNo = data[0].HBillNo
+							this.hform.HInterID = data[0].HInterID
+							this.HMaterNumber_Pack = data[0].HMaterNumber
+							this.hform.HMaterName = data[0].HMaterName
+							// 璁剧疆鎬绘暟锛屽綋鍓嶆壂鎻忔暟閲忛�氳繃DisBillEntryList鏇存柊
+							const totalQty = data[0].HBarcodeQtys || 0
+							this.hform.HQtySum = `0/${totalQty}`
+							//澶勭悊鎴愬姛鍚庤仛鐒﹀埌浜у搧鐮佽緭鍏ユ
+							this.HBarCodeFocusRefresh()
+							this.DisBillEntryList();
+							uni.showToast({
+								icon: 'none',
+								title: Message
+							})
+						} else {
+							CommonUtils.playSound(0)
+							this.HBarCodePackFocusRefresh()
+							uni.showToast({
+								icon: 'none',
+								title: Message
+							})
+						}
+					}
+				})
+			},
+
+			// 鎵弿浜у搧鐮乻
+			toScanCode2() {
+				MpaasScan.scanCode((scanCode) => {
+					this.HBarCode = scanCode
+					this.GetMeesageByBarCode(scanCode)
+				})
+			},
+
+			// 鏍规嵁浜у搧鐮佽幏鍙栦俊鎭�
+			GetMeesageByBarCode(HBarCode) {
+				let HBarCode_Pack = this.HBarCode_Pack
+				let sOldBarCode = this.HBarCode
+				let HDeleteFlag = sOldBarCode.substring(0, 1)
+				let sBarCode = sOldBarCode.slice(1)
+
+				if (!HBarCode_Pack) {
+					return uni.showToast({
+						icon: 'none',
+						title: '绠辨潯鐮佷笉鑳戒负绌猴紝璇峰厛鎵弿鎵樻潯鐮侊紒'
+					})
+				}
+				if (HDeleteFlag == '*') {
+					// 鍒犻櫎鏉$爜閫昏緫
+					if (!sBarCode) {
+						return uni.showToast({
+							icon: 'none',
+							title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�'
+						})
+					} else {
+						this.HBarCodeFocusRefresh()
+					}
+					CommonUtils.doRequest2({
+						url: '/WEBSController/set_DelPackUnionBill_Temp_Pack_Json',
+						data: {
+							"HInterID": this.hform.HInterID,
+							"HBarCode": sBarCode,
+							"HBillType": this.HBillType
+						},
+						resFunction: (res) => {
+							let {
+								data,
+								count,
+								Message
+							} = res.data
+							if (count == 1) {
+								CommonUtils.playSound(1)
+								this.tabs = 1
+								this.DisBillEntryList()
+							} else {
+								CommonUtils.playSound(0)
+								uni.showToast({
+									icon: 'none',
+									title: Message
+								})
+							}
+						}
+					})
+				} else {
+					// 鏂板鏉$爜閫昏緫
+					let sBarCode = this.HBarCode
+					if (!sBarCode) {
+						return uni.showToast({
+							icon: 'none',
+							title: '鏉$爜涓嶈兘涓虹┖锛岃鎵弿鏉$爜锛�'
+						})
+					}
+					CommonUtils.doRequest2({
+						url: '/WEBSController/Get_BarCode_PackUnionBill_New_Json_Cus',
+						data: {
+							"HBarCode": sBarCode,
+							"HInterID": this.hform.HInterID,
+							"HBillNo": this.hform.HBillNo,
+							"HBillType": this.HBillType,
+							"HBillSubType": this.HBillSubType,
+							"HBarCode_Pack": this.HBarCode_Pack,
+							"HMaterNumber_Pack": this.HMaterNumber_Pack,
+							"HMaker": this.hform.HMaker,
+							"HStockOrgID": this.hform.HStockOrgID
+						},
+						resFunction: (res) => {
+							let {
+								data,
+								count,
+								Message
+							} = res.data
+							if (count == 1) {
+								CommonUtils.playSound(1)
+								this.tabs = 1
+								this.HBarCodeFocusRefresh()
+								this.DisBillEntryList()
+							} else {
+								CommonUtils.playSound(0)
+								this.HBarCodeFocusRefresh()
+								uni.showToast({
+									icon: 'none',
+									title: Message
+								})
+							}
+						}
+					})
+				}
+			},
+			// 鏄剧ず鍗曟嵁鏄庣粏鍒楄〃
+			DisBillEntryList() {
+				CommonUtils.doRequest2({
+					url: '/WEBSController/GetBillEntry_Tmp_Pack_Json',
+					data: {
+						"HInterID": this.hform.HInterID,
+						"HBillNo": this.hform.HBillNo,
+						"HBillType": this.HBillType
+					},
+					resFunction: (res) => {
+						let {
+							count,
+							data,
+							Message
+						} = res.data
+						this.listData = []
+						if (count == 1) {
+							for (let i = 0; i < data.length; i++) {
+								this.listData.push(Object.assign(data[i], {
+									index: i
+								}))
+							}
+
+							// 鏂板锛氭牴鎹繑鍥炵殑鏉$爜鍒楄〃鏁伴噺鏇存柊宸叉壂鏁伴噺
+							if (this.hform.HQtySum && this.hform.HQtySum.includes('/')) {
+								const total = this.hform.HQtySum.split('/')[1] // 鑾峰彇鎬绘暟
+								const currentScanned = data.length // 褰撳墠宸叉壂鎻忔暟閲�
+								this.hform.HQtySum = `${currentScanned}/${total}`
+								// 鏂板锛氭鏌ユ槸鍚﹁揪鍒版�绘暟锛屽鏋滄槸鍒欐彁绀轰繚瀛�
+								if (currentScanned >= total) {
+									uni.showModal({
+										title: '鎻愮ず',
+										content: '宸叉壂鏁伴噺宸茶揪鍒颁笂闄愶紝鏄惁绔嬪嵆淇濆瓨锛�',
+										confirmText: '淇濆瓨',
+										cancelText: '鍙栨秷',
+										success: ({
+											confirm
+										}) => {
+											if (confirm) {
+												// 鐢ㄦ埛鐐瑰嚮淇濆瓨锛岃皟鐢ㄤ繚瀛樻柟娉�
+												this.cmdSubmit()
+											} else {
+												// 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屼笉鍋氫换浣曟搷浣�
+												uni.showToast({
+													icon: 'none',
+													title: '鎮ㄥ彲浠ラ�夋嫨鎵嬪姩淇濆瓨'
+												})
+											}
+										}
+									})
+								}
+							} else {
+								// 濡傛灉娌℃湁鏁版嵁锛岄噸缃凡鎵暟閲�
+								if (this.hform.HQtySum && this.hform.HQtySum.includes('/')) {
+									const total = this.hform.HQtySum.split('/')[1] // 鑾峰彇鎬绘暟
+									this.hform.HQtySum = `0/${total}`
+								}
+							}
+						} else {
+							// 濡傛灉娌℃湁鏁版嵁锛岄噸缃凡鎵暟閲�
+							if (this.hform.HQtySum && this.hform.HQtySum.includes('/')) {
+								const total = this.hform.HQtySum.split('/')[1] // 鑾峰彇鎬绘暟
+								this.hform.HQtySum = `0/${total}`
+							}
+						}
+					}
+				})
+			},
+
+			// 琛ㄦ牸閫夋嫨澶勭悊
+			handleSelect(selected, array) {
+				this.selectedRows = array
+			},
+
+			// 琛ㄦ牸鍏ㄩ�夊鐞�
+			handleSelectAll(selected, array) {
+				this.selectedRows = array
+			},
+			// 鎾斁鎻愮ず闊�
+			playSound(type) {
+				const innerAudioContext = uni.createInnerAudioContext();
+				innerAudioContext.src = type == 1 ? '/static/success.wav' : '/static/jingbao.wav';
+				innerAudioContext.play();
+			},
+
+			// -----------------璁剧疆婧愬崟淇℃伅----------------------------------------------------
+			async setSourceBillInfo(data) {
+				this.hform.HMaterName = data[0].鐗╂枡鍚嶇О
+				this.hform.HMaterID = data[0].HMaterID
+				this.hform.HSourceBillNo = data[0].鍗曟嵁鍙�
+				this.hform.HMainSourceBillType = data[0].HSourceBillType
+
+				// 鏇存柊婧愬崟绫诲瀷鏄剧ず
+				const index = this.arrayHMainSourceBillValue.findIndex(e => e == data[0].HSourceBillType)
+				if (index !== -1) {
+					this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
+					this.HMainSourceBillTypeIndex = index
+					this.showHMainSourceBillType = false
+				}
+
+				if (data.hMulSourceFlagField == 0) {
+					this.showHSourceBillNo = false
+				}
+			},
+			// 婧愬崟绫诲瀷鍙樻洿
+			HMainSourceBillTypeChange(e) {
+				this.HMainSourceBillTypeIndex = e.detail.value
+				this.HMainSourceBillType = this.arrayHMainSourceBillType[this.HMainSourceBillTypeIndex]
+				this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[this.HMainSourceBillTypeIndex]
+			},
+
+			// 婧愬崟鍗曞彿纭
+			async onHSourceBillNoConfirmHandler() {
+				if (this.hform.HMainSourceBillType == -1) {
+					this.playSound(1)
+					return
+				}
+				// 鑾峰彇婧愬崟鐘舵��
+				await this.getSourceBarCodeControl(this.hform.HSourceBillNo)
+			},
+			// 鑾峰彇婧愬崟鐘舵��
+			async getSourceBarCodeControl(HSourceBillNo) {
+				try {
+					let res = await CommonUtils.doRequest2Sync({
+						url: '/WEBSController/GetSourceBillList_Control',
+						data: {
+							HBillType: this.HBillType,
+							HSourceBillType: this.hform.HMainSourceBillType,
+							HStockOrgID: this.hform.HStockOrgID,
+							HSourceBillNo: HSourceBillNo,
+							HMater: '',
+							HCustom: ''
+						}
+					})
+
+					if (res.data.count == 1) {
+						// 鑾峰彇婧愬崟鏁版嵁
+						await this.getSourceBarCodeData(this.hform.HSourceBillNo)
+					} else {
+						this.playSound(0)
+						uni.showToast({
+							title: res.data.Message,
+							icon: 'none'
+						})
+						this.refreshHSourceBillState()
+					}
+				} catch (error) {
+					this.playSound(0)
+					uni.showToast({
+						title: '鑾峰彇婧愬崟鏁版嵁澶辫触',
+						icon: 'none'
+					})
+					this.refreshHSourceBillState()
+				}
+			},
+			// 鑾峰彇婧愬崟鏁版嵁
+			async getSourceBarCodeData(HSourceBillNo) {
+				try {
+					let res = await CommonUtils.doRequest2Sync({
+						url: '/WEBSController/GetSourceBillList_Json',
+						data: {
+							HBillType: this.HBillType,
+							HSourceBillType: this.hform.HMainSourceBillType,
+							HStockOrgID: this.hform.HStockOrgID,
+							HSourceBillNo: HSourceBillNo,
+							HMater: '',
+							HCustom: ''
+						}
+					})
+
+					if (res.data.count == 1) {
+						this.playSound(1)
+						await this.setSourceBillInfo(res.data.data)
+						// 婧愬崟鏁版嵁杩斿洖鎴愬姛鍚庯紝瑙i櫎绂佺敤骞惰仛鐒﹀埌绠辨潯鐮�
+						this.disableBarCodePack = false
+						this.disableBarCode = false
+						this.HBarCodePackFocusRefresh()
+					} else {
+						this.playSound(0)
+						uni.showToast({
+							title: res.data.Message,
+							icon: 'none'
+						})
+						this.refreshHSourceBillState()
+					}
+				} catch (error) {
+					this.playSound(0)
+					uni.showToast({
+						title: '鑾峰彇婧愬崟鏁版嵁澶辫触',
+						icon: 'none'
+					})
+					this.refreshHSourceBillState()
+				}
+			},
+
+			// 鍒锋柊婧愬崟杈撳叆鐘舵��
+			async refreshHSourceBillState() {
+				this.HSourcebillNoFocus = false
+				await this.$nextTick(() => {
+					this.hform.HSourceBillNo = ""
+					this.HSourcebillNoFocus = true
+				})
+			},
+
+			// 鏄剧ず婧愬崟鍒楄〃
+			showBillList() {
+				this.$refs.billList.showPopup()
+			},
+			//--------------------------------------------------------------------------------------
+
+			// 鑾峰彇鏈�澶у崟鎹彿
+			getMaxNo() {
+				CommonUtils.doRequest2({
+					url: "/WEBSController/GetMaxBillNoAndID_Json",
+					data: {
+						"HBillType": this.HBillType
+					},
+					resFunction: (d) => {
+						let {
+							count,
+							data,
+							Message
+						} = d.data
+						if (count == 1) {
+							this.hform.HInterID = data[0].HInterID;
+							this.hform.HBillNo = data[0].HBillNo
+						} else {
+							uni.showModal({
+								title: "娓╅Θ鎻愮ず",
+								showCancel: false,
+								content: Message
+							})
+						}
+					}
+				})
+			},
+
+			// 鎻愪氦鍓嶆鏌�
+			submitPreCheck() {
+				if (CommonUtils.isEmpty(this.hform.HInterID)) {
+					uni.showToast({
+						icon: 'none',
+						title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�'
+					})
+					return false
+				}
+				if (CommonUtils.isEmpty(this.hform.HBillNo)) {
+					uni.showToast({
+						icon: 'none',
+						title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�'
+					})
+					return false
+				}
+				if (this.listData.length < 1) {
+					uni.showToast({
+						icon: 'none',
+						title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�'
+					})
+					return false
+				}
+				return true
+			},
+
+			// 鍒犻櫎閫変腑琛�
+			cmdDelete() {
+				if (this.selectedRows.length != 1) {
+					return uni.showToast({
+						icon: 'none',
+						title: '璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�'
+					})
+				}
+				uni.showModal({
+					title: '鍒犻櫎纭',
+					content: '纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠!',
+					success: ({
+						confirm
+					}) => {
+						if (confirm) {
+							CommonUtils.doRequest2({
+								url: '/WEBSController/set_DelPackUnionBill_Temp_Pack_Json',
+								data: {
+									HInterID: this.hform.HInterID,
+									HBillType: this.HBillType,
+									HBarCode: this.selectedRows[0].HBarCode
+								},
+								resFunction: (res) => {
+									let {
+										data,
+										count,
+										Message
+									} = res.data
+									if (count == 1) {
+										CommonUtils.playSound(1)
+										uni.showToast({
+											icon: 'none',
+											title: Message
+										})
+										this.DisBillEntryList()
+									} else {
+										CommonUtils.playSound(0)
+										uni.showToast({
+											icon: 'none',
+											title: Message
+										})
+									}
+								}
+							})
+						}
+					}
+				})
+			},
+
+			// 鎻愪氦鍗曟嵁
+			cmdSubmit() {
+				let checkRes = this.submitPreCheck()
+				if (!checkRes) return
+
+				this.EnableSubmit = false
+				CommonUtils.doRequest2({
+					url: '/WEBSController/set_SavePackUnionBill_Json',
+					data: {
+						"HInterID": this.hform.HInterID,
+						"HBillType": this.HBillType,
+						"HBillNo": this.hform.HBillNo,
+						"HBarCode_Pack": this.HBarCode_Pack,
+						"HMaker": this.hform.HMaker,
+						"HStockOrgID": this.hform.HStockOrgID
+					},
+					resFunction: (res) => {
+						let {
+							data,
+							count,
+							Message
+						} = res.data
+						if (count == 1) {
+							this.Sc_ICMOBillWorkQtyStatus_Save()
+							uni.showModal({
+								title: '娓╅Θ鎻愮ず',
+								content: Message,
+								confirmText: "鏂板",
+								cancelText: '鍏抽棴',
+								success: ({
+									confirm,
+									cancel
+								}) => {
+									if (confirm) {
+										uni.redirectTo({
+											url: "/pages/zhuangxiangdan/form"
+										})
+									}
+									if (cancel) {
+										uni.navigateBack()
+									}
+								}
+							})
+						} else {
+							uni.showToast({
+								icon: 'none',
+								title: Message
+							})
+						}
+					}
+				})
+			},
+			//鑷姩鐢熶骇浜ч噺姹囨姤鍗�
+			Sc_ICMOBillWorkQtyStatus_Save() {
+				CommonUtils.doRequest2({
+					url: "/WEBSController/Sc_ICMOBillWorkQtyStatus_Tmp_Save",
+					data: {
+						"HInterID": this.hform.HInterID
+					},
+					resFunction: (d) => {
+						let {
+							count,
+							data,
+							Message
+						} = d.data
+						if (count == 1) {
+
+						} else {
+							uni.showModal({
+								title: "娓╅Θ鎻愮ず",
+								showCancel: false,
+								content: Message
+							})
+						}
+					}
+				})
+			},
+
+			// 閫�鍑洪〉闈�
+			cmdExit() {
+				uni.navigateBack()
+			}
+		},
+
+		// ==================== 鐢熷懡鍛ㄦ湡 ====================
+		async onReady() {
+			// 璁$畻琛ㄦ牸楂樺害
+			// #ifndef MP-WEIXIN
+			let query = uni.createSelectorQuery().in(this)
+			query.select("#bottom-btn").boundingClientRect((data) => {
+				if (data) this.bottomBtnTop = data.top
+			}).exec();
+			query.select("#list-table").boundingClientRect((data) => {
+				if (data) this.listTableTop = data.top
+			}).exec();
+			// #endif
+		},
+
+		onLoad(e) {
+			// 鍒濆鍖栧弬鏁�
+			this.BarCodeType = e.BarCodeType || 1
+			this.OperationType = e.OperationType || 1
+			this.HBarCode_Pack = e.HBarCode_Pack_Temp || ""
+			this.hform.HSourceBillNo = e.HSourceBillNo || ""
+
+			// 鏍规嵁鎿嶄綔绫诲瀷鍒濆鍖栨暟鎹�
+			if (this.OperationType == 1) {
+				this.getMaxNo() // 鏂板妯″紡锛氳幏鍙栨柊鍗曟嵁鍙�
+				// 鍒濆鍖栨椂鑱氱劍鍒版簮鍗曞崟鍙�
+				this.HSourcebillNoFocus = true
+			} else if (this.OperationType == 2) {
+				this.disableBarCodePack = false
+				this.disableBarCode = false
+				this.GetMeesageByBarCode_Pack(this.HBarCode_Pack) // 缂撳瓨妯″紡锛氬姞杞藉凡鏈夋暟鎹�
+				this.DisBillEntryList()
+				this.tabs = 0
+			}
+
+			// 榛樿鑱氱劍鍒扮鏉$爜杈撳叆妗�
+			//this.HBarCodePackFocusRefresh()
+			uni.$on('BillSelectComplete', (e) => {
+				console.log("鎺ユ敹鍒扮殑婧愬崟: ", e.HBillNo)
+				// 鑾峰彇婧愬崟鐘舵��
+				this.getSourceBarCodeControl(e.HBillNo)
+				//this.getSourceBarCodeData(e.HBillNo)
+				this.$refs.billList.exit()
+			})
+		},
+		onUnload() {
+			uni.$off('BillSelectComplete')
+		}
+	}
+</script>
+
+<style lang="scss">
+	input {
+		width: inherit;
+		padding: 8rpx 20rpx;
+		font-size: 30rpx;
+	}
+
+	.form {
+		display: flex;
+		flex-direction: column;
+		gap: 20rpx;
+
+		.form-base-info {
+			display: flex;
+			flex-direction: column;
+			gap: 10rpx;
+			box-sizing: border-box;
+			padding: 30rpx;
+		}
+
+		.bill-info {
+			display: flex;
+			flex-direction: column;
+			gap: 10rpx;
+			box-sizing: border-box;
+			padding: 16rpx 30rpx;
+		}
+
+		.form-item {
+			display: flex;
+			flex-direction: row;
+			gap: 10rpx;
+
+			.title {
+				width: 5rem;
+				flex-shrink: 0;
+			}
+
+			.right {
+				flex: 1;
+				border-radius: 22rpx;
+				border: 1px solid #acacac;
+			}
+
+			.disabled {
+				border: 1px solid #e4e4e4;
+				background-color: #e4e4e4;
+			}
+
+			.right-icon {
+				flex-shrink: 0;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+
+			.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;
+			}
+		}
+	}
+
+	.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;
+		}
+	}
+
+	.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;
+		}
+	}
+
+	.right-icon.disabled {
+		background-color: #ccc !important;
+		color: #666 !important;
+		cursor: not-allowed;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/zhuangxiangdan/table.vue b/pages/zhuangxiangdan/table.vue
new file mode 100644
index 0000000..b08c7ea
--- /dev/null
+++ b/pages/zhuangxiangdan/table.vue
@@ -0,0 +1,487 @@
+<template>
+	<view class="content">
+		<view class="tabs">
+			<view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
+		</view>
+
+		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+		<view class="form" v-if="tabs == 0">
+			<view class="buttons" @tap="add">
+				<uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
+			</view>
+		</view>
+
+		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+		<view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+			<uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+				@tap="showDetail = showDetail==index?-1:index">
+				<view class="card-detail">
+					<view class="detail" v-if="item.鎵樻潯鐮�">
+						<text>鎵樻潯鐮侊細</text>{{item.鎵樻潯鐮亇}
+					</view>
+					<view class="detail" v-if="item.HSourceBillNo">
+						<text>婧愬崟鍙凤細</text>{{item.HSourceBillNo}}
+					</view>
+					<view class="detail" v-if="item.鍒跺崟浜�">
+						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+					</view>
+					<view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+						<text>鍒跺崟鏃ユ湡锛�</text>{{ item.鍒跺崟鏃ユ湡.split('T')[0] }}
+					</view>
+					<view class="detail" v-if="item.缁勭粐">
+						<text>缁勭粐锛�</text>{{item.缁勭粐}}
+					</view>
+				</view>
+
+				<view class="more">
+					<view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
+						<uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>缂栬緫
+					</view>
+					<view class="part" style="color: #da0000;" @tap.stop="del(item)">
+						<uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>鍒犻櫎
+					</view>
+				</view>
+			</uni-card>
+		</view>
+		<view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==1">
+			<uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+				@tap="showDetail = showDetail==index?-1:index">
+				<view class="card-detail">
+					<view class="detail" v-if="item.鐘舵��">
+						<text>鐘舵�侊細</text>{{item.鐘舵�亇}
+					</view>
+					<view class="detail" v-if="item.鍒跺崟浜�">
+						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+					</view>
+					<view class="detail" v-if="item.鏁伴噺">
+						<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+					</view>
+					<view class="detail" v-if="item.婧愬崟鍗曞彿">
+						<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+					</view>
+					<view class="detail" v-if="item.鐗╂枡浠g爜">
+						<text>鐗╂枡浠g爜锛�</text>{{item.鐗╂枡浠g爜}}
+					</view>
+					<view class="detail" v-if="item.鐗╂枡鍚嶇О">
+						<text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+					</view>
+					<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+						<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+					</view>
+					<view class="detail" v-if="item.缁勭粐">
+						<text>缁勭粐锛�</text>{{item.缁勭粐}}
+					</view>
+				</view>
+
+				<view class="more">
+					<view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
+						<uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>鏄剧ず浜岀淮鐮�
+					</view>
+					<view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
+						<uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>鎾ら攢
+					</view>
+				</view>
+			</uni-card>
+		</view>
+
+		<view class="over" v-if="!listData || listData.length == 0">鏆傛棤鏁版嵁</view>
+		<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
+		<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+		<BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+	</view>
+</template>
+
+<script>
+	import dayjs from "dayjs";
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
+	import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+	export default {
+		data() {
+			return {
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				tabs: 0,
+				urls: '/WEBSController/GetSc_PackUnionBill_TempList_Json',
+				MvarReportTitle: '瑁呯鍗曠紦瀛樺垪琛�',
+				hform: {
+					// HBillNo: '',
+					// HSourceBillNo: '',
+					HBillType: 3783,
+					HMaker: uni.getStorageSync('HUserName'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+				},
+				sWhere: '',
+				listData: [],
+				showList: [],
+				showDetail: -1,
+
+				page: 1,
+			}
+		},
+		components: {
+			BarCodePopupVue
+		},
+		onShow() {
+			//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+			this.CheckModRight()
+			this.changeTab(0)
+			console.log(this.userInfo, uni.getStorageSync('HUserName'))
+		},
+		onReachBottom: function() {
+			this.page++
+			setTimeout(() => {
+				this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+			}, 100)
+		},
+		onPullDownRefresh: function() {
+			this.clear()
+			setTimeout(() => {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		methods: {
+			async qrCodeDisplay(item) {
+				this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+				await this.$nextTick()
+				this.$refs.barcodePopup.open()
+			},
+			CheckModRight() {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+					data: {
+						ModRightName: 'CE_PackUnion',
+						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'
+						})
+					},
+				});
+			},
+			getPage(page, list) {
+				let sindex = (parseInt(page) - 1) * 20
+				let eindex = parseInt(page) * 20
+				let newList = list.slice(sindex, eindex)
+				return newList
+			},
+			changeTab(e) {
+				this.tabs = e
+				this.page = 1
+				this.showList = []
+
+				if (this.tabs == 0) {
+					this.urls = '/WEBSController/GetSc_PackUnionBill_TempList_Json'
+				}
+				// if(this.tabs == 1){
+				// 	this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+				// }
+				this.getList()
+			},
+			getList() {
+				uni.showLoading({
+					title: '鍔犺浇涓�...'
+				})
+				uni.request({
+					url: this.serverUrl + this.urls,
+					data: this.hform,
+					success: (res) => {
+						console.log(1, res);
+						if (res.data.count == 1) {
+							this.listData = res.data.data
+							this.showList = this.getPage(this.page, this.listData)
+							setTimeout(() => {
+								uni.hideLoading()
+							}, 1000)
+						} else {
+							uni.hideLoading()
+							this.listData = []
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.hideLoading()
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			search() {
+				this.sWhere = ''
+				this.listData = []
+				this.page = 1
+				this.showList = []
+
+				console.log(this.hform)
+				this.getList()
+			},
+			clear() {
+				this.listData = []
+				this.page = 1
+				this.showList = []
+
+				this.sWhere = ''
+				this.hform = {
+					HBillNo: '',
+					HSourceBillNo: '',
+					HBillType: 3783,
+					HMaker: uni.getStorageSync('HUserName'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+				}
+				this.getList()
+			},
+			add() {
+				uni.navigateTo({
+					url: './form?OperationType=1'
+				})
+			},
+			//缂栬緫
+			edit(item) {
+				console.log(item)
+				uni.navigateTo({
+					url: './form?OperationType=2&HBarCode_Pack_Temp=' + item["HBarCode_Pack"] + '&HSourceBillNo=' +item["HSourceBillNo"],
+				})
+			},
+			//鍒犻櫎
+			del(item) {
+				// console.log(item.hmainid,uni.getStorageSync('HUserName'))
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.request({
+								url: this.serverUrl +
+									'/WEBSController/DeleteTemp_PackUnionBill_Json',
+								data: {
+									HInterID: item.HInterID,
+								},
+								success: (res) => {
+									console.log(1, res);
+									if (res.data.count == 1) {
+										this.clear()
+									}
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								},
+								fail: (res) => {
+									console.log(res);
+									uni.hideLoading()
+									uni.showToast({
+										title: '鎺ュ彛璇锋眰澶辫触',
+										icon: 'none'
+									})
+								},
+							});
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			},
+			//鎾ら攢
+			revoke(item) {
+				// console.log(item.hmainid,uni.getStorageSync('HUserName'))
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '鏄惁纭鎾ら攢',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.request({
+								url: this.serverUrl +
+									'/WEBSController/set_DeleteICStockBillAndWMS_Json',
+								data: {
+									HInterID: item.HInterID,
+									HBillNo: item.鍗曟嵁鍙�,
+									HBillType: this.hform.HBillType,
+									HMaker: uni.getStorageSync('HUserName'),
+									MvarReportTitle: this.MvarReportTitle,
+								},
+								success: (res) => {
+									console.log(1, res);
+									if (res.data.count == 1) {
+										this.clear()
+									}
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								},
+								fail: (res) => {
+									console.log(res);
+									uni.hideLoading()
+									uni.showToast({
+										title: '鎺ュ彛璇锋眰澶辫触',
+										icon: 'none'
+									})
+								},
+							});
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form {
+		width: 640rpx;
+		margin: 20rpx auto;
+		margin-top: 90rpx;
+	}
+
+	.tabs {
+		width: 100%;
+		position: fixed;
+		left: 0;
+		z-index: 9;
+		display: flex;
+		background-color: #e5e5e5;
+
+		view {
+			width: 50%;
+			font-size: 30rpx;
+			color: #333;
+			text-align: center;
+			padding: 16rpx 0;
+		}
+
+		.on {
+			color: #3a78ff;
+			font-weight: bold;
+			border-bottom: 3px solid #3a78ff;
+		}
+	}
+
+	.buttons {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		margin-top: 20rpx;
+
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
+
+		.btn-a {
+			background-color: #acacac;
+			color: #fff;
+		}
+
+		.btn-b {
+			background-color: #41a863;
+			color: #fff;
+		}
+
+		.btn-c {
+			background-color: #3a78ff;
+			color: #fff;
+		}
+	}
+
+	.form-item {
+		display: flex;
+		align-items: center;
+		font-size: 28rpx;
+		padding: 6rpx 0;
+
+		.title {
+			width: 180rpx;
+
+			text {
+				color: red;
+				font-weight: bold;
+			}
+		}
+
+		.right {
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+		}
+
+		.righton {
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #e4e4e4;
+			background-color: #e4e4e4;
+		}
+
+		input {
+			width: 100%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
+	}
+
+	.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: 26rpx;
+			display: flex;
+			border-top: 1px solid #eee;
+			padding-top: 20rpx;
+
+			.part {
+				width: 50%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+	}
+</style>
\ No newline at end of file

--
Gitblit v1.9.1