From aabcc8784fe93571f85c2bebbce5fcb2daaf2eab Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期六, 28 二月 2026 13:12:17 +0800
Subject: [PATCH] 生产领料单 新增 生产领料申请单 源单类型 设备维修任务 模具维修任务 设备保养任务 模具保养任务 异常反馈单查询 添加 消息标识 新增 设备点检任务 器具维修任务 模块

---
 pages/MJGL/Sc_MouldRepairCheckTaskReport/Sc_MouldRepairCheckTaskReport.vue |   22 
 pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue                         |  126 +-
 pages.json                                                                 |   36 
 pages/index/tab2.vue                                                       |  100 -
 pages/MJGL/shangmudan/MouldUpperBill.vue                                   |   32 
 pages/index/tab4.vue                                                       |   14 
 pages/MJGL/Sb_EquipDotCheckTaskReport/Sb_EquipDotCheckTaskReport.vue       |  227 +++++
 pages/MJGL/Sc_MouldDotCheckTaskReport/Sc_MouldDotCheckTaskReport.vue       |  227 +++++
 pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast.vue             |    9 
 pages/index/tab1.vue                                                       |  663 ++++++++++-----
 utils/common.js                                                            |    2 
 pages/ZLGL/mojianjianyan/ProcessCheckBill.vue                              |   55 +
 manifest.json                                                              |    4 
 pages/index/tab3.vue                                                       |  238 ++++-
 pages/MJGL/Sb_EquipRepairCheckTaskReport/Sb_EquipRepairCheckTaskReport.vue |   22 
 pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue     |    5 
 pages/index/login.vue                                                      |    2 
 pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_FastList.vue         |  543 +++++++++++++
 pages/MJGL/xiamodan/MouldLowerBill.vue                                     |   41 
 19 files changed, 1,904 insertions(+), 464 deletions(-)

diff --git a/manifest.json b/manifest.json
index 6277330..e5ce97c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "鏅轰簯LMES",
     "appid" : "__UNI__B002F49",
     "description" : "",
-    "versionName" : "2.082",
-    "versionCode" : 282,
+    "versionName" : "2.084",
+    "versionCode" : 284,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index b80ceaf..fbdb99f 100644
--- a/pages.json
+++ b/pages.json
@@ -1837,6 +1837,42 @@
             {
                 "navigationBarTitleText" : "瑁呯杩芥函"
             }
+        },
+        {
+            "path" : "pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_FastList",
+            "style" : 
+            {
+                "navigationBarTitleText" : "瑁呯杩芥函缂撳瓨",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path" : "pages/MJGL/Sb_EquipDotCheckTaskReport/Sb_EquipDotCheckTaskReport",
+            "style" : 
+            {
+                "navigationBarTitleText" : "璁惧鐐规浠诲姟"
+            }
+        },
+        {
+            "path" : "pages/MJGL/Sc_MouldDotCheckTaskReport/Sc_MouldDotCheckTaskReport",
+            "style" : 
+            {
+                "navigationBarTitleText" : "鍣ㄥ叿鐐规浠诲姟"
+            }
+        },
+        {
+            "path" : "pages/MJGL/Sb_EquipRepairCheckTaskReport/Sb_EquipRepairCheckTaskReport",
+            "style" : 
+            {
+                "navigationBarTitleText" : "璁惧鏁呴殰鐧昏璺熻釜"
+            }
+        },
+        {
+            "path" : "pages/MJGL/Sc_MouldRepairCheckTaskReport/Sc_MouldRepairCheckTaskReport",
+            "style" : 
+            {
+                "navigationBarTitleText" : "鍣ㄥ叿鐧昏鏁呴殰璺熻釜"
+            }
         }
 
     ],
diff --git a/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue b/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
index f40c806..68a3253 100644
--- a/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
+++ b/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
@@ -224,7 +224,7 @@
             }">
 
                 <view class="list" v-for="(item,index) in HTechParams" :key="index">
-                    <uni-card style="margin: 10px;">
+                    <uni-card style="margin: 10px;" @tap="modifyCheckValue(index, item)">
                         <view class="card-detail">
                             <view class="detail">
                                 <text>搴忓彿锛�</text>{{index+1}}
@@ -406,6 +406,9 @@
 
         },
         methods: {
+            modifyCheckValue(index, item) {
+              console.log('item: ',item, 'index: ', index);  
+            },
             billSelectHandler(billData) {
                 console.log('billData: ', billData);
                 let data = billData.retVal[this.hform.HEquipID]
diff --git a/pages/MJGL/Sb_EquipDotCheckTaskReport/Sb_EquipDotCheckTaskReport.vue b/pages/MJGL/Sb_EquipDotCheckTaskReport/Sb_EquipDotCheckTaskReport.vue
new file mode 100644
index 0000000..b747365
--- /dev/null
+++ b/pages/MJGL/Sb_EquipDotCheckTaskReport/Sb_EquipDotCheckTaskReport.vue
@@ -0,0 +1,227 @@
+<template>
+    <view>
+        <view class="tabs" id="tabs">
+            <view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">浠婃棩寰呯偣妫�</view>
+            <view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">浠婃棩宸茬偣妫�</view>
+            <view :class="tabs == 2 ? 'on':''" @tap="switchTab(2)">浠婂ぉ鍏ㄩ儴浠诲姟</view>
+            <view :class="tabs == 3 ? 'on':''" @tap="switchTab(3)">閫炬湡鏈偣妫�</view>
+        </view>
+
+        <!-- 璁惧鐐规浠诲姟鍒楄〃 -->
+        <view class="list" v-for="(item,index) in reportBillsDisplay" :key="index">
+            <uni-card :title="item.璁惧鐐规璁″垝鍗曞彿" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+                <view class="card-detail">
+                    <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
+                        :key="index">
+                        <text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
+                    </view>
+                </view>
+                <view class="more" v-if="showDetail == index && operations != index">
+                    <view class="part" style="border-right: 1px solid #eee;">
+                        <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+                    </view>
+                    <view class="part" @tap.stop="operations = operations==index?-1:index">
+                        <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+                    </view>
+                </view>
+                <view class="more" v-if="showDetail != index && operations != index">
+                    <view class="part" style="border-right: 1px solid #eee;">
+                        <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+                    </view>
+                    <view class="part" @tap.stop="operations = operations==index?-1:index">
+                        <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+                    </view>
+                </view>
+                <view class="op" v-if="operations == index">
+                    <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+                    <!-- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button> -->
+                    <button class="op3" size="mini" v-if="tabs == 0" plain @tap.stop="pushBill(0, item)">涓嬫帹娲惧伐鍗�</button>
+                    <button class="op3" size="mini" v-if="tabs == 1" plain @tap.stop="pushBill(1, item)">涓嬫帹缁翠慨鍗�</button>
+                    <button class="op3" size="mini" v-if="tabs == 2" plain @tap.stop="pushBill(2, item)">涓嬫帹楠屾敹鍗�</button>
+                    <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+                </view>
+            </uni-card>
+        </view>
+        <view class="over" v-if="reportBillsDisplay.length == 0">鏆傛棤鏁版嵁</view>
+    </view>
+</template>
+
+<script>
+    import {
+        getUserInfo
+    } from '../../../utils/auth';
+    import {
+        CommonUtils
+    } from '../../../utils/common';
+    import dayjs from 'dayjs';
+    export default {
+        // 璁惧鐐规浠诲姟 妯″潡
+        name: 'Sb_EquipDotCheckTaskReport',
+        data() {
+            return {
+                dayjs,
+                CommonUtils,
+                tabs: 0,
+                showDetail: -1,
+                operations: -1,
+
+                reportBillsDisplay: [],
+                reportBillsAwaitDotCheck: [], // 寰呯偣妫�
+                reportBillsDotChecked: [], // 宸茬偣妫�
+                reportBillsAll: [], // 鍏ㄩ儴浠诲姟
+                reportBillsOutTime: [], // 閫炬湡鏈偣妫�
+                HFieldList: [], // 瀛楁鍒楄〃
+            };
+        },
+        methods: {
+            pushBill(tab, item) {
+                console.log('item: ', item);
+                let Query = `&HBillNo=${item['鏁呴殰鐧昏鍗曞彿']}&HInterID=${item['HInterID']}&HSourceBillType=3907`
+                if (tab == 0) {
+                    uni.navigateTo({
+                        url: '/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill?operationType=4' +
+                            Query
+                    })
+                } else if (tab == 1) {
+                    uni.navigateTo({
+                        url: '/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill?operationType=5' + Query +
+                            `&HSendWorkID=${item.HSendWorkID}`
+                    })
+                } else if (tab == 2) {
+                    uni.navigateTo({
+                        url: '/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill?operationType=4' +
+                            Query + `&HSendWorkID=${item.HSendWorkID}`
+                    })
+                }
+            },
+            switchTab(tabIndex) {
+                this.tabs = tabIndex
+                switch (tabIndex) {
+                    case 0:
+                        this.reportBillsDisplay = this.reportBillsAwaitDotCheck;
+                        break;
+                    case 1:
+                        this.reportBillsDisplay = this.reportBillsDotChecked;
+                        break;
+                    case 2:
+                        this.reportBillsDisplay = this.reportBillsAll;
+                        break;
+                    case 3:
+                        this.reportBillsDisplay = this.reportBillsOutTime;
+                        break;
+                }
+            },
+            async getRepairList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Sb_EquipDotCheckTaskReport/CheckList',
+                        data: {
+                            user: getUserInfo()["HEmpName"]
+                        }
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message,
+                        list
+                    } = res.data
+                    if (count == 1) {
+                        console.log('data: ', data);
+
+                        this.reportBillsAwaitDotCheck = data.h_p_Sb_EquipDotCheckTaskReport
+                        this.reportBillsDotChecked = data.h_p_Sb_EquipDotCheckTaskReport1
+                        this.reportBillsAll = data.h_p_Sb_EquipDotCheckTaskReport2
+                        this.reportBillsOutTime = data.h_p_Sb_EquipDotCheckTaskReport3
+
+                        let fieldList = CommonUtils.fieldListFilterRole({
+                            ExcludeKeys: ['璁惧鐐规璁″垝鍗曞彿'],
+                            FieldList: list
+                        })
+
+                        if (fieldList.status == false) {
+                            CommonUtils.showTips({
+                                title: '娓╅Θ鎻愮ず',
+                                message: `鑾峰彇琛ㄥ崟缁撴瀯澶辫触: ${fieldList.Message}`
+                            })
+                        }
+
+                        this.HFieldList = fieldList.data
+
+                        this.switchTab(0)
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鑾峰彇鐐规璁″垝鍗曞紓甯�: ${Message}`
+                        })
+                    }
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鑾峰彇鐐规璁″垝鍗曞紓甯�: ${err}`
+                    })
+                }
+            }
+        },
+        onShow() {
+            this.getRepairList()
+        }
+    }
+</script>
+
+<style lang="scss">
+    @import "@/pages/MJGL/style/MJBillStyle.scss";
+
+    .more {
+        color: #888;
+        font-size: 26rpx;
+        display: flex;
+        border-top: 1px solid #eee;
+        padding-top: 20rpx;
+
+        .part {
+            width: 50%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+    }
+
+    .op {
+        display: flex;
+        justify-content: space-around;
+        margin-top: 20rpx;
+
+        button {
+            padding: 0;
+            width: 150rpx;
+            font-size: 25rpx;
+        }
+
+        .op1 {
+            border: 1px solid #41a863;
+            color: #41a863;
+        }
+
+        .op2 {
+            border: 1px solid #d98d00;
+            color: #d98d00;
+        }
+
+        .op3 {
+            border: 1px solid #3a78ff;
+            color: #3a78ff;
+        }
+
+        .op4 {
+            border: 1px solid #da0000;
+            color: #da0000;
+        }
+
+        .op5 {
+            border: 1px solid #888;
+            color: #888;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipRepairCheckTaskReport/Sb_EquipRepairCheckTaskReport.vue b/pages/MJGL/Sb_EquipRepairCheckTaskReport/Sb_EquipRepairCheckTaskReport.vue
new file mode 100644
index 0000000..c060bd6
--- /dev/null
+++ b/pages/MJGL/Sb_EquipRepairCheckTaskReport/Sb_EquipRepairCheckTaskReport.vue
@@ -0,0 +1,22 @@
+<template>
+    <view>
+        
+    </view>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                
+            }
+        },
+        methods: {
+            
+        }
+    }
+</script>
+
+<style>
+
+</style>
diff --git a/pages/MJGL/Sc_MouldDotCheckTaskReport/Sc_MouldDotCheckTaskReport.vue b/pages/MJGL/Sc_MouldDotCheckTaskReport/Sc_MouldDotCheckTaskReport.vue
new file mode 100644
index 0000000..c04bbbe
--- /dev/null
+++ b/pages/MJGL/Sc_MouldDotCheckTaskReport/Sc_MouldDotCheckTaskReport.vue
@@ -0,0 +1,227 @@
+<template>
+    <view>
+        <view class="tabs" id="tabs">
+            <view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">浠婃棩寰呯偣妫�</view>
+            <view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">浠婃棩宸茬偣妫�</view>
+            <view :class="tabs == 2 ? 'on':''" @tap="switchTab(2)">浠婂ぉ鍏ㄩ儴浠诲姟</view>
+            <view :class="tabs == 3 ? 'on':''" @tap="switchTab(3)">閫炬湡鏈偣妫�</view>
+        </view>
+
+        <!-- 鍣ㄥ叿鐐规浠诲姟鍒楄〃 -->
+        <view class="list" v-for="(item,index) in reportBillsDisplay" :key="index">
+            <uni-card :title="item.鍣ㄥ叿鐐规璁″垝鍗曞彿" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+                <view class="card-detail">
+                    <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
+                        :key="index">
+                        <text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
+                    </view>
+                </view>
+                <view class="more" v-if="showDetail == index && operations != index">
+                    <view class="part" style="border-right: 1px solid #eee;">
+                        <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+                    </view>
+                    <view class="part" @tap.stop="operations = operations==index?-1:index">
+                        <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+                    </view>
+                </view>
+                <view class="more" v-if="showDetail != index && operations != index">
+                    <view class="part" style="border-right: 1px solid #eee;">
+                        <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+                    </view>
+                    <view class="part" @tap.stop="operations = operations==index?-1:index">
+                        <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+                    </view>
+                </view>
+                <view class="op" v-if="operations == index">
+                    <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+                    <!-- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button> -->
+                    <button class="op3" size="mini" v-if="tabs == 0" plain @tap.stop="pushBill(0, item)">涓嬫帹娲惧伐鍗�</button>
+                    <button class="op3" size="mini" v-if="tabs == 1" plain @tap.stop="pushBill(1, item)">涓嬫帹缁翠慨鍗�</button>
+                    <button class="op3" size="mini" v-if="tabs == 2" plain @tap.stop="pushBill(2, item)">涓嬫帹楠屾敹鍗�</button>
+                    <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+                </view>
+            </uni-card>
+        </view>
+        <view class="over" v-if="reportBillsDisplay.length == 0">鏆傛棤鏁版嵁</view>
+    </view>
+</template>
+
+<script>
+    import {
+        getUserInfo
+    } from '../../../utils/auth';
+    import {
+        CommonUtils
+    } from '../../../utils/common';
+    import dayjs from 'dayjs';
+    export default {
+        // 璁惧鐐规浠诲姟 妯″潡
+        name: 'Sb_EquipDotCheckTaskReport',
+        data() {
+            return {
+                dayjs,
+                CommonUtils,
+                tabs: 0,
+                showDetail: -1,
+                operations: -1,
+
+                reportBillsDisplay: [],
+                reportBillsAwaitDotCheck: [], // 寰呯偣妫�
+                reportBillsDotChecked: [], // 宸茬偣妫�
+                reportBillsAll: [], // 鍏ㄩ儴浠诲姟
+                reportBillsOutTime: [], // 閫炬湡鏈偣妫�
+                HFieldList: [], // 瀛楁鍒楄〃
+            };
+        },
+        methods: {
+            pushBill(tab, item) {
+                console.log('item: ', item);
+                let Query = `&HBillNo=${item['鏁呴殰鐧昏鍗曞彿']}&HInterID=${item['HInterID']}&HSourceBillType=3907`
+                if (tab == 0) {
+                    uni.navigateTo({
+                        url: '/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill?operationType=4' +
+                            Query
+                    })
+                } else if (tab == 1) {
+                    uni.navigateTo({
+                        url: '/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill?operationType=5' + Query
+                        + `&HSendWorkID=${item.HSendWorkID}`
+                    })
+                } else if (tab == 2) {
+                    uni.navigateTo({
+                        url: '/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill?operationType=4' +
+                            Query + `&HSendWorkID=${item.HSendWorkID}`
+                    })
+                }
+            },
+            switchTab(tabIndex) {
+                this.tabs = tabIndex
+                switch (tabIndex) {
+                    case 0:
+                        this.reportBillsDisplay = this.reportBillsAwaitDotCheck;
+                        break;
+                    case 1:
+                        this.reportBillsDisplay = this.reportBillsDotChecked;
+                        break;
+                    case 2:
+                        this.reportBillsDisplay = this.reportBillsAll;
+                        break;
+                    case 3: 
+                        this.reportBillsDisplay = this.reportBillsOutTime;
+                        break;
+                }
+            },
+            async getRepairList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Sc_MouldDotCheckTaskReport/CheckList',
+                        data: {
+                            user: getUserInfo()["HEmpName"]
+                        }
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message,
+                        list
+                    } = res.data
+                    if (count == 1) {
+                        console.log('data: ', data);
+
+                        this.reportBillsAwaitDotCheck = data.h_p_Sc_MouldDotCheckTaskReport
+                        this.reportBillsDotChecked = data.h_p_Sc_MouldDotCheckTaskReport1
+                        this.reportBillsAll = data.h_p_Sc_MouldDotCheckTaskReport2
+                        this.reportBillsOutTime = data.h_p_Sc_MouldDotCheckTaskReport3
+
+                        let fieldList = CommonUtils.fieldListFilterRole({
+                            ExcludeKeys: ['鍣ㄥ叿鐐规璁″垝鍗曞彿'],
+                            FieldList: list
+                        })
+
+                        if (fieldList.status == false) {
+                            CommonUtils.showTips({
+                                title: '娓╅Θ鎻愮ず',
+                                message: `鑾峰彇琛ㄥ崟缁撴瀯澶辫触: ${fieldList.Message}`
+                            })
+                        }
+
+                        this.HFieldList = fieldList.data
+
+                        this.switchTab(0)
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鑾峰彇鐐规璁″垝鍗曞紓甯�: ${Message}`
+                        })
+                    }
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鑾峰彇鐐规璁″垝鍗曞紓甯�: ${err}`
+                    })
+                }
+            }
+        },
+        onShow() {
+            this.getRepairList()
+        }
+    }
+</script>
+
+<style lang="scss">
+    @import "@/pages/MJGL/style/MJBillStyle.scss";
+
+    .more {
+        color: #888;
+        font-size: 26rpx;
+        display: flex;
+        border-top: 1px solid #eee;
+        padding-top: 20rpx;
+
+        .part {
+            width: 50%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+    }
+
+    .op {
+        display: flex;
+        justify-content: space-around;
+        margin-top: 20rpx;
+
+        button {
+            padding: 0;
+            width: 150rpx;
+            font-size: 25rpx;
+        }
+
+        .op1 {
+            border: 1px solid #41a863;
+            color: #41a863;
+        }
+
+        .op2 {
+            border: 1px solid #d98d00;
+            color: #d98d00;
+        }
+
+        .op3 {
+            border: 1px solid #3a78ff;
+            color: #3a78ff;
+        }
+
+        .op4 {
+            border: 1px solid #da0000;
+            color: #da0000;
+        }
+
+        .op5 {
+            border: 1px solid #888;
+            color: #888;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sc_MouldRepairCheckTaskReport/Sc_MouldRepairCheckTaskReport.vue b/pages/MJGL/Sc_MouldRepairCheckTaskReport/Sc_MouldRepairCheckTaskReport.vue
new file mode 100644
index 0000000..c060bd6
--- /dev/null
+++ b/pages/MJGL/Sc_MouldRepairCheckTaskReport/Sc_MouldRepairCheckTaskReport.vue
@@ -0,0 +1,22 @@
+<template>
+    <view>
+        
+    </view>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                
+            }
+        },
+        methods: {
+            
+        }
+    }
+</script>
+
+<style>
+
+</style>
diff --git a/pages/MJGL/shangmudan/MouldUpperBill.vue b/pages/MJGL/shangmudan/MouldUpperBill.vue
index 597c282..7a88654 100644
--- a/pages/MJGL/shangmudan/MouldUpperBill.vue
+++ b/pages/MJGL/shangmudan/MouldUpperBill.vue
@@ -576,7 +576,8 @@
 					url: this.serverUrl + '/Web/GetEmployeeList_Json',
 					data: {
 						Employee: '',
-						HGroupID: 0
+						HGroupID: 0,
+                        HDeptID: getUserInfo()["HDeptID"] || -1
 					},
 					success: (res) => {
 						if (res.data.count == 1) {
@@ -985,18 +986,23 @@
 								let pages = getCurrentPages();
 								let prePage = pages[pages.length - 2];
 
-								if (this.isEdit) {
-									setTimeout(() => {
-										uni.redirectTo({
-											url: '/pages/shangmudan/MouldUpperBill?linterid=' +
-												this.linterid + '&HBillNo=' + this.HBillNo
-										})
-									}, 1000)
-								} else {
-									setTimeout(() => {
-										uni.navigateBack()
-									}, 1000)
-								}
+                                uni.showModal({
+                                    title: "鎻愮ず",
+                                    content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
+                                    success: (res) => {
+                                        if (res.confirm) {
+                                            console.log("鐢ㄦ埛鐐瑰嚮纭畾");
+                                            uni.redirectTo({
+                                                url: "/pages/shangmudan/MouldUpperBill",
+                                            });
+                                        } else if (res.cancel) {
+                                            console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
+                                            setTimeout(() => {
+                                                uni.navigateBack();
+                                            }, 50)
+                                        }
+                                    },
+                                });
 							}
 							uni.showToast({
 								title: res.data.Message,
diff --git a/pages/MJGL/xiamodan/MouldLowerBill.vue b/pages/MJGL/xiamodan/MouldLowerBill.vue
index abd9e74..c945ca7 100644
--- a/pages/MJGL/xiamodan/MouldLowerBill.vue
+++ b/pages/MJGL/xiamodan/MouldLowerBill.vue
@@ -265,7 +265,7 @@
 				this.hform.HDate = e.detail.value
 			},
 			getHBarCodeData(HBarCode) {
-				 var sWhere = " and 鏉″舰鐮�='" + this.hform.HBarCode +"' order by 鍒跺崟鏃ユ湡 desc"
+				var sWhere = " and 鏉″舰鐮�='" + this.hform.HBarCode +"' order by 鍒跺崟鏃ユ湡 desc"
 				uni.request({
 					url: this.serverUrl + '/Sc_MouldLowerBill/Sc_MouldUpperBillList',
 					data: {
@@ -289,6 +289,13 @@
 							this.hform.HMouldName = data.妯″叿鍚嶇О;
 							this.hform.HMouldModel = data.妯″叿瑙勬牸;
 							this.hform.HQty = 1;
+                            
+                            if(data['璐熻矗浜�']) {
+                                this.hform.HEmpName = data['璐熻矗浜�']
+                                this.HEmpNameChange(data['璐熻矗浜�'])
+                                // let index = this.arrayHEmpName.findIndex(item => item == data['璐熻矗浜�'])
+                                
+                            }
 						} else {
 							uni.showToast({
 								title: res.data.Message,
@@ -345,7 +352,7 @@
 			getHEmpList(){
 				uni.request({
 					url: this.serverUrl + '/Web/GetEmployeeList_Json', 
-					data: { Employee: '',HGroupID:0 },
+					data: { Employee: '',HGroupID:0, HDeptID: getUserInfo()["HDeptID"] || -1},
 					success: (res) => {
 						if(res.data.count == 1){
 							this.HEmpNameList = res.data.data
@@ -371,6 +378,7 @@
 			},
 			//閫夋嫨鎿嶄綔鍛�
 			HEmpNameChange(e){
+                console.log('e: ',e);
 				for(var i=0;i<this.HEmpNameList.length;i++){
 					if(this.HEmpNameList[i].HName == e){
 						this.hform.HEmpID = this.HEmpNameList[i].HItemID
@@ -562,17 +570,24 @@
 								let pages = getCurrentPages();
 								let prePage = pages[pages.length - 2]; 
 								prePage.$vm.getList()
-								if(this.isEdit){
-									setTimeout(()=>{
-										uni.redirectTo({
-											url:'/pages/MJGL/xiamodan/MouldLowerBill'
-										})
-									},1000)
-								}else{
-									setTimeout(()=>{
-										uni.navigateBack()
-									},1000)
-								}
+                                
+                                uni.showModal({
+                                    title: "鎻愮ず",
+                                    content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
+                                    success: (res) => {
+                                        if (res.confirm) {
+                                            console.log("鐢ㄦ埛鐐瑰嚮纭畾");
+                                            uni.redirectTo({
+                                                url: "/pages/MJGL/xiamodan/MouldLowerBill",
+                                            });
+                                        } else if (res.cancel) {
+                                            console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
+                                            setTimeout(() => {
+                                                uni.navigateBack();
+                                            }, 50)
+                                        }
+                                    },
+                                });
             				}
             				uni.showToast({
             					title:res.data.Message,
diff --git a/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast.vue b/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast.vue
index 8387bd1..6a7b06f 100644
--- a/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast.vue
+++ b/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast.vue
@@ -51,7 +51,7 @@
 
             <view class="item-wrapper">
                 <view v-for="(item, index) in listData" :key="index">
-                    <uni-card :title="item['HMaterName']" :extra="`鏉＄爜鏁伴噺: ${item['HQtyMust']}`" @tap="cmdDelete(item)">
+                    <uni-card :title="item['HMaterName']" :extra="`搴旇鏁伴噺: ${item['HQtyMust']}`" @tap="cmdDelete(item)">
                         <view class="detail" v-if="item['HBarCode']">
                             <text>鏉＄爜缂栧彿锛�</text>{{item['HBarCode']}}
                         </view>
@@ -77,13 +77,13 @@
             <view class="form">
                 <view class="form-base-info">
                     <view class="form-item">
-                        <view class="title">鏉＄爜鍚堣</view>
+                        <view class="title">SN鐮佹暟</view>
                         <view class="right disabled">
                             <input disabled type="text" v-model="hform.txtHBarcodeQtys" />
                         </view>
                     </view>
                     <view class="form-item">
-                        <view class="title">鏁伴噺鍚堣</view>
+                        <view class="title">鎬绘暟閲�</view>
                         <view class="right disabled">
                             <input disabled type="text" v-model="hform.txtHSumQtys" />
                         </view>
@@ -326,7 +326,6 @@
 
                 this.hform.txtHBarcodeQtys = sBarcodeQty
                 this.hform.txtHSumQtys = sSumQtys
-
             },
             getMaxNo() {
                 CommonUtils.doRequest2({
@@ -379,6 +378,8 @@
                     })
                     return false
                 }
+                
+                
                 return true
             },
             cmdDelete(item) {
diff --git a/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_FastList.vue b/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_FastList.vue
new file mode 100644
index 0000000..a8c76e4
--- /dev/null
+++ b/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_FastList.vue
@@ -0,0 +1,543 @@
+<template>
+    <view class="content">
+        <view class="tabs" style="display: none;">
+            <view style="width: 100%;" :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
+            <!-- <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸蹭笂浼犲垪琛�</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 class="form" v-if="tabs == 1">
+            <view class="form-item">
+                <view class="title">鍗曟嵁鍙�:</view>
+                <view class="right">
+                    <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">婧愬崟鍗曞彿:</view>
+                <view class="right">
+                    <input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+                </view>
+            </view>
+            <view class="buttons">
+                <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+                <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+            </view>
+        </view>
+
+        <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+        <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+            <uni-card :title="item.HMakeDate.substr(0,10)" :extra="item.HBillNo" style="margin: 10px;"
+                @tap="showDetail = showDetail==index?-1:index">
+                <view class="card-detail">
+                    <view class="detail" v-if="item.HInterID">
+                        <text>鍗曟嵁鍐呯爜锛�</text>{{item.HInterID}}
+                    </view>
+                    <view class="detail" v-if="item.HQtyMust">
+                        <text>搴旇鏁伴噺锛�</text>{{item.HQtyMust}}
+                    </view>
+                    <view class="detail" v-if="item.HQty">
+                        <text>鏁伴噺锛�</text>{{item.HQty}}
+                    </view>
+                    <view class="detail" v-if="item.HBarCode_Pack">
+                        <text>绠辨潯鐮侊細</text>{{item.HBarCode_Pack}}
+                    </view>
+                    <view class="detail" v-if="item.HMaker">
+                        <text>鍒跺崟浜猴細</text>{{item.HMaker}}
+                    </view>
+                    <view class="detail" v-if="item.HStockOrgName">
+                        <text>缁勭粐锛�</text>{{item.HStockOrgName}}
+                    </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.鐗╂枡鍚嶇О">
+                        <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.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 {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+    import {
+        CommonUtils
+    } from "../../utils/common";
+    export default {
+        data() {
+            return {
+                bindingData: {
+                    UnReadCount: 0,
+                },
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                tabs: 0,
+                urls: '/WEBSController/TempList_Modify_Pack',
+                MvarReportTitle: '瑁呯杩芥函鍗曠紦瀛樺垪琛�',
+                hform: {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 3704,
+                    HMaker: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                },
+                sWhere: '',
+                listData: [],
+                showList: [],
+                showDetail: -1,
+
+                page: 1,
+            }
+        },
+        components: {
+            BarCodePopupVue
+        },
+        onLoad() {
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            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_PackUnionCarryUp',
+                        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_Pack'
+                }
+                if (this.tabs == 1) {
+                    this.urls = '/'
+                }
+                this.getList()
+            },
+            async getList() {
+                uni.showLoading({
+                    title: '鍔犺浇涓�...'
+                })
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: this.urls,
+                        data: this.hform,
+                    })
+
+                    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 = []
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鑾峰彇瑁呯杩芥函鍗曠紦瀛樺け璐�: ${res.data.Message}`
+                        })
+                    }
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鑾峰彇瑁呯杩芥函鍗曠紦瀛樺け璐�: ${err}`
+                    })
+                }
+            },
+            search() {
+                this.sWhere = ''
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                console.log(this.hform)
+                // if (this.hform.HBillNo) {
+                //     this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+                // }
+                // if (this.hform.HSourceBillNo) {
+                //     this.sWhere += " and 璁惧绫诲瀷 like '%" + this.hform.HSourceBillNo + "%'";
+                // }
+                this.getList()
+            },
+            clear() {
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                this.sWhere = ''
+                this.hform = {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 3704,
+                    HMaker: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                }
+                this.getList()
+            },
+            add() {
+                uni.navigateTo({
+                    url: './Sc_PackUnionCarryUpBill_Fast?operationType=1'
+                })
+            },
+            //缂栬緫
+            async edit(item) {
+                console.log(item)
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/WEBSController/TempList_Modify_Pack',
+                        data: {
+                            "HInterID": item.HInterID,
+                            "HBillNo": item.HBillNo,
+                            "HBillType": this.hform.HBillType
+                        },
+                    })
+                    
+                    console.log(1, res);
+                    if (res.data.count == 1) {
+                        uni.navigateTo({
+                            url: './Sc_PackUnionCarryUpBill_Fast?operationType=2&' +
+                                `HInterID=${HInterID}&HBillNo=${HBillNo}&HBarCode_Pack=${item.HBarCode_Pack}`
+                        })
+                    } else {
+                        uni.hideLoading()
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鑾峰彇鍗曟嵁缂栬緫鐘舵�佸け璐�: ${res.data.Messge}`
+                        })
+                    }
+                }catch(err) {
+                     uni.hideLoading()
+                     CommonUtils.showTips({
+                         title: '娓╅Θ鎻愮ず',
+                         message: `鑾峰彇鍗曟嵁缂栬緫鐘舵�佸け璐�: ${err}`
+                     })
+                }
+            },
+            //鍒犻櫎
+            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/set_DelPackUnionBill_Temp_Pack',
+                                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
diff --git a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
index 7d25578..d69bb9f 100644
--- a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -785,6 +785,59 @@
                                 } else if (res.cancel) {}
                             },
                         })
+                    }else {
+                        if (this.hform.HSourceBillType == "3791") { //鍑虹珯鍗�
+                            this.hform.HMaterID = data[0]['HMaterID']
+                            this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+                            this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+                            this.hform.HMainSourceBillNo = data[0]['鍗曟嵁鍙�']
+                            this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
+                            this.hform.HMainSourceInterID = data[0].HInterID
+                            this.hform.HMainSourceEntryID = data[0].HEntryID
+                            this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+                            this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+                            this.hform.HSourceBillQty = data[0].HSourceBillQty
+                            this.hasSourceBill = true
+                            this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
+                            this.hform.HICMOInterID = data[0].HICMOInterID
+                            this.hform.HICMOEntryID = data[0].HICMOEntryID
+                            this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
+                            this.hform.HProcExchBillNo = data[0].HProcExchBillNo
+                            this.hform.HProcExchInterID = data[0].HProcExchInterID
+                            this.hform.HProcExchEntryID = data[0].HProcExchEntryID
+                            this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
+                            this.hform.HSourceName = data[0].鐢熶骇璧勬簮
+                            this.hform.HSourceID = data[0].HSourceID
+                            this.hform.HProcID = data[0].HProcID
+                            this.hform.HProcName = data[0].宸ュ簭鍚嶇О
+                            this.hform.HCheckQty = data[0].鍑虹珯鏁伴噺
+                        } else {
+                            this.hform.HMaterID = data[0]['HMaterID']
+                            this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+                            this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+                            this.hform.HMainSourceBillNo = data[0]['HBillNo']
+                            this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
+                            this.hform.HMainSourceInterID = data[0].HInterID
+                            this.hform.HMainSourceEntryID = data[0].HEntryID
+                            this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+                            this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+                            this.hform.HSourceBillQty = data[0].HSourceBillQty
+                            this.hasSourceBill = true
+                            this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
+                            this.hform.HICMOInterID = data[0].HICMOInterID
+                            this.hform.HICMOEntryID = data[0].HICMOEntryID
+                            this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
+                            this.hform.HProcExchBillNo = data[0].鍗曟嵁鍙�
+                            this.hform.HProcExchInterID = data[0].HInterID
+                            this.hform.HProcExchEntryID = data[0].HEntryID
+                            this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
+                            this.hform.HSourceName = data[0].鐢熶骇璧勬簮
+                            this.hform.HSourceID = data[0].HSourceID
+                            this.hform.HProcID = data[0].HProcID
+                            this.hform.HProcName = data[0].褰撳墠宸ュ簭
+                        }
+                        this.hform.HRemarkSN = HBarCodeOld // 鎵�鎵弿鐨勬潯鐮佸瓨SN瀛楁
+                        this.get_CheckItem();
                     }
 
                 } else {
@@ -2334,7 +2387,7 @@
             },
         },
         async onLoad(e) {
-            this.setAuto();
+            // this.setAuto();
             this.operationType = e.operationType || 1;
             this.hform.HInterID = e.linterid || 0;
             if (this.operationType == 1) {
diff --git a/pages/index/login.vue b/pages/index/login.vue
index 2e04dcd..5e84733 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -109,7 +109,7 @@
 					"鏉窞鍑礉濂堢壒": 'http://192.168.50.253:8080/API/',
 					"鏉窞鍑礉濂堢壒澶栫綉": 'http://erp.hzcabinet.cn:9090/API/',
 					"缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
-					"闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.102:81/API/',
+					"闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.121:81/API/',
 					"闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.88.82:81/API/',
 					"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
 					"浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
diff --git a/pages/index/tab1.vue b/pages/index/tab1.vue
index ece653d..ee7f882 100644
--- a/pages/index/tab1.vue
+++ b/pages/index/tab1.vue
@@ -1,251 +1,460 @@
 <template>
-	<view class="content">
-		<view class="header">
-			<view class="switch-button">
-				<uni-icons type="loop" @click="switchIconsModeHandler"></uni-icons>
-			</view>
-		</view>
-		<view class="mains">
-			<view v-if="!canEdit" :hidden="item.hidden||!item.id" 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" :hidden="!item.id" 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>
+    <view class="content">
+        <view class="header">
+            <view class="switch-button">
+                <uni-icons type="loop" @click="switchIconsModeHandler"></uni-icons>
+            </view>
+        </view>
+        <view class="mains">
+            <view v-if="!canEdit" :hidden="item.hidden||!item.id" class="box" v-for="(item,index) in itemData"
+                :key="index" @tap="toUrl(item)">
+                <template v-if="item.corner">
+                    <uni-badge :text="item.cornerCount" type="error" :max-num="99" size="normal" absolute
+                        :offset="[7, 7]">
+                        <image :src="item.img" mode=""></image>
+                    </uni-badge>
+                </template>
+                <template v-else>
+                    <image :src="item.img" mode=""></image>
+                </template>
+                <view class="texts">
+                    {{item.text}}
+                </view>
+            </view>
+            <view :enable-hidden="item.hidden" :hidden="!item.id" 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>
 </template>
 
 <script>
-	import { CommonUtils } from '../../utils/common'
-	import { setMenuList, getMenuList } from '../../utils/menuListApp'
-	export default {
-		data() {
-			return {
-				updateCount: 0,
-				menuListName: 'tab1',
-				canEdit: false,
-				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-				itemData: [{
-						img: '../../static/icon/icon9.png',
-						text: '宸ュ簭杩涚珯鎺ユ敹鍗曟柊澧�',
-						tip: '绔嬪嵆鏂板',
-						url: '/pages/gongxuIn/Cj_StationInBill',
-						id: 1,
-						hidden: false,
-					}, 
-					
-					{
-						img: '../../static/icon/icon10.png',
-						text: '宸ュ簭鍑虹珯姹囨姤鍗曟柊澧�',
-						tip: '绔嬪嵆鏂板',
-						url: '/pages/gongxuOut/Cj_StationOutBill',
-						id: 2,
-						hidden: false,
-					}, 
-					
-					{
-						img: '../../static/icon/icon11.png',
-						text: '宸ュ簭濮斿鍙戝嚭鍗曟柊澧�',
-						tip: '绔嬪嵆鏂板',
-						url: '/pages/weiwaigxIn/Cj_StationEntrustInBill',
-						id: 3,
-						hidden: false,
-					}, 
-					
-					{
-						img: '../../static/icon/icon12.png',
-						text: '宸ュ簭濮斿鎺ユ敹鍗曟柊澧�',
-						tip: '绔嬪嵆鏂板',
-						url: '/pages/weiwaigxOut/Cj_StationEntrustOutBill',
-						id: 4,
-						hidden: false,
-					}, 
-					
-					{
-						img: '../../static/icon/icon14.png',
-						text: '鎴戠殑鎶ュ伐骞冲彴',
-						tip: '鐐瑰嚮杩涘叆',
-						url: '/pages/baogong/IpadIndex',
-						id: 5,
-						hidden: false,
-					}, 
-					{
-						img: '../../static/icon/icon10.png',
-						text: '鎴戠殑浠诲姟',
-						tip: '绔嬪嵆鏂板',
-						url: '/pages/gongxuOutSendWork/gongxuOutSendWorkBill',
-						id: 6,
-						hidden: false,
-					}, 
-					{
-						img: '../../static/icon/icon12.png',
-						text: '鍛樺伐绛惧埌璁板綍鍗�',
-						tip: '绔嬪嵆鏂板',
-						url: '/pages/EmployeeRecords/EmployeeRecordsBill',
-						id: 7,
-						hidden: false,
-					},
-					
-				]
-			}
-		},
-		onLoad() {
-			this.getHiddenItem()
-		},
-		methods: {
-			async getHiddenItem() {
-				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"]].id = e["HEntryID"];//id涓�0寮哄埗闅愯棌
-				})
-			},
-			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'
-					})
-				}
-			}
-		}
-	}
+    import {
+        CommonUtils
+    } from '../../utils/common'
+    import {
+        setMenuList,
+        getMenuList
+    } from '../../utils/menuListApp'
+    import {
+        getUserInfo
+    } from '../../utils/auth'
+    export default {
+        data() {
+            return {
+                bindingData: {
+                    UnReadCount: 0,
+                },
+                initFinished: false,
+                updateCount: 0,
+                menuListName: 'tab1',
+                canEdit: false,
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                itemData: [{
+                        img: '../../static/icon/icon9.png',
+                        text: '宸ュ簭杩涚珯鎺ユ敹鍗曟柊澧�',
+                        tip: '绔嬪嵆鏂板',
+                        url: '/pages/gongxuIn/Cj_StationInBill',
+                        id: 1,
+                        hidden: false,
+                    },
+
+                    {
+                        img: '../../static/icon/icon10.png',
+                        text: '宸ュ簭鍑虹珯姹囨姤鍗曟柊澧�',
+                        tip: '绔嬪嵆鏂板',
+                        url: '/pages/gongxuOut/Cj_StationOutBill',
+                        id: 2,
+                        hidden: false,
+                    },
+
+                    {
+                        img: '../../static/icon/icon11.png',
+                        text: '宸ュ簭濮斿鍙戝嚭鍗曟柊澧�',
+                        tip: '绔嬪嵆鏂板',
+                        url: '/pages/weiwaigxIn/Cj_StationEntrustInBill',
+                        id: 3,
+                        hidden: false,
+                    },
+
+                    {
+                        img: '../../static/icon/icon12.png',
+                        text: '宸ュ簭濮斿鎺ユ敹鍗曟柊澧�',
+                        tip: '绔嬪嵆鏂板',
+                        url: '/pages/weiwaigxOut/Cj_StationEntrustOutBill',
+                        id: 4,
+                        hidden: false,
+                    },
+
+                    {
+                        img: '../../static/icon/icon14.png',
+                        text: '鎴戠殑鎶ュ伐骞冲彴',
+                        tip: '鐐瑰嚮杩涘叆',
+                        url: '/pages/baogong/IpadIndex',
+                        id: 5,
+                        hidden: false,
+                    },
+                    {
+                        img: '../../static/icon/icon10.png',
+                        text: '鎴戠殑浠诲姟',
+                        tip: '绔嬪嵆鏂板',
+                        url: '/pages/gongxuOutSendWork/gongxuOutSendWorkBill',
+                        id: 6,
+                        hidden: false,
+                    },
+                    {
+                        img: '../../static/icon/icon12.png',
+                        text: '鍛樺伐绛惧埌璁板綍鍗�',
+                        tip: '绔嬪嵆鏂板',
+                        url: '/pages/EmployeeRecords/EmployeeRecordsBill',
+                        id: 7,
+                        hidden: false,
+                    },
+                    {
+                        "img": "../../static/icon/icon15.png",
+                        "text": "宸ヤ綔鑱旂郴鍗曟煡璇�",
+                        "url": "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery?OperationType=1",
+                        "id": 8,
+                        "hidden": false,
+                    },
+                    {
+                        "img": "../../static/icon/icon16.png",
+                        "text": "寮傚父鍙嶉寰呭鐞嗗垪琛�",
+                        "url": "/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList",
+                        "id": 9,
+                        "hidden": false
+                    },
+                    {
+                        "img": "../../static/icon/icon8.png",
+                        "text": "璁惧鏁呴殰鐧昏鍗�",
+                        "url": "/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill?operationType=1",
+                        "id": 10,
+                        "hidden": false
+                    },
+                    {
+                        "img": "../../static/icon/icon13.png",
+                        "text": "妯″叿鏁呴殰鐧昏鍗�",
+                        "url": "/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill?operationType=1",
+                        "id": 11,
+                        "hidden": false
+                    },
+                    {
+                        img: '../../static/icon/icon8.png',
+                        text: '涓婃ā鍗�',
+                        url: `/pages/MJGL/shangmudan/MouldUpperBill`,
+                        id: 12,
+                        hidden: false,
+                    },
+                    {
+                        img: '../../static/icon/icon8.png',
+                        text: '涓嬫ā鍗�',
+                        url: `/pages/MJGL/xiamodan/MouldLowerBill`,
+                        id: 13,
+                        hidden: false,
+                    },
+                    {
+                        "img": "../../static/icon/icon15.png",
+                        "text": "鍙栨牱鍗�",
+                        "url": "/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=0",
+                        "id": 14,
+                        "hidden": false
+                    },
+                    {
+                        "img": "../../static/icon/icon8.png",
+                        "text": "璁惧鐐规璁板綍鍗�",
+                        "url": "/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill",
+                        "id": 15,
+                        "hidden": false
+                    },
+
+                    // 杞﹂棿鐩稿叧鍗曟嵁鍒楄〃
+                    {
+                        "img": "../../static/icon/icon6.png",
+                        "text": "璁惧鏁呴殰鐧昏鍒楄〃",
+                        "url": "/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBillList",
+                        "id": 16,
+                        "hidden": false
+                    },
+                    {
+                        "img": "../../static/icon/icon13.png",
+                        "text": "妯″叿鏁呴殰鐧昏鍒楄〃",
+                        "url": "/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList",
+                        "id": 17,
+                        "hidden": false
+                    },
+                ]
+            }
+        },
+        onLoad() {
+            this.getHiddenItem()
+        },
+        async onShow() {
+            if(this.initFinished) {
+                let MessageIdentifier = await this.getMessageIdentifierCount(this.menuListName)
+                if(MessageIdentifier.code == 0) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: MessageIdentifier.msg
+                    })
+                    
+                    return
+                }
+                
+                this.itemData.forEach((e, index) => {
+                    if(MessageIdentifier.data[e.text]) {
+                        this.itemData[index]["corner"] = true
+                        this.itemData[index]["cornerCount"] = MessageIdentifier.data[e.text]
+                    }
+                })
+                
+                this.$forceUpdate()
+            }
+        },
+        methods: {
+            async getWorkLinkList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: 'Sc_MESTransFerWorkBill/GetOA_WorkLinkBillList',
+                        data: {
+                            sWhere: ` and (鎺ユ敹浜� = '${getUserInfo()['HEmpName']}' or 鎶勯�佹帴鏀朵汉 = '${getUserInfo()['HEmpName']}') and 闃呰鐘舵�� = '鏈槄'`,
+                            user: getUserInfo()["Czymc"]
+                        }
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message,
+                        list
+                    } = res.data
+                    if (count == 1) {
+                        this.bindingData.UnReadCount = data.length
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鑾峰彇宸ヤ綔鑱旂郴鍗曞紓甯�: ${Message}`
+                        })
+                    }
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鑾峰彇宸ヤ綔鑱旂郴鍗曞紓甯�: ${err}`
+                    })
+                }
+            },
+            // 鏍规嵁妯″潡鑾峰彇鏈鐞嗘秷鎭潯鏁�
+            async getMessageIdentifierCount(menuListName) {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Web/getMessageIdentified',
+                        data: {
+                            user: getUserInfo()["HEmpName"],
+                            moduleName: menuListName
+                        }
+                    })
+                    console.log('common module: ',res);
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        let retVal = Array.from(data).reduce((acc, item) => {
+                            acc[item['moduleName']] = item.count
+                            return acc
+                        }, {})
+                        
+                        return {
+                            code: 1,
+                            msg: Message,
+                            data: retVal
+                        }
+                    } else {
+                        return {
+                            code: 0,
+                            msg: Message,
+                            data: []
+                        }
+                    }
+                } catch (err) {
+            
+                }
+            },
+            async getHiddenItem() {
+                let data = await getMenuList({
+                    menuName: this.menuListName
+                })
+            
+                Array.from(data).forEach((e, index) => {
+                    if (index < this.itemData.length) {
+                        this.itemData[e["HIndex"]]["hidden"] = !CommonUtils.stringToBoolean(e[
+                            "HShowMode"] || false)
+                        this.itemData[e["HIndex"]].id = e["HEntryID"]; //id涓�0寮哄埗闅愯棌
+                    }
+                })
+            
+                let MessageIdentifier = await this.getMessageIdentifierCount(this.menuListName)
+                if (MessageIdentifier.code == 0) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: MessageIdentifier.msg
+                    })
+            
+                    return
+                }
+            
+                Array.from(data).forEach((e, index) => {
+                    if (index < this.itemData.length) {
+                        if (MessageIdentifier.data[this.itemData[e["HIndex"]].text]) {
+                            this.itemData[e["HIndex"]]["corner"] = true,
+                                this.itemData[e["HIndex"]]["cornerCount"] = MessageIdentifier.data[this
+                                    .itemData[e["HIndex"]].text]
+                        }
+                    }
+                })
+                this.initFinished = true
+                this.$forceUpdate()
+            },
+            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'
+                    })
+                }
+            }
+        }
+    }
 </script>
 
 <style lang="scss" scoped>
-	.header {
-		width: 100%;
-		height: 2em;
-		position: relative;
+    .header {
+        width: 100%;
+        height: 2em;
+        position: relative;
 
-		.switch-button {
-			position: absolute;
-			right: 10rpx;
-			bottom: 0;
-		}
-	}
+        .switch-button {
+            position: absolute;
+            right: 10rpx;
+            bottom: 0;
+        }
+    }
 
-	page {
-		width: 100vw;
-		min-height: 100vh;
-		background-color: #fff;
-	}
+    page {
+        width: 100vw;
+        min-height: 100vh;
+        background-color: #fff;
+    }
 
-	.mains {
-		width: 720rpx;
-		margin: 0 auto;
-		display: flex;
-		flex-wrap: wrap;
-		padding-bottom: 80rpx;
+    .mains {
+        width: 720rpx;
+        margin: 0 auto;
+        display: flex;
+        flex-wrap: wrap;
+        padding-bottom: 80rpx;
 
-		.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;
+        }
+    }
 
-	// .mains {
-	// 	width: 720rpx;
-	// 	margin: 0 auto;
-	// 	padding-bottom: 120rpx;
+    // .mains {
+    // 	width: 720rpx;
+    // 	margin: 0 auto;
+    // 	padding-bottom: 120rpx;
 
-	// 	.box {
-	// 		width: 680rpx;
-	// 		margin: 0 auto;
-	// 		margin-top: 20rpx;
-	// 		display: flex;
-	// 		align-items: center;
-	// 		background-color: #fff;
-	// 		border-radius: 20rpx;
-	// 		box-shadow: 2upx 2upx 20upx 0 #ddd;
+    // 	.box {
+    // 		width: 680rpx;
+    // 		margin: 0 auto;
+    // 		margin-top: 20rpx;
+    // 		display: flex;
+    // 		align-items: center;
+    // 		background-color: #fff;
+    // 		border-radius: 20rpx;
+    // 		box-shadow: 2upx 2upx 20upx 0 #ddd;
 
-	// 		image {
-	// 			width: 78rpx;
-	// 			height: 78rpx;
-	// 			padding: 10rpx;
-	// 			margin: 14rpx 30rpx;
-	// 		}
+    // 		image {
+    // 			width: 78rpx;
+    // 			height: 78rpx;
+    // 			padding: 10rpx;
+    // 			margin: 14rpx 30rpx;
+    // 		}
 
-	// 		.texts {
-	// 			font-size: 30rpx;
-	// 			font-weight: normal;
-	// 			color: #333333;
+    // 		.texts {
+    // 			font-size: 30rpx;
+    // 			font-weight: normal;
+    // 			color: #333333;
 
-	// 			.font1 {}
+    // 			.font1 {}
 
-	// 			.font2 {
-	// 				font-size: 25rpx;
-	// 				color: #999;
-	// 			}
-	// 		}
-	// 	}
-	// }
+    // 			.font2 {
+    // 				font-size: 25rpx;
+    // 				color: #999;
+    // 			}
+    // 		}
+    // 	}
+    // }
 </style>
\ No newline at end of file
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index fde015e..b16e3d1 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -326,13 +326,13 @@
                         "id": 36,
                         "hidden": false
                     },
-                    {
-                        "img": "../../static/icon/icon13.png",
-                        "text": "鍣ㄥ叿鏁呴殰鐧昏鍒楄〃",
-                        "url": "/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList",
-                        "id": 37,
-                        "hidden": false
-                    },
+                    // {
+                    //     "img": "../../static/icon/icon13.png",
+                    //     "text": "鍣ㄥ叿鏁呴殰鐧昏鍒楄〃",
+                    //     "url": "/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList",
+                    //     "id": 37,
+                    //     "hidden": false
+                    // },
                     {
                         "img": "../../static/icon/icon8.png",
                         "text": "鍣ㄥ叿缁翠慨娲惧伐鍗曞垪琛�",
@@ -420,13 +420,13 @@
                         "id": 49,
                         "hidden": false
                     },
-                    {
-                        "img": "../../static/icon/icon6.png",
-                        "text": "璁惧鏁呴殰鐧昏鍗曞垪琛�",
-                        "url": "/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBillList",
-                        "id": 50,
-                        "hidden": false
-                    },
+                    // {
+                    //     "img": "../../static/icon/icon6.png",
+                    //     "text": "璁惧鏁呴殰鐧昏鍗曞垪琛�",
+                    //     "url": "/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBillList",
+                    //     "id": 50,
+                    //     "hidden": false
+                    // },
 
                     {
                         "img": "../../static/icon/icon8.png",
@@ -486,13 +486,7 @@
                         "id": 58,
                         "hidden": false
                     },
-                    {
-                        "img": "../../static/icon/icon16.png",
-                        "text": "寮傚父鍙嶉寰呭鐞嗗垪琛�",
-                        "url": "/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList",
-                        "id": 59,
-                        "hidden": false
-                    },
+                    
 
 
                     // 鍙栨牱杩樻牱鐩稿叧
@@ -523,16 +517,6 @@
                         "text": "宸ヤ綔鑱旂郴鍗曞垪琛�",
                         "url": "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillList?OperationType=1",
                         "id": 63,
-
-                        "corner": true,
-                        "cornerCount": "UnReadCount"
-                    },
-                    {
-                        "img": "../../static/icon/icon15.png",
-                        "text": "宸ヤ綔鑱旂郴鍗曟煡璇�",
-                        "url": "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery?OperationType=1",
-                        "id": 64,
-                        "hidden": false
                     },
                     {
                         img: '../../static/icon/icon12.png',
@@ -582,16 +566,23 @@
 						"img": "../../static/icon/icon17.png",
 						"text": "閿�鍞��璐ф牎楠屾殏瀛樺垪琛�",
 						"url": "/pages/xiaoshotuihuoCheck/Kf_SellOutBackCheckBillList",
-						"id": 70,
+						"id": 71,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon17.png",
 						"text": "鐢熶骇閫�搴撴牎楠屾殏瀛樺垪琛�",
 						"url": "/pages/shengchantuikuCheck/Kf_ProductInBackCheckBillList",
-						"id": 70,
+						"id": 72,
 						"hidden": false
 					},
+                    {
+                        "img": "../../static/icon/icon17.png",
+                        "text": "瑁呯杩芥函鍗曟殏瀛樺垪琛�",
+                        "url": "/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_FastList",
+                        "id": 73,
+                        "hidden": false
+                    }
                 ]
             }
         },
@@ -599,56 +590,15 @@
             this.getHiddenItem()
         },
         onShow() {
-            this.getWorkLinkList()
+            
         },
         methods: {
-            async getWorkLinkList() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: 'Sc_MESTransFerWorkBill/GetOA_WorkLinkBillList',
-                        data: {
-                            sWhere: ` and (鎺ユ敹浜� = '${getUserInfo()['HEmpName']}' or 鎶勯�佹帴鏀朵汉 = '${getUserInfo()['HEmpName']}') and 闃呰鐘舵�� = '鏈槄'`,
-                            user: getUserInfo()["Czymc"]
-                        }
-                    })
-
-                    let {
-                        count,
-                        data,
-                        Message,
-                        list
-                    } = res.data
-                    if (count == 1) {
-                        this.bindingData.UnReadCount = data.length
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: `鑾峰彇宸ヤ綔鑱旂郴鍗曞紓甯�: ${Message}`
-                        })
-                    }
-
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: `鑾峰彇宸ヤ綔鑱旂郴鍗曞紓甯�: ${err}`
-                    })
-                }
-            },
             judgeHidden() {
                 return process.env.NODE_ENV === 'development'
             },
             async getHiddenItem() {
                 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"]].id = e["HEntryID"]; //id涓�0寮哄埗闅愯棌
-                    
-                    if( this.itemData[e["HIndex"]].text == '宸ヤ綔鑱旂郴鍗曟煡璇�') {
-                        this.itemData[e["HIndex"]]["corner"]= true,
-                        this.itemData[e["HIndex"]]["cornerCount"]= "UnReadCount"
-                    }
                 })
             },
             switchHidden(index) {
diff --git a/pages/index/tab3.vue b/pages/index/tab3.vue
index 4c270cb..bc63997 100644
--- a/pages/index/tab3.vue
+++ b/pages/index/tab3.vue
@@ -8,7 +8,15 @@
         <view class="mains">
             <view v-if="!canEdit" :hidden="item.hidden||!item.id" class="box" v-for="(item,index) in itemData"
                 :key="index" @tap="toUrl(item)">
-                <image :src="item.img" mode=""></image>
+                <template v-if="item.corner">
+                    <uni-badge :text="item.cornerCount" style="z-index: 99 !important;" type="error" :max-num="99" size="normal" absolute
+                        :offset="[7, 7]">
+                        <image :src="item.img" mode=""></image>
+                    </uni-badge>
+                </template>
+                <template v-else>
+                    <image :src="item.img" mode=""></image>
+                </template>
                 <view class="texts">
                     {{item.text}}
                 </view>
@@ -42,6 +50,7 @@
                 updateCount: 0,
                 menuListName: 'tab3',
                 canEdit: false,
+                initFinished: false,
                 serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                 itemData: [{
                         img: '../../static/icon/icon8.png',
@@ -66,11 +75,40 @@
                         id: 3,
                         hidden: false,
                     },
+                    // {
+                    //     "img": "../../static/icon/icon13.png",
+                    //     "text": "妯″叿鏁呴殰鐧昏鍗�",
+                    //     "url": "/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill?operationType=1",
+                    //     "id": 4,
+                    //     "hidden": false
+                    // },
                     {
-                        "img": "../../static/icon/icon13.png",
-                        "text": "妯″叿鏁呴殰鐧昏鍗�",
-                        "url": "/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill?operationType=1",
-                        "id": 4,
+                        "img": "../../static/icon/icon8.png",
+                        "text": "璁惧淇濆吇浠诲姟",
+                        "url": "/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport",
+                        "id": 24,
+                        "hidden": false
+                    },
+                    {
+                        "img": "../../static/icon/icon8.png",
+                    
+                        "text": "妯″叿淇濆吇浠诲姟",
+                        "url": "/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport",
+                        "id": 25,
+                        "hidden": false
+                    },
+                    {
+                        "img": "../../static/icon/icon8.png",
+                        "text": "璁惧缁翠慨浠诲姟",
+                        "url": "/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport",
+                        "id": 26,
+                        "hidden": false
+                    },
+                    {
+                        "img": "../../static/icon/icon8.png",
+                        "text": "妯″叿缁翠慨浠诲姟",
+                        "url": "/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport",
+                        "id": 27,
                         "hidden": false
                     },
                     {
@@ -122,20 +160,20 @@
                         "id": 11,
                         "hidden": false
                     },
-                    {
-                        img: '../../static/icon/icon8.png',
-                        text: '涓婃ā鍗�',
-                        url: `/pages/MJGL/shangmudan/MouldUpperBill`,
-                        id: 12,
-                        hidden: false,
-                    },
-                    {
-                        img: '../../static/icon/icon8.png',
-                        text: '涓嬫ā鍗�',
-                        url: `/pages/MJGL/xiamodan/MouldLowerBill`,
-                        id: 13,
-                        hidden: false,
-                    },
+                    // {
+                    //     img: '../../static/icon/icon8.png',
+                    //     text: '涓婃ā鍗�',
+                    //     url: `/pages/MJGL/shangmudan/MouldUpperBill`,
+                    //     id: 12,
+                    //     hidden: false,
+                    // },
+                    // {
+                    //     img: '../../static/icon/icon8.png',
+                    //     text: '涓嬫ā鍗�',
+                    //     url: `/pages/MJGL/xiamodan/MouldLowerBill`,
+                    //     id: 13,
+                    //     hidden: false,
+                    // },
                     {
                         "img": "../../static/icon/icon8.png",
                         "text": "妯″叿鎶ュ簾鍑哄簱鍗�",
@@ -167,13 +205,13 @@
                         id: 17,
                         hidden: true,
                     },
-                    {
-                        "img": "../../static/icon/icon8.png",
-                        "text": "璁惧鐐规璁板綍鍗�",
-                        "url": "/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill",
-                        "id": 18,
-                        "hidden": false
-                    },
+                    // {
+                    //     "img": "../../static/icon/icon8.png",
+                    //     "text": "璁惧鐐规璁板綍鍗�",
+                    //     "url": "/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill",
+                    //     "id": 18,
+                    //     "hidden": false
+                    // },
                     {
                         "img": "../../static/icon/icon8.png",
                         "text": "璁惧淇濆吇璁板綍鍗�",
@@ -181,13 +219,13 @@
                         "id": 19,
                         "hidden": false
                     },
-                    {
-                        "img": "../../static/icon/icon8.png",
-                        "text": "璁惧鏁呴殰鐧昏鍗�",
-                        "url": "/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill?operationType=1",
-                        "id": 20,
-                        "hidden": false
-                    },
+                    // {
+                    //     "img": "../../static/icon/icon8.png",
+                    //     "text": "璁惧鏁呴殰鐧昏鍗�",
+                    //     "url": "/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill?operationType=1",
+                    //     "id": 20,
+                    //     "hidden": false
+                    // },
                     {
                         "img": "../../static/icon/icon8.png",
                         "text": "璁惧缁翠慨娲惧伐鍗�",
@@ -204,37 +242,23 @@
                     },
                     {
                         "img": "../../static/icon/icon8.png",
-                        "text": "璁惧淇濆吇浠诲姟",
-                        "url": "/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport",
-                        "id": 24,
-                        "hidden": false
-                    },
-                    {
-                        "img": "../../static/icon/icon8.png",
-
-                        "text": "妯″叿淇濆吇浠诲姟",
-                        "url": "/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport",
-                        "id": 25,
-                        "hidden": false
-                    },
-                    {
-                        "img": "../../static/icon/icon8.png",
-                        "text": "璁惧缁翠慨浠诲姟",
-                        "url": "/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport",
-                        "id": 26,
-                        "hidden": false
-                    },
-                    {
-                        "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿缁翠慨浠诲姟",
-                        "url": "/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport",
-                        "id": 27,
-                        "hidden": false
-                    },{
-                        "img": "../../static/icon/icon8.png",
                         "text": "璁惧缁翠慨楠屾敹鍗�",
                         "url": "/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill",
                         "id": 28,
+                        "hidden": false
+                    },
+                    {
+                        "img": "../../static/icon/icon8.png",
+                        "text": "璁惧鐐规浠诲姟",
+                        "url": "/pages/MJGL/Sb_EquipDotCheckTaskReport/Sb_EquipDotCheckTaskReport",
+                        "id": 29,
+                        "hidden": false
+                    },
+                    {
+                        "img": "../../static/icon/icon8.png",
+                        "text": "鍣ㄥ叿鐐规浠诲姟",
+                        "url": "/pages/MJGL/Sc_MouldDotCheckTaskReport/Sc_MouldDotCheckTaskReport",
+                        "id": 30,
                         "hidden": false
                     }
                 ]
@@ -242,6 +266,28 @@
         },
         onLoad() {
             this.getHiddenItem()
+        },
+        async onShow() {
+            if (this.initFinished) {
+                let MessageIdentifier = await this.getMessageIdentifierCount(this.menuListName)
+                if (MessageIdentifier.code == 0) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: MessageIdentifier.msg
+                    })
+
+                    return
+                }
+
+                this.itemData.forEach((e, index) => {
+                    if (MessageIdentifier.data[e.text]) {
+                        this.itemData[index]["corner"] = true
+                        this.itemData[index]["cornerCount"] = MessageIdentifier.data[e.text]
+                    }
+                })
+
+                this.$forceUpdate()
+            }
         },
         methods: {
             judgeHidden() {
@@ -251,10 +297,74 @@
                 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"]].id = e["HEntryID"]; //id涓�0寮哄埗闅愯棌
+
+                Array.from(data).forEach((e, index) => {
+                    if (index < this.itemData.length) {
+                        this.itemData[e["HIndex"]]["hidden"] = !CommonUtils.stringToBoolean(e[
+                            "HShowMode"] || false)
+                        this.itemData[e["HIndex"]].id = e["HEntryID"]; //id涓�0寮哄埗闅愯棌
+                    }
                 })
+
+                let MessageIdentifier = await this.getMessageIdentifierCount(this.menuListName)
+                if (MessageIdentifier.code == 0) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: MessageIdentifier.msg
+                    })
+
+                    return
+                }
+
+                Array.from(data).forEach((e, index) => {
+                    if (index < this.itemData.length) {
+                        if (MessageIdentifier.data[this.itemData[e["HIndex"]].text]) {
+                            this.itemData[e["HIndex"]]["corner"] = true,
+                                this.itemData[e["HIndex"]]["cornerCount"] = MessageIdentifier.data[this
+                                    .itemData[e["HIndex"]].text]
+                        }
+                    }
+                })
+                this.initFinished = true
+                this.$forceUpdate()
+            },
+            // 鏍规嵁妯″潡鑾峰彇鏈鐞嗘秷鎭潯鏁�
+            async getMessageIdentifierCount(menuListName) {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Web/getMessageIdentified',
+                        data: {
+                            user: getUserInfo()["HEmpName"],
+                            moduleName: menuListName
+                        }
+                    })
+                    console.log('common module: ', res);
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        let retVal = Array.from(data).reduce((acc, item) => {
+                            acc[item['moduleName']] = item.count
+                            return acc
+                        }, {})
+
+                        return {
+                            code: 1,
+                            msg: Message,
+                            data: retVal
+                        }
+                    } else {
+                        return {
+                            code: 0,
+                            msg: Message,
+                            data: []
+                        }
+                    }
+                } catch (err) {
+
+                }
             },
             switchHidden(index) {
                 this.updateCount++;
diff --git a/pages/index/tab4.vue b/pages/index/tab4.vue
index 9ace52d..abce8c9 100644
--- a/pages/index/tab4.vue
+++ b/pages/index/tab4.vue
@@ -161,13 +161,13 @@
                     	"id": 16,
                     	"hidden": false
                     },
-					{
-						"img": "../../static/icon/icon15.png",
-						"text": "鍙栨牱鍗�",
-						"url": "/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=0",
-						"id": 17,
-						"hidden": false
-					},
+					// {
+					// 	"img": "../../static/icon/icon15.png",
+					// 	"text": "鍙栨牱鍗�",
+					// 	"url": "/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=0",
+					// 	"id": 17,
+					// 	"hidden": false
+					// },
 					{
 						"img": "../../static/icon/icon15.png",
 						"text": "杩樻牱鍗�",
diff --git a/pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue b/pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue
index fe4190b..70d4621 100644
--- a/pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue
+++ b/pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue
@@ -327,8 +327,9 @@
                 tabs: 0,
                 HMainSourceBillType: '鐢熶骇鐢ㄦ枡娓呭崟',
                 arrayHMainSourceBillType: ['鐢熶骇鐢ㄦ枡娓呭崟', '鐢熶骇澶囨枡鍗�',
-                    '鐢熶骇鍙戞枡閫氱煡鍗�', '鐢熶骇璁㈠崟', '鎵嬪伐褰曞叆'
+                    '鐢熶骇鍙戞枡閫氱煡鍗�', '鐢熶骇璁㈠崟', '鐢熶骇棰嗘枡鐢宠鍗�', '鎵嬪伐褰曞叆'
                 ],
+                arrayHMainSourceBillValue: ['3720', '3721', '1214', '3710', '1256', '-1'],
 
                 linterid: '',
                 HBillNo: '',
@@ -850,22 +851,29 @@
             //閫夋嫨婧愬崟绫诲瀷
             HMainSourceBillTypeChange(e) {
                 this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
-                if (this.HMainSourceBillType == '鐢熶骇鐢ㄦ枡娓呭崟') {
+                if(this.HMainSourceBillType) {
+                    this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[e.detail.value]
+                }else {
+                    this.HMainSourceBillType = '鐢熶骇鐢ㄦ枡娓呭崟'
                     this.hform.HMainSourceBillType = 3720
-                    // this.getHYDList()
-                } else if (this.HMainSourceBillType == '鐢熶骇澶囨枡鍗�') {
-                    this.hform.HMainSourceBillType = 3721
-                    // this.getHYDList()
-                } else if (this.HMainSourceBillType == '鐢熶骇鍙戞枡閫氱煡鍗�') {
-                    this.hform.HMainSourceBillType = 1214
-                    // this.getHYDList()
-                } else if (this.HMainSourceBillType == '鐢熶骇璁㈠崟') {
-                    this.hform.HMainSourceBillType = 3710
-                    // this.getHYDList()
-                } else {
-                    this.hform.HMainSourceBillType = -1
-                    // this.getHYDList()
                 }
+                
+                // if (this.HMainSourceBillType == '鐢熶骇鐢ㄦ枡娓呭崟') {
+                //     this.hform.HMainSourceBillType = 3720
+                //     // this.getHYDList()
+                // } else if (this.HMainSourceBillType == '鐢熶骇澶囨枡鍗�') {
+                //     this.hform.HMainSourceBillType = 3721
+                //     // this.getHYDList()
+                // } else if (this.HMainSourceBillType == '鐢熶骇鍙戞枡閫氱煡鍗�') {
+                //     this.hform.HMainSourceBillType = 1214
+                //     // this.getHYDList()
+                // } else if (this.HMainSourceBillType == '鐢熶骇璁㈠崟') {
+                //     this.hform.HMainSourceBillType = 3710
+                //     // this.getHYDList()
+                // } else {
+                //     this.hform.HMainSourceBillType = -1
+                //     // this.getHYDList()
+                // }
             },
 
             //鑾峰彇瀹㈡埛鏁版嵁
@@ -1231,27 +1239,29 @@
                                 this.hform.HSourceBillNo = data.hSourceBillNoField
                                 //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
                                 this.hform.HMainSourceBillType = data.hSourceBillTypeField
-                                if (data.hSourceBillTypeField == "3720") {
-                                    this.HMainSourceBillType = '鐢熶骇鐢ㄦ枡娓呭崟'
-                                    this.hform.HMainSourceBillType = 3720
-                                    this.showHMainSourceBillType = false
-                                } else if (data.hSourceBillTypeField == "3721") {
-                                    this.HMainSourceBillType = '鐢熶骇澶囨枡鍗�'
-                                    this.hform.HMainSourceBillType = 3721
-                                    this.showHMainSourceBillType = false
-                                } else if (data.hSourceBillTypeField == "1214") {
-                                    this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
-                                    this.hform.HMainSourceBillType = 1214
-                                    this.showHMainSourceBillType = false
-                                } else if (data.hSourceBillTypeField == "3720") {
-                                    this.HMainSourceBillType = '鐢熶骇璁㈠崟'
-                                    this.hform.HMainSourceBillType = 3720
-                                    this.showHMainSourceBillType = false
-                                } else {
-                                    this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-                                    this.hform.HMainSourceBillType = -1
-                                    this.showHMainSourceBillType = false
-                                }
+                                let index = this.arrayHMainSourceBillValue.findIndex(item => item == data.hSourceBillTypeField)
+                                this.HMainSourceBillTypeChange({detail: {value: index}})
+                                // if (data.hSourceBillTypeField == "3720") {
+                                //     this.HMainSourceBillType = '鐢熶骇鐢ㄦ枡娓呭崟'
+                                //     this.hform.HMainSourceBillType = 3720
+                                //     this.showHMainSourceBillType = false
+                                // } else if (data.hSourceBillTypeField == "3721") {
+                                //     this.HMainSourceBillType = '鐢熶骇澶囨枡鍗�'
+                                //     this.hform.HMainSourceBillType = 3721
+                                //     this.showHMainSourceBillType = false
+                                // } else if (data.hSourceBillTypeField == "1214") {
+                                //     this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
+                                //     this.hform.HMainSourceBillType = 1214
+                                //     this.showHMainSourceBillType = false
+                                // } else if (data.hSourceBillTypeField == "3720") {
+                                //     this.HMainSourceBillType = '鐢熶骇璁㈠崟'
+                                //     this.hform.HMainSourceBillType = 3720
+                                //     this.showHMainSourceBillType = false
+                                // } else {
+                                //     this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+                                //     this.hform.HMainSourceBillType = -1
+                                //     this.showHMainSourceBillType = false
+                                // }
                                 if (data.hMulSourceFlagField == 0) {
                                     this.showHSourceBillNo = false
                                 }
@@ -1617,26 +1627,30 @@
                             this.hform.HBillNo = data.HBillNo
                             this.hform.HMainSourceBillType = data.HSourceBillType
                             this.hform.HSourceBillNo = data.HSourceBillNo
-                            if (data.HSourceBillType == 3720) {
-                                this.hform.HMainSourceBillType = 3720
-                                this.HMainSourceBillType = '鐢熶骇鐢ㄦ枡娓呭崟'
-                                this.showHSupName = false
-                            } else if (data.HSourceBillType == 3721) {
-                                this.hform.HMainSourceBillType = 3721
-                                this.HMainSourceBillType = '鐢熶骇澶囨枡鍗�'
-                                this.showHSupName = false
-                            } else if (data.HSourceBillType == 1214) {
-                                this.hform.HMainSourceBillType = 1214
-                                this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
-                                this.showHSupName = false
-                            } else if (data.HSourceBillType == 3710) {
-                                this.hform.HMainSourceBillType = 3710
-                                this.HMainSourceBillType = '鐢熶骇璁㈠崟'
-                                this.showHSupName = false
-                            } else {
-                                this.hform.HMainSourceBillType = -1
-                                this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-                            }
+                            
+                            let index = this.arrayHMainSourceBillValue.findIndex(item => item == data.HSourceBillType)
+                            this.HMainSourceBillTypeChange({detail: {value: index}})
+                            
+                            // if (data.HSourceBillType == 3720) {
+                            //     this.hform.HMainSourceBillType = 3720
+                            //     this.HMainSourceBillType = '鐢熶骇鐢ㄦ枡娓呭崟'
+                            //     this.showHSupName = false
+                            // } else if (data.HSourceBillType == 3721) {
+                            //     this.hform.HMainSourceBillType = 3721
+                            //     this.HMainSourceBillType = '鐢熶骇澶囨枡鍗�'
+                            //     this.showHSupName = false
+                            // } else if (data.HSourceBillType == 1214) {
+                            //     this.hform.HMainSourceBillType = 1214
+                            //     this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
+                            //     this.showHSupName = false
+                            // } else if (data.HSourceBillType == 3710) {
+                            //     this.hform.HMainSourceBillType = 3710
+                            //     this.HMainSourceBillType = '鐢熶骇璁㈠崟'
+                            //     this.showHSupName = false
+                            // } else {
+                            //     this.hform.HMainSourceBillType = -1
+                            //     this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+                            // }
                             this.showHMainSourceBillType = false
 
                             //闈炲婧愬崟妯″紡
diff --git a/utils/common.js b/utils/common.js
index cc66952..80c909d 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -514,6 +514,8 @@
         
         return httpUrl
     }
+    
+    
 }
 
 export const CommonUtils = new commonUtils()
\ No newline at end of file

--
Gitblit v1.9.1