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

---
 pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBillList.vue                        |   12 
 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBillList.vue     |   73 
 pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue                            |  954 ++
 pages/index/tab2.vue                                                               |  250 
 pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList.vue               |  478 +
 pages/MJGL/style/MJBillStyle.scss                                                  |   48 
 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue     |  908 ++
 pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss                                 |  271 
 pages/shengchanruku/ProductInCheckBill.vue                                         |    4 
 pages/ZLGL/AanDengHujiao/style/MJListStyle.scss                                    |  193 
 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue         | 1023 ++
 pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue                           |  822 ++
 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBillList.vue       |   71 
 main.js                                                                            |    2 
 pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBillList.vue                         |   12 
 pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue                         |  777 ++
 pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckRuleBillList.vue                    |  516 +
 pages/index/index.vue                                                              |  224 
 pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList.vue                     |  476 +
 pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList.vue                     |  516 +
 pages/MJGL/style/MJListStyle.scss                                                  |  193 
 pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue                             |  872 ++
 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBillList.vue   |   70 
 pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue                  |  735 ++
 pages/MJGL/MouldScrapOutBill/MouldScrapOutBill.vue                                 |   43 
 pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue                           |  239 
 pages.json                                                                         | 2981 ++++----
 pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList.vue                       |  472 +
 pages/index/tab4.vue                                                               |   60 
 utils/i18n.js                                                                      |    1 
 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue                   | 1043 ++
 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBillList.vue               |   66 
 pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue                      |    6 
 pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue                     |  736 ++
 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue       | 1047 ++
 /dev/null                                                                          |  333 
 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBillList.vue |   80 
 pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBillList.vue               |  478 +
 pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue                   |  800 ++
 pages/zutuo_xiaowei/form_xiaowei.vue                                               |    2 
 pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList.vue                 |  472 +
 pages/index/tab3.vue                                                               |  163 
 pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList.vue                       |  476 +
 pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue                   |  887 ++
 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue           |  989 ++
 pages/shengchanlingliao/PPickingCheckBill.vue                                      |    4 
 components/MJGL/BillSelectorPopup.vue                                              |  327 
 47 files changed, 18,800 insertions(+), 2,405 deletions(-)

diff --git a/components/MJGL/BillSelectorPopup.vue b/components/MJGL/BillSelectorPopup.vue
new file mode 100644
index 0000000..51b2966
--- /dev/null
+++ b/components/MJGL/BillSelectorPopup.vue
@@ -0,0 +1,327 @@
+<template>
+    <view>
+        <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
+            <view class="content">
+                <view class="search-condition">
+                    <view class="title"><text>鍗曟嵁鍙�: </text></view>
+                    <view class="right"><input type="text" v-model="HBillNo" @confirm="getBillList" /></view>
+                </view>
+                <view class="buttons">
+                    <view style="flex: 1;"></view>
+                    <button size="mini" type="primary" @click="search">鏌ヨ</button>
+                    <button size="mini" type="primary" @click="exit">閫�鍑�</button>
+                </view>
+                <scroll-view id="#BillListPanel" scroll-y="true" style="height: 55vh;">
+                    <view class="card-item" v-show="HBillList.length != 0">
+                        <uni-card
+                            v-for="(bill, index) in HBillList[curPage-1]" :key="index" @tap="clickCard(bill, index)">
+                                <view class="card-detail" v-for="(HBillField, index) in emptyValueFilter(bill,HBillFieldsList).slice(0,10)" :key="index">
+                                    <template v-if="HBillField.ColmType == 'DateTime'"><text>{{ HBillField.ColmCols }}锛�</text>{{  bill[HBillField.ColmCols] ? dayjs(bill[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }} </template>    
+                                    <template v-else><text>{{ HBillField.ColmCols }}锛�</text>{{  bill[HBillField.ColmCols] }}</template>
+                                </view>
+                                <view class="card-detail" v-if="showDetail == index">
+                                    <view class="card-detail" v-for="(HBillField, index) in emptyValueFilter(bill,HBillFieldsList).slice(10,-1)" :key="index">
+                                        <template v-if="HBillField.ColmType == 'DateTime'"><text>{{ HBillField.ColmCols }}锛�</text>{{  bill[HBillField.ColmCols] ? dayjs(bill[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }} </template>    
+                                        <template v-else><text>{{ HBillField.ColmCols }}锛�</text>{{  bill[HBillField.ColmCols] }}</template>
+                                    </view>
+                                </view>
+                            <view class="more" v-if="showDetail == index && operations != index">
+                            	<view class="part" style="border-right: 1px solid #eee;" @tap.stop="showDetail = -1">
+                            		<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;" @tap.stop="showDetail = index">
+                            		<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>
+                        </uni-card>
+                    </view>
+                    <view class="over" v-show="HBillList.length == 0">鏆傛棤鏁版嵁</view>
+                </scroll-view>
+                <uni-pagination id="#pagination" title="鏍囬鏂囧瓧" v-model="curPage" :pageSize="size"
+                    :total="length"></uni-pagination>
+            </view>
+        </uni-popup>
+    </view>
+</template>
+
+<script>
+    import dayjs from 'dayjs';
+    import {
+        CommonUtils
+    } from '@/utils/common';
+    import {
+        getUserInfo
+    } from '@/utils/auth';
+    export default {
+        name: "billSelectorPopup",
+        emits: ["update:modelValue"],
+        data() {
+            return {
+                showDetail: -1,
+                operations: -1,
+                dayjs: dayjs,
+                enablefocus: false,
+                size: 20,
+                curPage: 1,
+                length: 0,
+                page: 0,
+                HName: '',
+                HCode: '',
+                HBillNo: '',
+                HBillList: [], // 琛ㄥ崟鏁版嵁闆嗗悎
+                HBillFieldsList: [], // 琛ㄥ崟瀛楁闆嗗悎
+                panelHeight: 0,
+
+                refTargetKey: 0,
+                multiSouceBillList: [],
+
+            };
+        },
+        props: {
+            HStockOrgID: {
+                type: [String, Number],
+            },
+            Type: {
+                type: [String],
+                require: true
+            }
+        },
+        mounted() {},
+        methods: {
+            popupChangeHandler(e) {
+                if (e.show === true) {
+                    
+                }
+            },
+            async exit() {
+                this.size = 20
+                this.curPage = 1
+                this.length = 0
+                this.page = 0
+                this.HSourceBillNo = ''
+                this.HMater = ''
+                this.HCustom = ''
+                this.HBillList = []
+                this.enablefocus = false
+                this.multiSouceBillList = []
+                // 闇�瑕佺瓑寰呴〉闈㈠唴鐨勬暟鎹祴鍊煎畬姣�
+                await this.$nextTick()
+                this.$refs.popup.close();
+            },
+            search() {
+                this.getBillList()
+            },
+            async showPopup(index) {
+                this.$refs.popup.open();
+                this.refTargetKey = index
+                this.getBillList()
+            },
+            clickCard(bill, index) {
+                console.log('this.HBillList: ',this.HBillList, 'index: ', index);
+                let retVal = {}
+                retVal[this.refTargetKey] = bill
+                this.$emit("update", {
+                    retVal: retVal,
+                    index: this.refTargetKey
+                })
+            },
+            getsWhere() {
+                let sWhere =
+                    ``
+
+                // if (this.HCode) {
+                //     swhere += ` and 涓嶈壇鍘熷洜浠g爜 like '%${this.HCode}%'`
+                // }
+                if (this.HBillNo) {
+                    sWhere += ` and 鍗曟嵁鍙� like '%${this.HBillNo}%'`
+                }
+                
+                if(this.refTargetKey) {
+                    // sWhere += ` and HInterID = ${this.refTargetKey}`
+                }
+                return sWhere
+            },
+            getBillList() {
+                let sWhere = this.getsWhere()
+                this.HBillList = []
+                this.length = 0
+                this.page = 0
+                this.curPage = 1
+                let url = ""
+                if(this.Type == 'BY'){
+                    url = "/Sb_EquipMaintainRuleBill/GetEquipMaintainRuleListPDA"
+                }
+                else if (this.Type == 'DJ'){
+                    url = "/Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleListPDA"
+                }
+                else {
+                    
+                }
+                CommonUtils.doRequest(
+                    url, {
+                        sWhere: sWhere,
+                        user: getUserInfo()['Czymc'],
+                    },
+                    (res) => {
+                        let {
+                            data,
+                            count,
+                            list,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            this.length = Array.from(data).length
+                            const result = [];
+                            for (let i = 0; i < data.length; i += this.size) {
+                                result.push(data.slice(i, i + this.size));
+                            }
+                            this.HBillList = result
+                            // 杩囨护涓嶉渶瑕佹樉绀虹殑瀛楁
+                            this.HBillFieldsList = Array.from(list)
+                                .filter(e => this.shouldShowField(e.ColmCols) == true)
+                            this.page = result.length
+                            setTimeout(() => {
+                                this.enablefocus = true
+                            }, 500)
+                        } else {
+                            setTimeout(() => {
+                                this.enablefocus = true
+                            }, 500)
+                            uni.showModal({
+                                title: '娓╅Θ鎻愮ず',
+                                content: Message
+                            })
+                        }
+                    }
+                )
+            },
+            // 鍒ゆ柇鍝簺瀛楁闇�瑕佹樉绀�
+			shouldShowField(key) {
+			    // 鎺掗櫎涓嶉渶瑕佹樉绀虹殑瀛楁
+			    const excludeKeys = []; // 杩欎簺瀛楁宸茬粡鍦ㄥ叾浠栧湴鏂规樉绀轰簡
+			    
+			    // 鍒ゆ柇key鏄惁鍏ㄨ嫳鏂囷紙涓嶅寘鍚腑鏂囷級
+			    const isAllEnglish = /^[a-zA-Z]+$/.test(key);
+			    
+			    // 鍒ゆ柇key鏄惁鍖呭惈"ID"锛堜笉鍖哄垎澶у皬鍐欙級
+			    const containsID = key.toUpperCase().includes('ID');
+			    
+			    return !excludeKeys.includes(key) && 
+			           !isAllEnglish && // 鎺掗櫎鍏ㄨ嫳鏂囩殑key
+			           !containsID // 鎺掗櫎鍖呭惈ID鐨刱ey
+			},
+            emptyValueFilter(item, fieldList){
+                return fieldList.filter(e => item[e.ColmCols])
+            }
+        },
+    }
+</script>
+
+<style lang="scss" scoped>
+    .content {
+        box-sizing: border-box;
+        border-radius: 15rpx 15rpx 0 0;
+        padding: 20rpx 20rpx 40rpx 20rpx;
+        background-color: #fff;
+        display: flex;
+        flex-direction: column;
+        gap: 10rpx;
+
+        .search-condition {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            gap: 20rpx;
+            font-size: 30rpx;
+
+            .title {
+                width: 5rem;
+                text-align: right;
+            }
+
+            .right {
+                flex: 1;
+                border-radius: 22rpx;
+                border: 1px solid #acacac;
+                height: auto;
+                padding: 8rpx 16rpx;
+
+                input {
+                    width: 100%;
+                    font-size: 30rpx;
+                }
+            }
+        }
+
+        .buttons {
+            display: flex;
+            flex-direction: row;
+            gap: 20rpx;
+            justify-content: flex-end;
+
+            >button {
+                display: inline-flex;
+                width: 4rem;
+            }
+        }
+
+        .card-item {
+            .card-detail {
+                width: 100%;
+                display: flex;
+                flex-wrap: wrap;
+                justify-content: flex-start;
+                line-height: 120%;
+
+                .detail {
+                    // width: 50%;
+                    font-size: 26rpx;
+                    margin-bottom: 12rpx;
+                    color: #555;
+                    margin-right: 20rpx;
+
+                    text {
+                        color: #999;
+                        font-size: 26rpx;
+                    }
+                }
+            }
+        }
+
+        .uni-card--is-active {
+            background-color: rgba(0, 122, 255, 0.2);
+        }
+
+        .daterange {
+            display: flex;
+            flex-direction: row;
+            gap: 10rpx;
+            justify-content: center;
+            align-items: center;
+
+        }
+    }
+    
+    .more {
+        color: #888;
+        font-size: 24rpx;
+        display: flex;
+        border-top: 1px solid #eee;
+        padding-top: 20rpx;
+    
+        .part {
+            width: 50%;
+            text-align: center;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/main.js b/main.js
index aade6d2..eaccbc7 100644
--- a/main.js
+++ b/main.js
@@ -48,7 +48,7 @@
 import VueI18n from 'vue-i18n'
 Vue.use(VueI18n)
 const i18n = new VueI18n(i18nConfig)
-// TODO missing鍥炶皟鏃犳硶婊¤冻 鍔犺浇绾夸笂鍖� 鍚庣殑妫�楠屽姛鑳斤紝闇�閲嶅啓$t鍑芥暟
+// missing鍥炶皟鏃犳硶婊¤冻 鍔犺浇绾夸笂鍖� 鍚庣殑妫�楠屽姛鑳斤紝闇�閲嶅啓$t鍑芥暟
 const originalT = Vue.prototype.$t
 Vue.prototype.$t = function(key, ...args) {
     // 璋冪敤鍘熷 $t 鎵ц缈昏瘧
diff --git a/pages.json b/pages.json
index 25a4f30..bc8e1d4 100644
--- a/pages.json
+++ b/pages.json
@@ -1,1365 +1,338 @@
 {
-    "pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
-        {
-            "path": "pages/index/login",
-            "style": {
-                "navigationBarTitleText": "鐧诲綍",
-                "navigationStyle": "custom"
-            }
-        },
-        {
-            "path": "pages/index/index",
-            "style": {
-                "navigationBarTitleText": "棣栭〉",
-                "navigationStyle": "custom"
-            }
-        },
-        {
-            "path": "pages/index/tab1",
-            "style": {
-                "navigationBarTitleText": "杞﹂棿宸ュ簭"
-            }
-        },
-        {
-            "path": "pages/index/tab2",
-            "style": {
-                "navigationBarTitleText": "鍗曟嵁鍒楄〃"
-            }
-        },
+	"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
 		{
-            "path": "pages/index/tab3",
-            "style": {
-                "navigationBarTitleText": "鍣ㄥ叿绠$悊"
-            }
-        },
-		{
-		    "path": "pages/index/tab4",
-		    "style": {
-		        "navigationBarTitleText": "璐ㄩ噺绠$悊"
-		    }
+			"path": "pages/index/login",
+			"style": {
+				"navigationBarTitleText": "鐧诲綍",
+				"navigationStyle": "custom"
+			}
 		},
-        {
-            "path": "pages/index/mine",
-            "style": {
-                "navigationBarTitleText": "涓汉涓績",
-                // "navigationStyle": "custom"
-                "navigationBarTextStyle": "white",
-                "navigationBarBackgroundColor": "#65a2fb"
-            }
-        },
-        {
-            "path": "pages/shebeilvli/deviceStatueAnalysis",
-            "style": {
-                "navigationBarTitleText": "璁惧鐘舵�佸垎鏋�"
-            }
-        },
-        {
-            "path": "pages/shebeilvli/EquipFileBillResume",
-            "style": {
-                "navigationBarTitleText": "璁惧灞ュ巻",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/shebeilvli/EquipFileBillResume_son",
-            "style": {
-                "navigationBarTitleText": "璁惧灞ュ巻瀛愯〃"
-            }
-        },
-        {
-            "path": "pages/baoyangjihua/Sb_EquipMaintainPlanEdit",
-            "style": {
-                "navigationBarTitleText": "璁惧淇濆吇璁″垝鍗�"
-            }
-        },
-        {
-            "path": "pages/baoyangjihua/Sb_EquipMaintainPlanList",
-            "style": {
-                "navigationBarTitleText": "璁惧淇濆吇璁″垝鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/baoyangjihua/Sb_EquipMaintainPlanList_son",
-            "style": {
-                "navigationBarTitleText": "淇濆吇璁″垝瀛愯〃"
-            }
-        },
-        {
-            "path": "pages/baoyangjilu/Sb_EquipMaintainRuleEdit",
-            "style": {
-                "navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�"
-            }
-        },
-        {
-            "path": "pages/baoyangjilu/Sb_EquipMaintainRuleList",
-            "style": {
-                "navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/baoyangjilu/Sb_EquipMaintainRuleList_son",
-            "style": {
-                "navigationBarTitleText": "淇濆吇璁板綍瀛愯〃"
-            }
-        },
-        {
-            "path": "pages/guzhangdengji/EqpConkBookBill",
-            "style": {
-                "navigationBarTitleText": "璁惧鏁呴殰鐧昏琛�"
-            }
-        },
-        {
-            "path": "pages/guzhangdengji/EqpConkBookBillList",
-            "style": {
-                "navigationBarTitleText": "璁惧鏁呴殰鐧昏琛�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/shebeidangan/Gy_EquipFileMainBill",
-            "style": {
-                "navigationBarTitleText": "璁惧妗f"
-            }
-        },
-        {
-            "path": "pages/shebeidangan/Gy_EquipFileMainBillList",
-            "style": {
-                "navigationBarTitleText": "璁惧妗f",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/shebeiweixiu/Sb_Add_EqpMaintenanceBillList",
-            "style": {
-                "navigationBarTitleText": "璁惧缁翠慨璁板綍鍗�"
-            }
-        },
-        {
-            "path": "pages/shebeiweixiu/SbEqpMaintenanceBillList",
-            "style": {
-                "navigationBarTitleText": "璁惧缁翠慨璁板綍鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/weiwaigxOut/firstCheck",
-            "style": {
-                "navigationBarTitleText": "棣栦欢妫�楠屽崟",
-                "enablePullDownRefresh": true
-            }
-        }, {
-            "path": "pages/gongxuIn/Cj_StationInBill",
-            "style": {
-                "navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�"
-            }
-        },
-        {
-            "path": "pages/gongxuIn/Cj_StationInBillList",
-            "style": {
-                "navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�",
-                "enablePullDownRefresh": true
-            }
-        }, {
-            "path": "pages/gongxuOut/Cj_StationOutBill",
-            "style": {
-                "navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�"
-            }
-        },
-        {
-            "path": "pages/gongxuOut/Cj_StationOutBillList",
-            "style": {
-                "navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/gongxuOutSendWork/gongxuOutSendWorkBill",
-            "style": {
-                "navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�(娲惧伐)",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/gongxuOut/moneystatistics",
-            "style": {
-                "navigationBarTitleText": "鎴戠殑宸ヨ祫(姹囨姤棰勪及)",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/shebeiguanli/deviceManage",
-            "style": {
-                "navigationBarTitleText": "璁惧绠$悊",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/shebeiguanli/deviceManageList",
-            "style": {
-                "navigationBarTitleText": "璁惧绠$悊",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/shebeiguanli/ticketList",
-            "style": {
-                "navigationBarTitleText": "宸ュ崟鍒楄〃",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/baogong/ProductReportStepBillList",
-            "style": {
-                "navigationBarTitleText": "浜ч噺姹囨姤鍗�",
-                "enablePullDownRefresh": false
-            }
-        },
-        {
-            "path": "pages/baogong/IpadIndex",
-            "style": {
-                "navigationBarTitleText": "鎶ュ伐骞冲彴",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/baogong/DayPlanBillList",
-            "style": {
-                "navigationBarTitleText": "宸ュ崟鍒楄〃",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/baogong/abnormal",
-            "style": {
-                "navigationBarTitleText": "寮傚父鍙嶉鍗�",
-                "enablePullDownRefresh": false
-            }
-        },
-        {
-            "path": "pages/yichang/MESExecptFeedBackBillList",
-            "style": {
-                "navigationBarTitleText": "寮傚父鍙嶉鍗曞垪琛�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/yichang/MESExecptFeedBackBill",
-            "style": {
-                "navigationBarTitleText": "寮傚父鍙嶉鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/yichang/ErrMsgBackHandleBillList",
-            "style": {
-                "navigationBarTitleText": "寮傚父鍙嶉澶勭悊鍗曞垪琛�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/caigouruku/POStockInBillList",
-            "style": {
-                "navigationBarTitleText": "閲囪喘鍏ュ簱鍒楄〃",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/caigouruku/POStockInBill",
-            "style": {
-                "navigationBarTitleText": "閲囪喘鍏ュ簱鍗�",
-                "enablePullDownRefresh": false
-            }
-        },
-        {
-            "path": "pages/caigoutuiliao/POStockInBackBillList",
-            "style": {
-                "navigationBarTitleText": "閲囪喘閫�鏂欏垪琛�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/caigoutuiliao/POStockInBackBill",
-            "style": {
-                "navigationBarTitleText": "閲囪喘閫�鏂欏崟",
-                "enablePullDownRefresh": false
-            }
-        },
-        {
-            "path": "pages/xiaoshouchuku/SellOutBillList",
-            "style": {
-                "navigationBarTitleText": "閿�鍞嚭搴撳垪琛�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/xiaoshouchuku/SellOutBill",
-            "style": {
-                "navigationBarTitleText": "閿�鍞嚭搴撳崟",
-                "enablePullDownRefresh": false
-            }
-        },
-        {
-            "path": "pages/xiaoshoutuihuo/ICStockBillMainList",
-            "style": {
-                "navigationBarTitleText": "閿�鍞��璐у垪琛�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/xiaoshoutuihuo/ICStockBillMain",
-            "style": {
-                "navigationBarTitleText": "閿�鍞��璐у崟",
-                "enablePullDownRefresh": false
-            }
-        },
-        {
-            "path": "pages/shouliaotongzhi/table",
-            "style": {
-                "navigationBarTitleText": "鏀舵枡閫氱煡鍗�",
-                "enablePullDownRefresh": false
-            }
-        },
-        {
-            "path": "pages/shouliaotongzhi/table_son",
-            "style": {
-                "navigationBarTitleText": "鏉$爜鐢熸垚",
-                "enablePullDownRefresh": false
-            }
-        },
-        {
-            "path": "pages/shengchanlingliao/PPickingCheckBillList",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇棰嗘枡鏍¢獙鍒楄〃",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/shengchanlingliao/PPickingCheckBill",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇棰嗘枡鍗曟牎楠�",
-                "enablePullDownRefresh": false
-            }
-        },
-        {
-            "path": "pages/shengchanruku/ProductInCheckBillList",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇鍏ュ簱鏍¢獙鍒楄〃",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/shengchanruku/ProductInCheckBill",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇鍏ュ簱鍗曟牎楠�",
-                "enablePullDownRefresh": false
-            }
-        },
-        {
-            "path": "pages/shengchandiaobo/MoveStockBillList",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇璋冩嫧鏍¢獙鍒楄〃",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/shengchandiaobo/MoveStockBill",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇璋冩嫧鍗曟牎楠�",
-                "enablePullDownRefresh": false
-            }
-        },
-        {
-            "path": "pages/labelPrinter/index",
-            "style": {
-                "navigationBarTitleText": "鏍囩鎵撳嵃"
-            }
-        },
-        {
-            "path": "pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai",
-            "style": {
-                "navigationBarTitleText": "璁惧杩愯鐘舵��",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/shebeiyunxingzhuangtai/detail",
-            "style": {
-                "navigationBarTitleText": "璁惧杩愯鐘舵�佽鎯�"
-            }
-        },
-        {
-            "path": "pages/mujvzhuangtai/mujvzhuangtai",
-            "style": {
-                "navigationBarTitleText": "妯″叿鐘舵�佸垎甯�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/mujvzhuangtai/detail",
-            "style": {
-                "navigationBarTitleText": "妯″叿鐘舵�佽鎯�"
-            }
-        },
-        {
-            "path": "pages/tiaomachaima/tiaomachaima",
-            "style": {
-                "navigationBarTitleText": "鏉$爜鎷嗙爜"
-            }
-        },
-        {
-            "path": "pages/tiaomachaima/tiaomachaima2",
-            "style": {
-                "navigationBarTitleText": "鏉$爜鎷嗙爜2"
-            }
-        },
-        {
-            "path": "pages/wuliaosaoma/wuliaosaoma",
-            "style": {
-                "navigationBarTitleText": "鐗╂枡娓呭崟"
-            }
-        },
-        {
-            "path": "pages/wuliaosaoma/detail",
-            "style": {
-                "navigationBarTitleText": "鏉$爜妗f"
-            }
-        },
-        {
-            "path": "pages/caigouruku/POStockInBillList",
-            "style": {
-                "navigationBarTitleText": "閲囪喘鍏ュ簱",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/caigouruku/POStockInBill",
-            "style": {
-                "navigationBarTitleText": "閲囪喘鍏ュ簱鍗�"
-            }
-        },
-        {
-            "path": "pages/caigoutuiliao/POStockInBackBillList",
-            "style": {
-                "navigationBarTitleText": "閲囪喘閫�鏂�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/caigoutuiliao/POStockInBackBill",
-            "style": {
-                "navigationBarTitleText": "閲囪喘閫�鏂欏崟"
-            }
-        },
-        {
-            "path": "pages/xiaoshouchuku/SellOutBillList",
-            "style": {
-                "navigationBarTitleText": "閿�鍞嚭搴�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/xiaoshouchuku/SellOutBill",
-            "style": {
-                "navigationBarTitleText": "閿�鍞嚭搴撳崟"
-            }
-        },
-        {
-            "path": "pages/xiaoshoutuihuo/ICStockBillMainList",
-            "style": {
-                "navigationBarTitleText": "閿�鍞��璐�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/xiaoshoutuihuo/ICStockBillMain",
-            "style": {
-                "navigationBarTitleText": "閿�鍞��璐у崟"
-            }
-        },
-        {
-            "path": "pages/qitachuku/qitachuku",
-            "style": {
-                "navigationBarTitleText": "鍏朵粬鍑哄簱",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/qitachuku/qitachukudan",
-            "style": {
-                "navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
-            }
-        },
-        {
-            "path": "pages/qitaruku/qitaruku",
-            "style": {
-                "navigationBarTitleText": "鍏朵粬鍏ュ簱",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/qitaruku/qitarukudan",
-            "style": {
-                "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
-            }
-        },
-        {
-            "path": "pages/tiaomadaying/tiaomadaying",
-            "style": {
-                "navigationBarTitleText": "閲囪喘鏉$爜鎵撳嵃"
-            }
-        },
-        {
-            "path": "pages/caigoudingdan/generate",
-            "style": {
-                "navigationBarTitleText": "鏉$爜鐢熸垚"
-            }
-        },
-        {
-            "path": "pages/caigoudingdan/caigoudingdan",
-            "style": {
-                "navigationBarTitleText": "閲囪喘璁㈠崟"
-            }
-        },
-        {
-            "path": "pages/MJGL/shangmudan/MouldUpperBillList",
-            "style": {
-                "navigationBarTitleText": "涓婃ā鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/MJGL/shangmudan/MouldUpperBill",
-            "style": {
-                "navigationBarTitleText": "涓婃ā鍗�"
-            }
-        },
-        {
-            "path": "pages/MJGL/xiamodan/MouldLowerBillList",
-            "style": {
-                "navigationBarTitleText": "涓嬫ā鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/MJGL/xiamodan/MouldLowerBill",
-            "style": {
-                "navigationBarTitleText": "涓嬫ā鍗�"
-            }
-        },
-        {
-            "path": "pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList",
-            "style": {
-                "navigationBarTitleText": "妯″叿鐐规璁板綍鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/qitachukujiaoyan/qitachukujiaoyan",
-            "style": {
-                "navigationBarTitleText": "鍏朵粬鍑哄簱鏍¢獙",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/MJGL/mujudianjianjiludan/form",
-            "style": {
-                "navigationBarTitleText": "妯″叿鐐规璁板綍鍗�"
-            }
-        },
-        {
-            "path": "pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList_son",
-            "style": {
-                "navigationBarTitleText": "妯″叿淇濆吇璁板綍瀛愯〃"
-            }
-        },
-        {
-            "path": "pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList",
-            "style": {
-                "navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗�",
-                "enablePullDownRefresh": true
-            }
-        }, {
-            "path": "pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇琛ユ枡鍗曟牎楠�"
-            }
-        }, {
-            "path": "pages/MJGL/mujubaoyangjiludan/MouldMaintainBill",
-            "style": {
-                "navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗�"
-            }
-        }, {
-            "path": "pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList_son",
-            "style": {
-                "navigationBarTitleText": "妯″叿淇濆吇璁板綍瀛愯〃"
-            }
-        }, {
-            "path": "pages/qitachukujiaoyan/qitachukujiaoyan",
-            "style": {
-                "navigationBarTitleText": "鍏朵粬鍑哄簱鏍¢獙",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/qitachukujiaoyan/qitachukudanjiaoyan",
-            "style": {
-                "navigationBarTitleText": "鍏朵粬鍑哄簱鍗曟牎楠�"
-            }
-        },
-        {
-            "path": "pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBillList",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇琛ユ枡鏍¢獙",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇琛ユ枡鍗曟牎楠�"
-            }
-        },
-        {
-            "path": "pages/xiaoshouchukujiaoyan/SellOutCheckBillList",
-            "style": {
-                "navigationBarTitleText": "閿�鍞嚭搴撴牎楠�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/xiaoshouchukujiaoyan/SellOutCheckBill",
-            "style": {
-                "navigationBarTitleText": "閿�鍞嚭搴撳崟鏍¢獙"
-            }
-        },
-        {
-            "path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBillList",
-            "style": {
-                "navigationBarTitleText": "濮斿棰嗘枡鏍¢獙",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBill",
-            "style": {
-                "navigationBarTitleText": "濮斿棰嗘枡鍗曟牎楠�"
-            }
-        },
-        {
-            "path": "pages/caigourukujiaoyan/POStockInCheckBillList",
-            "style": {
-                "navigationBarTitleText": "閲囪喘鍏ュ簱鏍¢獙",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/caigourukujiaoyan/POStockInCheckBill",
-            "style": {
-                "navigationBarTitleText": "閲囪喘鍏ュ簱鍗曟牎楠�",
-                "enablePullDownRefresh": false
-            }
-        },
-        {
-            "path": "pages/qitarukujiaoyan/Kf_OtherInBillCheckList",
-            "style": {
-                "navigationBarTitleText": "鍏朵粬鍏ュ簱鏍¢獙",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/qitarukujiaoyan/Kf_OtherInBillCheck",
-            "style": {
-                "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗曟牎楠�"
-            }
-        },
-        {
-            "path": "pages/weiwaibuliaojiaoyan/Kf_EntrustReplenishOutBill_CheckList",
-            "style": {
-                "navigationBarTitleText": "濮斿琛ユ枡鏍¢獙",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/weiwaibuliaojiaoyan/Kf_EntrustReplenishOutBill_Check",
-            "style": {
-                "navigationBarTitleText": "濮斿琛ユ枡鍗曟牎楠�"
-            }
-        },
-        {
-            "path": "pages/shengchanlingliaoshengdan/Kf_MateOutBillList",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇棰嗘枡",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/shengchanlingliaoshengdan/Kf_MateOutBill",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇棰嗘枡鍗�"
-            }
-        },
-        {
-            "path": "pages/weiwailingliao/Kf_EntrustOutBillList",
-            "style": {
-                "navigationBarTitleText": "濮斿棰嗘枡",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/weiwailingliao/Kf_EntrustOutBill",
-            "style": {
-                "navigationBarTitleText": "濮斿棰嗘枡鍗�"
-            }
-        },
-        {
-            "path": "pages/shengchanrukushengdan/Kf_ProductInBillList",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇鍏ュ簱",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/shengchanrukushengdan/Kf_ProductInBill",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇鍏ュ簱鍗�"
-            }
-        },
-        {
-            "path": "pages/xiaoshouchukujiaoyan/SellOutCheckBill",
-            "style": {
-                "navigationBarTitleText": "閿�鍞嚭搴撳崟鏍¢獙"
-            }
-        },
-        {
-            "path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBillList",
-            "style": {
-                "navigationBarTitleText": "濮斿棰嗘枡鏍¢獙",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBill",
-            "style": {
-                "navigationBarTitleText": "濮斿棰嗘枡鍗曟牎楠�"
-            }
-        },
-        {
-            "path": "pages/caigourukujiaoyan/POStockInCheckBillList",
-            "style": {
-                "navigationBarTitleText": "閲囪喘鍏ュ簱鏍¢獙",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/caigourukujiaoyan/POStockInCheckBill",
-            "style": {
-                "navigationBarTitleText": "閲囪喘鍏ュ簱鍗曟牎楠�",
-                "enablePullDownRefresh": false
-            }
-        },
-        {
-            "path": "pages/qitarukujiaoyan/Kf_OtherInBillCheckList",
-            "style": {
-                "navigationBarTitleText": "鍏朵粬鍏ュ簱鏍¢獙",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/qitarukujiaoyan/Kf_OtherInBillCheck",
-            "style": {
-                "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗曟牎楠�"
-            }
-        },
-        {
-            "path": "pages/weiwaibuliaojiaoyan/Kf_EntrustReplenishOutBill_CheckList",
-            "style": {
-                "navigationBarTitleText": "濮斿琛ユ枡鏍¢獙",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/weiwaibuliaojiaoyan/Kf_EntrustReplenishOutBill_Check",
-            "style": {
-                "navigationBarTitleText": "濮斿琛ユ枡鍗曟牎楠�"
-            }
-        },
-        {
-            "path": "pages/shengchanlingliaoshengdan/Kf_MateOutBillList",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇棰嗘枡",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/shengchanlingliaoshengdan/Kf_MateOutBill",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇棰嗘枡鍗�"
-            }
-        },
-        {
-            "path": "pages/weiwailingliao/Kf_EntrustOutBillList",
-            "style": {
-                "navigationBarTitleText": "濮斿棰嗘枡",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/weiwailingliao/Kf_EntrustOutBill",
-            "style": {
-                "navigationBarTitleText": "濮斿棰嗘枡鍗�"
-            }
-        },
-        {
-            "path": "pages/shengchanrukushengdan/Kf_ProductInBillList",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇鍏ュ簱",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/shengchanrukushengdan/Kf_ProductInBill",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇鍏ュ簱鍗�"
-            }
-        },
-        {
-            "path": "pages/shengchanbuliao/MateReplenishOutBillList",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇琛ユ枡",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/shengchanbuliao/MateReplenishOutBill",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇琛ユ枡鍗�"
-            }
-        },
-        {
-            "path": "pages/qitaruku_v2/OtherInBillList",
-            "style": {
-                "navigationBarTitleText": "鍏朵粬鍏ュ簱",
-                "enablePullDownRefresh": true
-            }
-        }, {
-            "path": "pages/qitaruku_v2/OtherInBill",
-            "style": {
-                "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
-            }
-        },
-        {
-            "path": "pages/qitachuku_v2/OtherOutBillList",
-            "style": {
-                "navigationBarTitleText": "鍏朵粬鍑哄簱",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/qitachuku_v2/OtherOutBill",
-            "style": {
-                "navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
-            }
-        },
-        {
-            "path": "pages/shengchanbuliao/MateReplenishOutBill",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇琛ユ枡",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/shengchanbuliao/MateReplenishOutBill",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇琛ユ枡鍗�"
-            }
-        },
-        {
-            "path": "pages/qitaruku_v2/OtherInBillList",
-            "style": {
-                "navigationBarTitleText": "鍏朵粬鍏ュ簱",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/qitaruku_v2/OtherInBill",
-            "style": {
-                "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
-            }
-        },
-        {
-            "path": "pages/tiaomaguanli/table_son",
-            "style": {
-                "navigationBarTitleText": "鏉$爜鐢熸垚"
-            }
-        },
-        {
-            "path": "pages/tiaomaguanli/table",
-            "style": {
-                "navigationBarTitleText": "鏉$爜绠$悊"
-            }
-        }, {
-            "path": "pages/weiwairuku/EntrustInBillList",
-            "style": {
-                "navigationBarTitleText": "濮斿鍏ュ簱",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/weiwairuku/EntrustInBill",
-            "style": {
-                "navigationBarTitleText": "濮斿鍏ュ簱鍗�"
-            }
-        },
-        {
-            "path": "pages/zhijiediaobo/MoveStockBillList",
-            "style": {
-                "navigationBarTitleText": "鐩存帴璋冩嫧",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/zhijiediaobo/MoveStockBill",
-            "style": {
-                "navigationBarTitleText": "鐩存帴璋冩嫧鍗�"
-            }
-        },
-        {
-            "path": "pages/xiugaimima/index",
-            "style": {
-                "navigationBarTitleText": "淇敼瀵嗙爜"
-            }
-        },
-        {
-            "path": "pages/tiaomaguanli/table",
-            "style": {
-                "navigationBarTitleText": "鏉$爜绠$悊"
-            }
-        }, {
-            "path": "pages/weiwairuku/EntrustInBillList",
-            "style": {
-                "navigationBarTitleText": "濮斿鍏ュ簱",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/quyangdan/TakeSampleCheckBillList",
-            "style": {
-                "navigationBarTitleText": "鍙栨牱鍗�"
-            }
-        },
-        {
-            "path": "pages/quyangdan/TakeSampleCheckBill",
-            "style": {
-                "navigationBarTitleText": "鍙栨牱鍗�"
-            }
-        },
-        {
-            "path": "pages/huanyangdan/BackSampleCheckBillList",
-            "style": {
-                "navigationBarTitleText": "杩樻牱鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/huanyangdan/BackSampleCheckBill",
-            "style": {
-                "navigationBarTitleText": "杩樻牱鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/InnerHtmlPage/index",
-            "style": {
-                "navigationBarTitleText": ""
-            }
-        },
-        {
-            "path": "pages/white/white",
-            "style": {
-                "navigationBarTitleText": ""
-            }
-        },
-        {
-            "path": "pages/zutuosaoma/PackUnionBill",
-            "style": {
-                "navigationBarTitleText": "缁勬墭鎵爜"
-            }
-        },
-        {
-            "path": "pages/zutuosaoma/PackUnionBillList",
-            "style": {
-                "navigationBarTitleText": "缁勬墭鎵爜缂撳瓨"
-            }
-        },
-        {
-            "path": "pages/chaituosaoma/UnPackUnionBill",
-            "style": {
-                "navigationBarTitleText": "鎷嗘墭鎵爜"
-            }
-        },
-        {
-            "path": "pages/shengchantuiliao/MateOutBackBillList",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇閫�鏂�"
-            }
-        },
-        {
-            "path": "pages/shengchantuiliao/MateOutBackBill",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇閫�鏂欏崟"
-            }
-        },
-        {
-            "path": "pages/ZLGL/shoujianjianyan/firstCheckBillList",
-            "style": {
-                "navigationBarTitleText": "棣栦欢妫�楠屽崟缁存姢"
-            }
-        },
-        {
-            "path": "pages/ZLGL/shoujianjianyan/firstCheckBill",
-            "style": {
-                "navigationBarTitleText": "棣栦欢妫�楠屽崟"
-            }
-        },
-        {
-            "path": "pages/shoujishouming/table",
-            "style": {
-                "navigationBarTitleText": "鎵嬫満瀵垮懡鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/shoujishouming/form",
-            "style": {
-                "navigationBarTitleText": "鎵嬫満瀵垮懡鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
-            "style": {
-                "navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
-            "style": {
-                "navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
-            "style": {
-                "navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
-            "style": {
-                "navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBill",
-            "style": {
-                "navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/fenbushidiaorudan/form_test",
-            "style": {
-                "navigationBarTitleText": "鍒嗘璋冨叆鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/fenbushidiaorudan/table",
-            "style": {
-                "navigationBarTitleText": "鍒嗘璋冨叆鍗曠紦瀛�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/fenbushidiaochudan/form_out",
-            "style": {
-                "navigationBarTitleText": "鍒嗘璋冨嚭鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/ZLGL/shoujianjianyan/firstCheckBillList",
-            "style": {
-                "navigationBarTitleText": "棣栦欢妫�楠屽崟缁存姢"
-            }
-        },
-        {
-            "path": "pages/ZLGL/shoujianjianyan/firstCheckBill",
-            "style": {
-                "navigationBarTitleText": "棣栦欢妫�楠屽崟"
-            }
-        },
-        {
-            "path": "pages/shoujishouming/table",
-            "style": {
-                "navigationBarTitleText": "妯″叿瀵垮懡璋冩暣鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/shoujishouming/form",
-            "style": {
-                "navigationBarTitleText": "妯″叿瀵垮懡璋冩暣鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
-            "style": {
-                "navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�"
-            }
-        },
-        {
-            "path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
-            "style": {
-                "navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
-            "style": {
-                "navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill",
-            "style": {
-                "navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟"
-            }
-        },
-        {
-            "path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
-            "style": {
-                "navigationBarTitleText": "妯″叿璋冩嫧鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBill",
-            "style": {
-                "navigationBarTitleText": "妯″叿璋冩嫧鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/fenbushidiaorudan/form_test",
-            "style": {
-                "navigationBarTitleText": "鍒嗘璋冨叆鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/fenbushidiaorudan/table",
-            "style": {
-                "navigationBarTitleText": "鍒嗘璋冨叆鍗曠紦瀛�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/fenbushidiaochudan/form_out",
-            "style": {
-                "navigationBarTitleText": "鍒嗘璋冨嚭鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/weixiujilu/mouldRepairRecordBillList",
-            "style": {
-                "navigationBarTitleText": "妯″叿缁翠慨璁板綍",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/weixiujilu/mouldRepairRecordBill",
-            "style": {
-                "navigationBarTitleText": "妯″叿缁翠慨璁板綍鍗�"
-            }
-        },
-        {
-            "path": "pages/qijvguzhangdengji/mouldMistake",
-            "style": {
-                "navigationBarTitleText": "妯″叿鏁呴殰鐧昏"
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "棣栭〉",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/index/tab1",
+			"style": {
+				"navigationBarTitleText": "杞﹂棿宸ュ簭"
+			}
+		},
+		{
+			"path": "pages/index/tab2",
+			"style": {
+				"navigationBarTitleText": "鍗曟嵁鍒楄〃"
+			}
+		},
+		{
+			"path": "pages/index/tab3",
+			"style": {
+				"navigationBarTitleText": "鍣ㄥ叿绠$悊"
+			}
+		},
+		{
+			"path": "pages/index/tab4",
+			"style": {
+				"navigationBarTitleText": "璐ㄩ噺绠$悊"
+			}
+		},
+		{
+			"path": "pages/index/mine",
+			"style": {
+				"navigationBarTitleText": "涓汉涓績",
+				// "navigationStyle": "custom"
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#65a2fb"
+			}
+		},
+		{
+			"path": "pages/shebeilvli/deviceStatueAnalysis",
+			"style": {
+				"navigationBarTitleText": "璁惧鐘舵�佸垎鏋�"
+			}
+		},
+		{
+			"path": "pages/shebeilvli/EquipFileBillResume",
+			"style": {
+				"navigationBarTitleText": "璁惧灞ュ巻",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shebeilvli/EquipFileBillResume_son",
+			"style": {
+				"navigationBarTitleText": "璁惧灞ュ巻瀛愯〃"
+			}
+		},
+		{
+			"path": "pages/baoyangjihua/Sb_EquipMaintainPlanEdit",
+			"style": {
+				"navigationBarTitleText": "璁惧淇濆吇璁″垝鍗�"
+			}
+		},
+		{
+			"path": "pages/baoyangjihua/Sb_EquipMaintainPlanList",
+			"style": {
+				"navigationBarTitleText": "璁惧淇濆吇璁″垝鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/baoyangjihua/Sb_EquipMaintainPlanList_son",
+			"style": {
+				"navigationBarTitleText": "淇濆吇璁″垝瀛愯〃"
+			}
+		},
+		{
+			"path": "pages/baoyangjilu/Sb_EquipMaintainRuleEdit",
+			"style": {
+				"navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�"
+			}
+		},
+		{
+			"path": "pages/baoyangjilu/Sb_EquipMaintainRuleList",
+			"style": {
+				"navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/baoyangjilu/Sb_EquipMaintainRuleList_son",
+			"style": {
+				"navigationBarTitleText": "淇濆吇璁板綍瀛愯〃"
+			}
+		},
+		{
+			"path": "pages/guzhangdengji/EqpConkBookBill",
+			"style": {
+				"navigationBarTitleText": "璁惧鏁呴殰鐧昏琛�"
+			}
+		},
+		{
+			"path": "pages/guzhangdengji/EqpConkBookBillList",
+			"style": {
+				"navigationBarTitleText": "璁惧鏁呴殰鐧昏琛�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shebeidangan/Gy_EquipFileMainBill",
+			"style": {
+				"navigationBarTitleText": "璁惧妗f"
+			}
+		},
+		{
+			"path": "pages/shebeidangan/Gy_EquipFileMainBillList",
+			"style": {
+				"navigationBarTitleText": "璁惧妗f",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shebeiweixiu/Sb_Add_EqpMaintenanceBillList",
+			"style": {
+				"navigationBarTitleText": "璁惧缁翠慨璁板綍鍗�"
+			}
+		},
+		{
+			"path": "pages/shebeiweixiu/SbEqpMaintenanceBillList",
+			"style": {
+				"navigationBarTitleText": "璁惧缁翠慨璁板綍鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/weiwaigxOut/firstCheck",
+			"style": {
+				"navigationBarTitleText": "棣栦欢妫�楠屽崟",
+				"enablePullDownRefresh": true
+			}
+		}, {
+			"path": "pages/gongxuIn/Cj_StationInBill",
+			"style": {
+				"navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�"
+			}
+		},
+		{
+			"path": "pages/gongxuIn/Cj_StationInBillList",
+			"style": {
+				"navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�",
+				"enablePullDownRefresh": true
+			}
+		}, {
+			"path": "pages/gongxuOut/Cj_StationOutBill",
+			"style": {
+				"navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�"
+			}
+		},
+		{
+			"path": "pages/gongxuOut/Cj_StationOutBillList",
+			"style": {
+				"navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/gongxuOutSendWork/gongxuOutSendWorkBill",
+			"style": {
+				"navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�(娲惧伐)",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/gongxuOut/moneystatistics",
+			"style": {
+				"navigationBarTitleText": "鎴戠殑宸ヨ祫(姹囨姤棰勪及)",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shebeiguanli/deviceManage",
+			"style": {
+				"navigationBarTitleText": "璁惧绠$悊",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shebeiguanli/deviceManageList",
+			"style": {
+				"navigationBarTitleText": "璁惧绠$悊",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shebeiguanli/ticketList",
+			"style": {
+				"navigationBarTitleText": "宸ュ崟鍒楄〃",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/baogong/ProductReportStepBillList",
+			"style": {
+				"navigationBarTitleText": "浜ч噺姹囨姤鍗�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/baogong/IpadIndex",
+			"style": {
+				"navigationBarTitleText": "鎶ュ伐骞冲彴",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/baogong/DayPlanBillList",
+			"style": {
+				"navigationBarTitleText": "宸ュ崟鍒楄〃",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/baogong/abnormal",
+			"style": {
+				"navigationBarTitleText": "寮傚父鍙嶉鍗�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBillList",
+			"style": {
+				"navigationBarTitleText": "寮傚父鍙嶉鍗曞垪琛�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill",
+			"style": {
+				"navigationBarTitleText": "寮傚父鍙嶉鍗�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBillList",
+			"style": {
+				"navigationBarTitleText": "寮傚父鍙嶉鎺ユ敹鍗曞垪琛�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill",
+			"style": {
+				"navigationBarTitleText": "寮傚父鍙嶉鎺ユ敹鍗�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBillList",
+			"style": {
+				"navigationBarTitleText": "寮傚父鍙嶉绛惧埌鍗曞垪琛�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill",
+			"style": {
+				"navigationBarTitleText": "寮傚父鍙嶉绛惧埌鍗�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBillList",
+			"style": {
+				"navigationBarTitleText": "寮傚父鍙嶉澶勭悊鍗曞垪琛�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill",
+			"style": {
+				"navigationBarTitleText": "寮傚父鍙嶉澶勭悊鍗�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBillList",
+			"style": {
+				"navigationBarTitleText": "寮傚父鍙嶉楠屾敹鍗曞垪琛�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill",
+			"style": {
+				"navigationBarTitleText": "寮傚父鍙嶉楠屾敹鍗�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList",
+			"style": {
+				"navigationBarTitleText": "寮傚父鍙嶉寰呭鐞嗗垪琛�",
+				"enablePullDownRefresh": false
+			}
+		},
 
-            }
-        },
-        {
-            "path": "pages/qijvguzhangdengji/mouldMistakeBill",
-            "style": {
-                "navigationBarTitleText": "妯″叿鏁呴殰鐧昏鍗�"
-            }
-        },
-        {
-            "path": "pages/chaixiang/form",
-            "style": {
-                "navigationBarTitleText": "鎷嗙"
-            }
-        },
-        {
-            "path": "pages/zhuangxiang/form_mix",
-            "style": {
-                "navigationBarTitleText": "瑁呯"
-            }
-        },
-        {
-            "path": "pages/zutuo_xiaowei/form_xiaowei",
-            "style": {
-                "navigationBarTitleText": "缁勬墭-灏忓崼"
-            }
-        },
-        {
-            "path": "pages/zhuangxiangdan/table",
-            "style": {
-                "navigationBarTitleText": "瑁呯鍗曠紦瀛�"
-            }
-        },
-        {
-            "path": "pages/zhuangxiangdan/form",
-            "style": {
-                "navigationBarTitleText": "瑁呯鍗�"
-            }
-        },
-        {
-            "path": "pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
-            "style": {
-                "navigationBarTitleText": "宸℃鍗曠紦瀛�"
-            }
-        },
-        {
-            "path": "pages/ZLGL/xunjianjianyan/PatrolProcCheckBill",
-            "style": {
-                "navigationBarTitleText": "宸℃鍗�"
-            }
-        },
-        {
-            "path": "pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
-            "style": {
-                "navigationBarTitleText": "鏈欢妫�楠屽崟缁存姢"
-            }
-        },
-        {
-            "path": "pages/ZLGL/lailiaojianyan/POStockInCheckBill",
-            "style": {
-                "navigationBarTitleText": "鏉ユ枡妫�楠屽崟"
-            }
-        },
-        {
-            "path": "pages/ZLGL/lailiaojianyan/POStockInCheckBillList",
-            "style": {
-                "navigationBarTitleText": "鏉ユ枡妫�楠屽崟缁存姢"
-            }
-        },
-        {
-            "path": "pages/ZLGL/mojianjianyan/lastPieceCheckBill",
-            "style": {
-                "navigationBarTitleText": "鏈欢妫�楠屽崟"
-            }
-        },
-        {
-            "path": "pages/chaituosaoma-xiaowei/UnpackPallet",
-            "style": {
-                "navigationBarTitleText": "鎷嗘墭鎵爜锛堝皬鍗級"
-            }
-        },
-        {
-            "path": "pages/sanmaheyi/BarCodeCheck",
-            "style": {
-                "navigationBarTitleText": "涓夌爜鍚堜竴"
-            }
-        },
 		{
-		    "path": "pages/simaheyi/BarCodeCheck_SN",
-		    "style": {
-		        "navigationBarTitleText": "鍥涚爜鍚堜竴"
-		    }
-		},
-        {
-            "path": "pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2",
-            "style": {
-                "navigationBarTitleText": "鐢熶骇鍏ュ簱鏍¢獙"
-            }
-        },
-        {
-            "path": "pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill",
-            "style": {
-                "navigationBarTitleText": "鍑哄巶鏍¢獙"
-            }
-        },
-        {
-            "path": "pages/weiwaigxIn/Cj_StationEntrustInBill",
-            "style": {
-                "navigationBarTitleText": "宸ュ簭濮斿鍙戝嚭鍗�"
-            }
-        },
-        {
-            "path": "pages/weiwaigxIn/Cj_StationEntrustInBillList",
-            "style": {
-                "navigationBarTitleText": "宸ュ簭濮斿鍙戝嚭鍗曠紦瀛�"
-            }
-        },
-        {
-            "path": "pages/weiwaigxOut/Cj_StationEntrustOutBill",
-            "style": {
-                "navigationBarTitleText": "宸ュ簭濮斿鎺ユ敹鍗�"
-            }
-        },
-        {
-            "path": "pages/weiwaigxOut/Cj_StationEntrustOutBillList",
-            "style": {
-                "navigationBarTitleText": "宸ュ簭濮斿鎺ユ敹鍗曠紦瀛�"
-            }
-        },
-        {
-            "path": "pages/jishikucunchaxun/table",
-            "style": {
-                "navigationBarTitleText": "鍗虫椂搴撳瓨鏌ヨ"
-            }
-        },
-        {
-            "path" : "pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast",
-            "style" : 
-            {
-                "navigationBarTitleText" : "鏉ユ枡妫�楠屽崟"
-            }
-        },
-        {
-            "path" : "pages/ZLGL/checkFlowList/QC_CheckBillflowList",
-            "style" : 
-            {
-                "navigationBarTitleText" : "寰呮垜瀹℃牳",
+			"path": "pages/caigouruku/POStockInBillList",
+			"style": {
+				"navigationBarTitleText": "閲囪喘鍏ュ簱鍒楄〃",
 				"enablePullDownRefresh": true
-            }
-        },
+			}
+		},
 		{
-		    "path" : "pages/ZLGL/checkFlowList/QC_CheckedBillflowList",
-		    "style" : 
-		    {
-		        "navigationBarTitleText" : "宸插鏍�",
-				"enablePullDownRefresh": true
-		    }
+			"path": "pages/caigouruku/POStockInBill",
+			"style": {
+				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗�",
+				"enablePullDownRefresh": false
+			}
 		},
-        {
-            "path" : "pages/MJGL/Gy_MouldFile/Gy_MouldFileList",
-            "style" : 
-            {
-                "navigationBarTitleText" : "妯″叿妗f鏌ヨ",
+		{
+			"path": "pages/caigoutuiliao/POStockInBackBillList",
+			"style": {
+				"navigationBarTitleText": "閲囪喘閫�鏂欏垪琛�",
 				"enablePullDownRefresh": true
             }
         },
@@ -1371,111 +344,1263 @@
 				"pageOrientation": "auto"
 				
             }
+		},
+		{
+			"path": "pages/caigoutuiliao/POStockInBackBill",
+			"style": {
+				"navigationBarTitleText": "閲囪喘閫�鏂欏崟",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/xiaoshouchuku/SellOutBillList",
+			"style": {
+				"navigationBarTitleText": "閿�鍞嚭搴撳垪琛�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/xiaoshouchuku/SellOutBill",
+			"style": {
+				"navigationBarTitleText": "閿�鍞嚭搴撳崟",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/xiaoshoutuihuo/ICStockBillMainList",
+			"style": {
+				"navigationBarTitleText": "閿�鍞��璐у垪琛�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/xiaoshoutuihuo/ICStockBillMain",
+			"style": {
+				"navigationBarTitleText": "閿�鍞��璐у崟",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/shouliaotongzhi/table",
+			"style": {
+				"navigationBarTitleText": "鏀舵枡閫氱煡鍗�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/shouliaotongzhi/table_son",
+			"style": {
+				"navigationBarTitleText": "鏉$爜鐢熸垚",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/shengchanlingliao/PPickingCheckBillList",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇棰嗘枡鏍¢獙鍒楄〃",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shengchanlingliao/PPickingCheckBill",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇棰嗘枡鍗曟牎楠�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/shengchanruku/ProductInCheckBillList",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇鍏ュ簱鏍¢獙鍒楄〃",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shengchanruku/ProductInCheckBill",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇鍏ュ簱鍗曟牎楠�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/shengchandiaobo/MoveStockBillList",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇璋冩嫧鏍¢獙鍒楄〃",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shengchandiaobo/MoveStockBill",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇璋冩嫧鍗曟牎楠�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/labelPrinter/index",
+			"style": {
+				"navigationBarTitleText": "鏍囩鎵撳嵃"
+			}
+		},
+		{
+			"path": "pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai",
+			"style": {
+				"navigationBarTitleText": "璁惧杩愯鐘舵��",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shebeiyunxingzhuangtai/detail",
+			"style": {
+				"navigationBarTitleText": "璁惧杩愯鐘舵�佽鎯�"
+			}
+		},
+		{
+			"path": "pages/mujvzhuangtai/mujvzhuangtai",
+			"style": {
+				"navigationBarTitleText": "妯″叿鐘舵�佸垎甯�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/mujvzhuangtai/detail",
+			"style": {
+				"navigationBarTitleText": "妯″叿鐘舵�佽鎯�"
+			}
+		},
+		{
+			"path": "pages/tiaomachaima/tiaomachaima",
+			"style": {
+				"navigationBarTitleText": "鏉$爜鎷嗙爜"
+			}
+		},
+		{
+			"path": "pages/tiaomachaima/tiaomachaima2",
+			"style": {
+				"navigationBarTitleText": "鏉$爜鎷嗙爜2"
+			}
+		},
+		{
+			"path": "pages/wuliaosaoma/wuliaosaoma",
+			"style": {
+				"navigationBarTitleText": "鐗╂枡娓呭崟"
+			}
+		},
+		{
+			"path": "pages/wuliaosaoma/detail",
+			"style": {
+				"navigationBarTitleText": "鏉$爜妗f"
+			}
+		},
+		{
+			"path": "pages/caigouruku/POStockInBillList",
+			"style": {
+				"navigationBarTitleText": "閲囪喘鍏ュ簱",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/caigouruku/POStockInBill",
+			"style": {
+				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗�"
+			}
+		},
+		{
+			"path": "pages/caigoutuiliao/POStockInBackBillList",
+			"style": {
+				"navigationBarTitleText": "閲囪喘閫�鏂�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/caigoutuiliao/POStockInBackBill",
+			"style": {
+				"navigationBarTitleText": "閲囪喘閫�鏂欏崟"
+			}
+		},
+		{
+			"path": "pages/xiaoshouchuku/SellOutBillList",
+			"style": {
+				"navigationBarTitleText": "閿�鍞嚭搴�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/xiaoshouchuku/SellOutBill",
+			"style": {
+				"navigationBarTitleText": "閿�鍞嚭搴撳崟"
+			}
+		},
+		{
+			"path": "pages/xiaoshoutuihuo/ICStockBillMainList",
+			"style": {
+				"navigationBarTitleText": "閿�鍞��璐�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/xiaoshoutuihuo/ICStockBillMain",
+			"style": {
+				"navigationBarTitleText": "閿�鍞��璐у崟"
+			}
+		},
+		{
+			"path": "pages/qitachuku/qitachuku",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍑哄簱",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/qitachuku/qitachukudan",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
+			}
+		},
+		{
+			"path": "pages/qitaruku/qitaruku",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍏ュ簱",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/qitaruku/qitarukudan",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
+			}
+		},
+		{
+			"path": "pages/tiaomadaying/tiaomadaying",
+			"style": {
+				"navigationBarTitleText": "閲囪喘鏉$爜鎵撳嵃"
+			}
+		},
+		{
+			"path": "pages/caigoudingdan/generate",
+			"style": {
+				"navigationBarTitleText": "鏉$爜鐢熸垚"
+			}
+		},
+		{
+			"path": "pages/caigoudingdan/caigoudingdan",
+			"style": {
+				"navigationBarTitleText": "閲囪喘璁㈠崟"
+			}
+		},
+		{
+			"path": "pages/MJGL/shangmudan/MouldUpperBillList",
+			"style": {
+				"navigationBarTitleText": "涓婃ā鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/MJGL/shangmudan/MouldUpperBill",
+			"style": {
+				"navigationBarTitleText": "涓婃ā鍗�"
+			}
+		},
+		{
+			"path": "pages/MJGL/xiamodan/MouldLowerBillList",
+			"style": {
+				"navigationBarTitleText": "涓嬫ā鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/MJGL/xiamodan/MouldLowerBill",
+			"style": {
+				"navigationBarTitleText": "涓嬫ā鍗�"
+			}
+		},
+		{
+			"path": "pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBillList",
+			"style": {
+				"navigationBarTitleText": "妯″叿鐐规璁板綍鍗曞垪琛�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill",
+			"style": {
+				"navigationBarTitleText": "妯″叿鐐规璁板綍鍗�"
+			}
+		},
+		{
+			"path": "pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckRuleBillList",
+			"style": {
+				"navigationBarTitleText": "妯″叿鐐规瑙勭▼"
+			}
+		},
+		{
+			"path": "pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBillList",
+			"style": {
+				"navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗曞垪琛�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill",
+			"style": {
+				"navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗�"
+			}
+		},
+		{
+			"path": "pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList",
+			"style": {
+				"navigationBarTitleText": "妯″叿淇濆吇瑙勭▼"
+			}
+		},
+		{
+			"path": "pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇琛ユ枡鍗曟牎楠�"
+			}
+		},
+		{
+			"path": "pages/qitachukujiaoyan/qitachukujiaoyan",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍑哄簱鏍¢獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/qitachukujiaoyan/qitachukujiaoyan",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍑哄簱鏍¢獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/qitachukujiaoyan/qitachukudanjiaoyan",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍑哄簱鍗曟牎楠�"
+			}
+		},
+		{
+			"path": "pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBillList",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇琛ユ枡鏍¢獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇琛ユ枡鍗曟牎楠�"
+			}
+		},
+		{
+			"path": "pages/xiaoshouchukujiaoyan/SellOutCheckBillList",
+			"style": {
+				"navigationBarTitleText": "閿�鍞嚭搴撴牎楠�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/xiaoshouchukujiaoyan/SellOutCheckBill",
+			"style": {
+				"navigationBarTitleText": "閿�鍞嚭搴撳崟鏍¢獙"
+			}
+		},
+		{
+			"path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBillList",
+			"style": {
+				"navigationBarTitleText": "濮斿棰嗘枡鏍¢獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBill",
+			"style": {
+				"navigationBarTitleText": "濮斿棰嗘枡鍗曟牎楠�"
+			}
+		},
+		{
+			"path": "pages/caigourukujiaoyan/POStockInCheckBillList",
+			"style": {
+				"navigationBarTitleText": "閲囪喘鍏ュ簱鏍¢獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/caigourukujiaoyan/POStockInCheckBill",
+			"style": {
+				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗曟牎楠�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/qitarukujiaoyan/Kf_OtherInBillCheckList",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍏ュ簱鏍¢獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/qitarukujiaoyan/Kf_OtherInBillCheck",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗曟牎楠�"
+			}
+		},
+		{
+			"path": "pages/weiwaibuliaojiaoyan/Kf_EntrustReplenishOutBill_CheckList",
+			"style": {
+				"navigationBarTitleText": "濮斿琛ユ枡鏍¢獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/weiwaibuliaojiaoyan/Kf_EntrustReplenishOutBill_Check",
+			"style": {
+				"navigationBarTitleText": "濮斿琛ユ枡鍗曟牎楠�"
+			}
+		},
+		{
+			"path": "pages/shengchanlingliaoshengdan/Kf_MateOutBillList",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇棰嗘枡",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shengchanlingliaoshengdan/Kf_MateOutBill",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇棰嗘枡鍗�"
+			}
+		},
+		{
+			"path": "pages/weiwailingliao/Kf_EntrustOutBillList",
+			"style": {
+				"navigationBarTitleText": "濮斿棰嗘枡",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/weiwailingliao/Kf_EntrustOutBill",
+			"style": {
+				"navigationBarTitleText": "濮斿棰嗘枡鍗�"
+			}
+		},
+		{
+			"path": "pages/shengchanrukushengdan/Kf_ProductInBillList",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇鍏ュ簱",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shengchanrukushengdan/Kf_ProductInBill",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇鍏ュ簱鍗�"
+			}
+		},
+		{
+			"path": "pages/xiaoshouchukujiaoyan/SellOutCheckBill",
+			"style": {
+				"navigationBarTitleText": "閿�鍞嚭搴撳崟鏍¢獙"
+			}
+		},
+		{
+			"path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBillList",
+			"style": {
+				"navigationBarTitleText": "濮斿棰嗘枡鏍¢獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/weiwailingliaojiaoyan/EntrustOutCheckBill",
+			"style": {
+				"navigationBarTitleText": "濮斿棰嗘枡鍗曟牎楠�"
+			}
+		},
+		{
+			"path": "pages/caigourukujiaoyan/POStockInCheckBillList",
+			"style": {
+				"navigationBarTitleText": "閲囪喘鍏ュ簱鏍¢獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/caigourukujiaoyan/POStockInCheckBill",
+			"style": {
+				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗曟牎楠�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/qitarukujiaoyan/Kf_OtherInBillCheckList",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍏ュ簱鏍¢獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/qitarukujiaoyan/Kf_OtherInBillCheck",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗曟牎楠�"
+			}
+		},
+		{
+			"path": "pages/weiwaibuliaojiaoyan/Kf_EntrustReplenishOutBill_CheckList",
+			"style": {
+				"navigationBarTitleText": "濮斿琛ユ枡鏍¢獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/weiwaibuliaojiaoyan/Kf_EntrustReplenishOutBill_Check",
+			"style": {
+				"navigationBarTitleText": "濮斿琛ユ枡鍗曟牎楠�"
+			}
+		},
+		{
+			"path": "pages/shengchanlingliaoshengdan/Kf_MateOutBillList",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇棰嗘枡",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shengchanlingliaoshengdan/Kf_MateOutBill",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇棰嗘枡鍗�"
+			}
+		},
+		{
+			"path": "pages/weiwailingliao/Kf_EntrustOutBillList",
+			"style": {
+				"navigationBarTitleText": "濮斿棰嗘枡",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/weiwailingliao/Kf_EntrustOutBill",
+			"style": {
+				"navigationBarTitleText": "濮斿棰嗘枡鍗�"
+			}
+		},
+		{
+			"path": "pages/shengchanrukushengdan/Kf_ProductInBillList",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇鍏ュ簱",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shengchanrukushengdan/Kf_ProductInBill",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇鍏ュ簱鍗�"
+			}
+		},
+		{
+			"path": "pages/shengchanbuliao/MateReplenishOutBillList",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇琛ユ枡",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shengchanbuliao/MateReplenishOutBill",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇琛ユ枡鍗�"
+			}
+		},
+		{
+			"path": "pages/qitaruku_v2/OtherInBillList",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍏ュ簱",
+				"enablePullDownRefresh": true
+			}
+		}, {
+			"path": "pages/qitaruku_v2/OtherInBill",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
+			}
+		},
+		{
+			"path": "pages/qitachuku_v2/OtherOutBillList",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍑哄簱",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/qitachuku_v2/OtherOutBill",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
+			}
+		},
+		{
+			"path": "pages/shengchanbuliao/MateReplenishOutBill",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇琛ユ枡",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shengchanbuliao/MateReplenishOutBill",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇琛ユ枡鍗�"
+			}
+		},
+		{
+			"path": "pages/qitaruku_v2/OtherInBillList",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍏ュ簱",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/qitaruku_v2/OtherInBill",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
+			}
+		},
+		{
+			"path": "pages/tiaomaguanli/table_son",
+			"style": {
+				"navigationBarTitleText": "鏉$爜鐢熸垚"
+			}
+		},
+		{
+			"path": "pages/tiaomaguanli/table",
+			"style": {
+				"navigationBarTitleText": "鏉$爜绠$悊"
+			}
+		}, {
+			"path": "pages/weiwairuku/EntrustInBillList",
+			"style": {
+				"navigationBarTitleText": "濮斿鍏ュ簱",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/weiwairuku/EntrustInBill",
+			"style": {
+				"navigationBarTitleText": "濮斿鍏ュ簱鍗�"
+			}
+		},
+		{
+			"path": "pages/zhijiediaobo/MoveStockBillList",
+			"style": {
+				"navigationBarTitleText": "鐩存帴璋冩嫧",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/zhijiediaobo/MoveStockBill",
+			"style": {
+				"navigationBarTitleText": "鐩存帴璋冩嫧鍗�"
+			}
+		},
+		{
+			"path": "pages/xiugaimima/index",
+			"style": {
+				"navigationBarTitleText": "淇敼瀵嗙爜"
+			}
+		},
+		{
+			"path": "pages/tiaomaguanli/table",
+			"style": {
+				"navigationBarTitleText": "鏉$爜绠$悊"
+			}
+		}, {
+			"path": "pages/weiwairuku/EntrustInBillList",
+			"style": {
+				"navigationBarTitleText": "濮斿鍏ュ簱",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/quyangdan/TakeSampleCheckBillList",
+			"style": {
+				"navigationBarTitleText": "鍙栨牱鍗�"
+			}
+		},
+		{
+			"path": "pages/quyangdan/TakeSampleCheckBill",
+			"style": {
+				"navigationBarTitleText": "鍙栨牱鍗�"
+			}
+		},
+		{
+			"path": "pages/huanyangdan/BackSampleCheckBillList",
+			"style": {
+				"navigationBarTitleText": "杩樻牱鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/huanyangdan/BackSampleCheckBill",
+			"style": {
+				"navigationBarTitleText": "杩樻牱鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/InnerHtmlPage/index",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/white/white",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/zutuosaoma/PackUnionBill",
+			"style": {
+				"navigationBarTitleText": "缁勬墭鎵爜"
+			}
+		},
+		{
+			"path": "pages/zutuosaoma/PackUnionBillList",
+			"style": {
+				"navigationBarTitleText": "缁勬墭鎵爜缂撳瓨"
+			}
+		},
+		{
+			"path": "pages/chaituosaoma/UnPackUnionBill",
+			"style": {
+				"navigationBarTitleText": "鎷嗘墭鎵爜"
+			}
+		},
+		{
+			"path": "pages/shengchantuiliao/MateOutBackBillList",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇閫�鏂�"
+			}
+		},
+		{
+			"path": "pages/shengchantuiliao/MateOutBackBill",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇閫�鏂欏崟"
+			}
+		},
+		{
+			"path": "pages/ZLGL/shoujianjianyan/firstCheckBillList",
+			"style": {
+				"navigationBarTitleText": "棣栦欢妫�楠屽崟缁存姢"
+			}
+		},
+		{
+			"path": "pages/ZLGL/shoujianjianyan/firstCheckBill",
+			"style": {
+				"navigationBarTitleText": "棣栦欢妫�楠屽崟"
+			}
+		},
+		{
+			"path": "pages/shoujishouming/table",
+			"style": {
+				"navigationBarTitleText": "鎵嬫満瀵垮懡鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shoujishouming/form",
+			"style": {
+				"navigationBarTitleText": "鎵嬫満瀵垮懡鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
+			"style": {
+				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
+			"style": {
+				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
+			"style": {
+				"navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
+			"style": {
+				"navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBill",
+			"style": {
+				"navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/fenbushidiaorudan/form_test",
+			"style": {
+				"navigationBarTitleText": "鍒嗘璋冨叆鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/fenbushidiaorudan/table",
+			"style": {
+				"navigationBarTitleText": "鍒嗘璋冨叆鍗曠紦瀛�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/fenbushidiaochudan/form_out",
+			"style": {
+				"navigationBarTitleText": "鍒嗘璋冨嚭鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/ZLGL/shoujianjianyan/firstCheckBillList",
+			"style": {
+				"navigationBarTitleText": "棣栦欢妫�楠屽崟缁存姢"
+			}
+		},
+		{
+			"path": "pages/ZLGL/shoujianjianyan/firstCheckBill",
+			"style": {
+				"navigationBarTitleText": "棣栦欢妫�楠屽崟"
+			}
+		},
+		{
+			"path": "pages/shoujishouming/table",
+			"style": {
+				"navigationBarTitleText": "妯″叿瀵垮懡璋冩暣鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shoujishouming/form",
+			"style": {
+				"navigationBarTitleText": "妯″叿瀵垮懡璋冩暣鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
+			"style": {
+				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�"
+			}
+		},
+		{
+			"path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
+			"style": {
+				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
+			"style": {
+				"navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill",
+			"style": {
+				"navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟"
+			}
+		},
+		{
+			"path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
+			"style": {
+				"navigationBarTitleText": "妯″叿璋冩嫧鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBill",
+			"style": {
+				"navigationBarTitleText": "妯″叿璋冩嫧鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/fenbushidiaorudan/form_test",
+			"style": {
+				"navigationBarTitleText": "鍒嗘璋冨叆鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/fenbushidiaorudan/table",
+			"style": {
+				"navigationBarTitleText": "鍒嗘璋冨叆鍗曠紦瀛�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/fenbushidiaochudan/form_out",
+			"style": {
+				"navigationBarTitleText": "鍒嗘璋冨嚭鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/weixiujilu/mouldRepairRecordBillList",
+			"style": {
+				"navigationBarTitleText": "妯″叿缁翠慨璁板綍",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/weixiujilu/mouldRepairRecordBill",
+			"style": {
+				"navigationBarTitleText": "妯″叿缁翠慨璁板綍鍗�"
+			}
+		},
+		{
+			"path": "pages/qijvguzhangdengji/mouldMistake",
+			"style": {
+				"navigationBarTitleText": "妯″叿鏁呴殰鐧昏"
+
+			}
+		},
+		{
+			"path": "pages/qijvguzhangdengji/mouldMistakeBill",
+			"style": {
+				"navigationBarTitleText": "妯″叿鏁呴殰鐧昏鍗�"
+			}
+		},
+		{
+			"path": "pages/chaixiang/form",
+			"style": {
+				"navigationBarTitleText": "鎷嗙"
+			}
+		},
+		{
+			"path": "pages/zhuangxiang/form_mix",
+			"style": {
+				"navigationBarTitleText": "瑁呯"
+			}
+		},
+		{
+			"path": "pages/zutuo_xiaowei/form_xiaowei",
+			"style": {
+				"navigationBarTitleText": "缁勬墭-灏忓崼"
+			}
+		},
+		{
+			"path": "pages/zhuangxiangdan/table",
+			"style": {
+				"navigationBarTitleText": "瑁呯鍗曠紦瀛�"
+			}
+		},
+		{
+			"path": "pages/zhuangxiangdan/form",
+			"style": {
+				"navigationBarTitleText": "瑁呯鍗�"
+			}
+		},
+		{
+			"path": "pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
+			"style": {
+				"navigationBarTitleText": "宸℃鍗曠紦瀛�"
+			}
+		},
+		{
+			"path": "pages/ZLGL/xunjianjianyan/PatrolProcCheckBill",
+			"style": {
+				"navigationBarTitleText": "宸℃鍗�"
+			}
+		},
+		{
+			"path": "pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
+			"style": {
+				"navigationBarTitleText": "鏈欢妫�楠屽崟缁存姢"
+			}
+		},
+		{
+			"path": "pages/ZLGL/lailiaojianyan/POStockInCheckBill",
+			"style": {
+				"navigationBarTitleText": "鏉ユ枡妫�楠屽崟"
+			}
+		},
+		{
+			"path": "pages/ZLGL/lailiaojianyan/POStockInCheckBillList",
+			"style": {
+				"navigationBarTitleText": "鏉ユ枡妫�楠屽崟缁存姢"
+			}
+		},
+		{
+			"path": "pages/ZLGL/mojianjianyan/lastPieceCheckBill",
+			"style": {
+				"navigationBarTitleText": "鏈欢妫�楠屽崟"
+			}
+		},
+		{
+			"path": "pages/chaituosaoma-xiaowei/UnpackPallet",
+			"style": {
+				"navigationBarTitleText": "鎷嗘墭鎵爜锛堝皬鍗級"
+			}
+		},
+		{
+			"path": "pages/sanmaheyi/BarCodeCheck",
+			"style": {
+				"navigationBarTitleText": "涓夌爜鍚堜竴"
+			}
+		},
+		{
+			"path": "pages/simaheyi/BarCodeCheck_SN",
+			"style": {
+				"navigationBarTitleText": "鍥涚爜鍚堜竴"
+			}
+		},
+		{
+			"path": "pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇鍏ュ簱鏍¢獙"
+			}
+		},
+		{
+			"path": "pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill",
+			"style": {
+				"navigationBarTitleText": "鍑哄巶鏍¢獙"
+			}
+		},
+		{
+			"path": "pages/weiwaigxIn/Cj_StationEntrustInBill",
+			"style": {
+				"navigationBarTitleText": "宸ュ簭濮斿鍙戝嚭鍗�"
+			}
+		},
+		{
+			"path": "pages/weiwaigxIn/Cj_StationEntrustInBillList",
+			"style": {
+				"navigationBarTitleText": "宸ュ簭濮斿鍙戝嚭鍗曠紦瀛�"
+			}
+		},
+		{
+			"path": "pages/weiwaigxOut/Cj_StationEntrustOutBill",
+			"style": {
+				"navigationBarTitleText": "宸ュ簭濮斿鎺ユ敹鍗�"
+			}
+		},
+		{
+			"path": "pages/weiwaigxOut/Cj_StationEntrustOutBillList",
+			"style": {
+				"navigationBarTitleText": "宸ュ簭濮斿鎺ユ敹鍗曠紦瀛�"
+			}
+		},
+		{
+			"path": "pages/jishikucunchaxun/table",
+			"style": {
+				"navigationBarTitleText": "鍗虫椂搴撳瓨鏌ヨ"
+			}
+		},
+		{
+			"path": "pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast",
+			"style": {
+				"navigationBarTitleText": "鏉ユ枡妫�楠屽崟"
+			}
+		},
+		{
+			"path": "pages/ZLGL/checkFlowList/QC_CheckBillflowList",
+			"style": {
+				"navigationBarTitleText": "寰呮垜瀹℃牳",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/ZLGL/checkFlowList/QC_CheckedBillflowList",
+			"style": {
+				"navigationBarTitleText": "宸插鏍�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/MJGL/Gy_MouldFile/Gy_MouldFileList",
+			"style": {
+				"navigationBarTitleText": "妯″叿妗f鏌ヨ",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/ZLGL/QualityReportStep/QualityReportStepBill",
+			"style": {
+				"navigationBarTitleText": "鍏ㄦ妫�楠屽崟(涓嶈壇姹囨姤)",
+				"pageOrientation": "auto" // 鏀寔妯睆
+			}
+		},
+		{
+			"path": "pages/ZLGL/QualityReportStep/QualityReportStepBillList",
+			"style": {
+				"navigationBarTitleText": "鍏ㄦ妫�楠屽崟(涓嶈壇姹囨姤)鏌ヨ"
+			}
+		},
+		{
+			"path": "pages/MJGL/MouldScrapOutBill/MouldScrapOutBillList",
+			"style": {
+				"navigationBarTitleText": "妯″叿鎶ュ簾鍑哄簱鍗曞垪琛�"
+			}
+		},
+		{
+			"path": "pages/MJGL/MouldScrapOutBill/MouldScrapOutBill",
+			"style": {
+				"navigationBarTitleText": "妯″叿鎶ュ簾鍑哄簱鍗�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBill",
+			"style": {
+				"navigationBarTitleText": "杞﹂棿鑷鍗�"
+			}
+		},
+		{
+			"path": "pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBillList",
+			"style": {
+				"navigationBarTitleText": "杞﹂棿鑷鍗曞垪琛�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/ZLGL/zaikujianyandan/InStockCheckBill",
+			"style": {
+				"navigationBarTitleText": "鍦ㄥ簱妫�楠屽崟"
+			}
+		},
+		{
+			"path": "pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill",
+			"style": {
+				"navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�"
+			}
+		},
+		{
+			"path": "pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill",
+			"style": {
+				"navigationBarTitleText": "璁惧鐐规璁板綍鍗�"
+			}
+		},
+		{
+			"path": "pages/ZLGL/zaikujianyandan/InStockCheckBillList",
+			"style": {
+				"navigationBarTitleText": "鍦ㄥ簱妫�楠屽崟鍒楄〃"
+			}
+		},
+		{
+			"path": "pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList",
+			"style": {
+				"navigationBarTitleText": "璁惧鐐规璁板綍鍗曠紦瀛�"
+			}
+		},
+		{
+			"path": "pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList",
+			"style": {
+				"navigationBarTitleText": "璁惧淇濆吇璁板綍鍗曠紦瀛�"
+			}
+		},
+		{
+			"path": "pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill",
+			"style": {
+				"navigationBarTitleText": "璁惧缁翠慨楠屾敹鍗�"
+			}
+		},
+		{
+			"path": "pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList",
+			"style": {
+				"navigationBarTitleText": "璁惧缁翠慨楠屾敹鍗曠紦瀛�"
+			}
         },
         {
-            "path" : "pages/ZLGL/QualityReportStep/QualityReportStepBillList",
+            "path" : "pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill",
             "style" : 
             {
-                "navigationBarTitleText" : "鍏ㄦ妫�楠屽崟(涓嶈壇姹囨姤)鏌ヨ"
+                "navigationBarTitleText" : "璁惧缁翠慨娲惧伐鍗�"
             }
         },
         {
-            "path": "pages/MJGL/MouldScrapOutBill/MouldScrapOutBillList",
-            "style": {
-                "navigationBarTitleText": "妯″叿鎶ュ簾鍑哄簱鍗曞垪琛�"
-            }
-        },
-        {
-            "path": "pages/MJGL/MouldScrapOutBill/MouldScrapOutBill",
-            "style": {
-                "navigationBarTitleText": "妯″叿鎶ュ簾鍑哄簱鍗�",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBill",
-            "style": {
-                "navigationBarTitleText": "杞﹂棿鑷鍗�"                
-            }
-        },
-        {
-            "path": "pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBillList",
-            "style": {
-                "navigationBarTitleText": "杞﹂棿鑷鍗曞垪琛�",
-				"enablePullDownRefresh": true            
-            }
-        },
-        {
-            "path" : "pages/ZLGL/zaikujianyandan/InStockCheckBill",
+            "path" : "pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList",
             "style" : 
             {
-                "navigationBarTitleText" : "鍦ㄥ簱妫�楠屽崟"
+                "navigationBarTitleText" : "璁惧缁翠慨娲惧伐鍗曠紦瀛�"
             }
         },
         {
-            "path" : "pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill",
+            "path" : "pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill",
             "style" : 
             {
-                "navigationBarTitleText" : "璁惧淇濆吇璁板綍鍗�"
+                "navigationBarTitleText" : "鍣ㄥ叿缁翠慨娲惧伐鍗�"
             }
         },
         {
-            "path" : "pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill",
+            "path" : "pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBillList",
             "style" : 
             {
-                "navigationBarTitleText" : "璁惧鐐规璁板綍鍗�"
+                "navigationBarTitleText" : "鍣ㄥ叿缁翠慨娲惧伐鍗曠紦瀛�"
             }
         },
         {
-            "path" : "pages/ZLGL/zaikujianyandan/InStockCheckBillList",
+            "path" : "pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill",
             "style" : 
             {
-                "navigationBarTitleText" : "鍦ㄥ簱妫�楠屽崟鍒楄〃"
+                "navigationBarTitleText" : "鍣ㄥ叿缁翠慨楠屾敹鍗�"
             }
-        }
-        
-    ],
-    "tabBar": {
-        "color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-        "selectedColor": "#2d7dee", //tab 涓婄殑鏂囧瓧閫変腑鏃剁殑棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-        "borderStyle": "black", //tabbar涓婅竟妗嗙殑棰滆壊锛� 浠呮敮鎸� black / white
-        "backgroundColor": "#ffffff", //tab 鐨勮儗鏅壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-        "list": [{
-                "pagePath": "pages/index/index",
-                "iconPath": "static/tabBar/home.png",
-                "selectedIconPath": "static/tabBar/home-default.png",
-                "text": "浠撳偍绠$悊"
-            },
+        },
+        {
+            "path" : "pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList",
+            "style" : 
             {
-                "pagePath": "pages/index/tab1",
-                "iconPath": "static/tabBar/icon1.png",
-                "selectedIconPath": "static/tabBar/icon1-default.png",
-                "text": "杞﹂棿绠$悊"
-            },
-			{
-			    "pagePath": "pages/index/tab3",
-			    "iconPath": "static/tabBar/icon4.png",
-			    "selectedIconPath": "static/tabBar/icon4-default.png",
-			    "text": "璁惧绠$悊"
+                "navigationBarTitleText" : "鍣ㄥ叿缁翠慨楠屾敹鍗曠紦瀛�"
+            }
+		}
+
+	],
+	"tabBar": {
+		"color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+		"selectedColor": "#2d7dee", //tab 涓婄殑鏂囧瓧閫変腑鏃剁殑棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+		"borderStyle": "black", //tabbar涓婅竟妗嗙殑棰滆壊锛� 浠呮敮鎸� black / white
+		"backgroundColor": "#ffffff", //tab 鐨勮儗鏅壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+		"list": [{
+				"pagePath": "pages/index/index",
+				"iconPath": "static/tabBar/home.png",
+				"selectedIconPath": "static/tabBar/home-default.png",
+				"text": "浠撳偍绠$悊"
 			},
 			{
-			    "pagePath": "pages/index/tab4",
-			    "iconPath": "static/tabBar/icon3.png",
-			    "selectedIconPath": "static/tabBar/icon3-default.png",
-			    "text": "璐ㄩ噺绠$悊" 
+				"pagePath": "pages/index/tab1",
+				"iconPath": "static/tabBar/icon1.png",
+				"selectedIconPath": "static/tabBar/icon1-default.png",
+				"text": "杞﹂棿绠$悊"
 			},
 			{
-			    "pagePath": "pages/index/tab2",
-			    "iconPath": "static/tabBar/icon2.png",
-			    "selectedIconPath": "static/tabBar/icon2-default.png",
-			    "text": "鍗曟嵁鍒楄〃"
+				"pagePath": "pages/index/tab3",
+				"iconPath": "static/tabBar/icon4.png",
+				"selectedIconPath": "static/tabBar/icon4-default.png",
+				"text": "璁惧绠$悊"
 			},
-            {
-                "pagePath": "pages/index/mine",
-                "iconPath": "static/tabBar/user.png",
-                "selectedIconPath": "static/tabBar/user-default.png",
-                "text": "鎴戠殑"
-            }
+			{
+				"pagePath": "pages/index/tab4",
+				"iconPath": "static/tabBar/icon3.png",
+				"selectedIconPath": "static/tabBar/icon3-default.png",
+				"text": "璐ㄩ噺绠$悊" 
+			},
+			{
+				"pagePath": "pages/index/tab2",
+				"iconPath": "static/tabBar/icon2.png",
+				"selectedIconPath": "static/tabBar/icon2-default.png",
+				"text": "鍗曟嵁鍒楄〃"
+			},
+			{
+				"pagePath": "pages/index/mine",
+				"iconPath": "static/tabBar/user.png",
+				"selectedIconPath": "static/tabBar/user-default.png",
+				"text": "鎴戠殑"
+			}
         ]
     },
     "globalStyle": {
diff --git a/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill.vue b/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill.vue
index cee2d24..37289d2 100644
--- a/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill.vue
+++ b/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill.vue
@@ -72,7 +72,7 @@
                         </picker>
                     </view>
                 </view>
-                <view class="form-item">
+               <!-- <view class="form-item">
                     <view class="title">婧愬崟绫诲瀷:</view>
                     <view class="right" :class="showHMainSourceBillType?'':'disabled'">
                         <zxz-uni-data-select
@@ -86,7 +86,22 @@
                         	@change="HSourceBillTypeNameChange"
                         ></zxz-uni-data-select>
                     </view>
-                </view>
+                </view> -->
+				<view class="form-item">
+				    <view class="title">婧愬崟绫诲瀷:</view>
+				    <view class="right" v-show="showHMainSourceBillType">
+				        <picker :range="arrayHMainSourceBillType" 
+				            @change="HMainSourceBillTypeChange">
+				            <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+				                placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+				            <view class="picker-overlay"></view>
+				        </picker>
+				    </view>
+				    <view class="righton" v-show="!showHMainSourceBillType">
+				        <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+				            placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+				    </view>
+				</view>
                 <view class="form-item">
                     <view class="title">婧愬崟鍗曞彿:</view>
                     <view class="right" v-show="showHSourceBillNo">
@@ -200,12 +215,14 @@
                 showHStockPlaceName: true, 
                 HMouldList:[],
                 isEdit: false,
-                
+                arrayHMainSourceBillType: ['鍣ㄥ叿鎶ュ簾鐢宠鍗�', '鎵嬪伐褰曞叆'],
+                HMainSourceBillType: '鍣ㄥ叿鎶ュ簾鐢宠鍗�',
+				arrayHMainSourceBillValue: ['3823', '-1'],
                 showHMainSourceBillType: true,
                 showHSourceBillNo: true,
                 
                 //婧愬崟绫诲瀷
-                HSourceBillTypeList:[{typeID:"-1",typeName:"鎵嬪伐褰曞叆"}],
+                HSourceBillTypeList:[{typeID:"-1",typeName:"鎵嬪伐褰曞叆"},{typeID:"3823",typeName:"鍣ㄥ叿鎶ュ簾鐢宠鍗�"}],
                 hform: {
                     HBarCode: '',
                     HInterID: '',
@@ -221,7 +238,7 @@
                     HDeptName: getUserInfo().HDept,
                     HDeptID: getUserInfo().HDeptID,
                     //婧愬崟淇℃伅
-                    HMainSourceBillType: "-1",
+                    HMainSourceBillType:uni.getStorageSync('billTypeName_3832') ? uni.getStorageSync('billTypeName_3832'):'鍣ㄥ叿鎶ュ簾鐢宠鍗�',
                     HSourceBillNo: '', //CGDD000200
                     HDate: getDateTime.dateTimeStr('y-m-d'),
                     HMaker: uni.getStorageSync('HUserName'),
@@ -783,6 +800,19 @@
             showBillList() {
                 this.$refs.billList.showPopup()
             },
+			
+            HMainSourceBillTypeChange(e) {
+                this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+            
+                let index = this.arrayHMainSourceBillType.findIndex(e => e == this.HMainSourceBillType)
+                if (index != -1) {
+                    this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[index]
+                    // this.getHYDList()
+                }
+                console.log(this.hform.HMainSourceBillType)
+                uni.setStorageSync("billType_3823",this.hform.HMainSourceBillType);
+                uni.setStorageSync("billTypeName_3823",this.HMainSourceBillType);
+            },
             HSourceBillTypeNameChange(e) {
             	
             	const pages = getCurrentPages()
@@ -795,8 +825,9 @@
             },
             //閫変腑婧愬崟
             getHBarCodeData(HBarCode) {
+				console.log("HInterID",this.hform.HInterID,"HBillNo",this.hform.HBillNo,"HBillType",this.hform.HBillType)
                 uni.request({
-                    url: this.serverUrl + '/MouldController/Get_SourceBarCode_ProdOut_Json',
+                    url: this.serverUrl + '/MouldController/Get_SourceBarCode_ScrapRequest_Json',
                     data: {
                         HInterID: this.hform.HInterID,
                         HBillNo: this.hform.HBillNo,
diff --git a/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
new file mode 100644
index 0000000..9a53f20
--- /dev/null
+++ b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
@@ -0,0 +1,777 @@
+<template>
+    <view>
+        <view class="tabs" id="tabs">
+            <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+            <!-- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鏄庣粏淇℃伅</view> -->
+            <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
+            <!-- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view> -->
+        </view>
+        <!-- 鍩烘湰淇℃伅 -->
+        <template v-if="tabs == 0">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form-item">
+                    <view class="title">妯″叿鏉$爜:</view>
+                    <view :class="enableEdit?'right':'righton'">
+                        <input v-model="hform.HBarCode" :disabled="!enableEdit"
+                            @confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)妯″叿鏉$爜" />
+                    </view>
+                    <view class="icon-wrapper">
+                        <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鏈�缁堢粨璁�:</view>
+                    <view class="right none-border">
+                        <radio-group @change="radioChange" class="radio_Container">
+                            <label>
+                                <view>
+                                    <radio value="OK" :checked="hform.HCheckResult == 'OK'" />
+                                    <text>OK</text>
+                                </view>
+                            </label>
+                            </label>
+                            <view>
+                                <radio value="NG" :checked="hform.HCheckResult == 'NG'" />
+                                <text>NG</text>
+                            </view>
+                            </label>
+                        </radio-group>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">楠屾敹鍐呭:</view>
+                    <view class="right">
+                        <textarea v-model="hform.HRepairCheckMainContent" placeholder="璇疯緭鍏ラ獙鏀跺唴瀹�" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">婧愬崟绫诲瀷:</view>
+                    <zxz-uni-data-select class="right" :localdata="[
+                        {key: '鎵嬪伐褰曞叆', value: '-1'},
+                        {key: '妯″叿鏁呴殰鐧昏鍗�', value: '3815'}
+                        ]" dataKey="key" dataValue="value" v-model="hform.HMainSourceBillType">
+
+                    </zxz-uni-data-select>
+                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                </view>
+                <view class="form-item">
+                    <view class="title">婧愬崟鍙�:</view>
+                    <view class="right">
+                        <input v-model="hform.HMainSourceBillNo" />
+                    </view>
+                    <view class="icon-wrapper">
+                        <uni-icons type="search" size="20" @click="toCheckFile"></uni-icons>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HBillNo" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鏃ユ湡:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title required">閮ㄩ棬:</view>
+                    <zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
+                        dataValue="HItemID" v-model="hform.HDeptID">
+
+                    </zxz-uni-data-select>
+                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                </view>
+                <view class="form-item">
+                    <view class="title required">楠屾敹浜�:</view>
+                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+                        dataValue="HItemID" v-model="hform.HEmpID">
+
+                    </zxz-uni-data-select>
+                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                </view>
+                <view class="form-item">
+                    <view class="title required">楠屾敹椤圭洰:</view>
+                    <zxz-uni-data-select required class="right" :localdata="HRepairCheckList" dataKey="缁翠慨楠屾敹椤圭洰"
+                        dataValue="hitemid" v-model="hform.HRepairCheckMainID">
+
+                    </zxz-uni-data-select>
+                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                </view>
+                <view class="form-item">
+                    <view class="title required">璐熻矗浜�:</view>
+                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+                        dataValue="HItemID" v-model="hform.HManagerID">
+
+                    </zxz-uni-data-select>
+                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                </view>
+                <!-- 鎵爜甯﹀嚭缁翠慨璁板綍 -->
+                <view class="form-item">
+                    <view class="title required">缁翠慨璁板綍:</view>
+                    <view class="right">
+                        <input type="text" value="" />
+                    </view>
+                    <view class="icon-wrapper">
+                        <uni-icons type="search" size="20" @click="toCheckFile"></uni-icons>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">妯″叿鍚嶇О:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMouldName" disabled />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">妯″叿瑙勬牸:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMouldSpec" disabled />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">妯″叿鍨嬪彿:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMouldModel" disabled />
+                    </view>
+                </view>
+            </view>
+        </template>
+        <!-- 鍏朵粬淇℃伅 -->
+        <template v-if="tabs == 2">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form-item">
+                    <view class="title">鍒涘缓浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMaker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍒涘缓鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMakeDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇敼浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HUpDater" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇敼鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HUpDateDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹℃牳浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HChecker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹℃牳鏃堕棿:</view>
+                    <view class="righton">
+                        <input v-model="hform.HCheckDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浣滃簾浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HDeleteMan" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浣滃簾鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HDeleteDate" />
+                    </view>
+                </view>
+            </view>
+
+        </template>
+        <!-- 鎿嶄綔鎸夐挳 -->
+        <view class="buttons" id="buttons">
+            <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+            <view style="flex: 1;"></view>
+            <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+            <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+        </view>
+        <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
+    </view>
+</template>
+
+<script>
+    import dayjs from "dayjs";
+    import {
+        CommonUtils
+    } from "@/utils/common";
+    import {
+        MpaasScan
+    } from "@/utils/mpaasScan.js"
+    import {
+        getUserInfo
+    } from "../../../utils/auth";
+    export default {
+        name: 'Sc_MouldRepairCheckBill',
+        data() {
+            return {
+                tabs: 0,
+                HMainSourceBillType: "",
+                btnTop: 0,
+                tabsBottom: 0,
+                HModName: "Sc_MouldRepairCheckBill",
+                HBillType: '3817',
+                operationType: 1,
+                uploadOptions: {},
+                enableEdit: true,
+
+                HDeptList: [],
+                HRepairCheckList: [],
+                HEmpList: [],
+
+                hform: {
+                    "HBarCode": "",
+                    "HBillNo": "",
+                    "HInterID": 0,
+                    "HDate": dayjs(new Date()).format("YYYY-MM-DD"),
+                    "HInnerBillNo": "",
+                    "HMouldName": "",
+                    "HMouldSpec": "",
+                    "HMouldModel": "",
+                    "HMouldID": 0,
+                    "HMainSourceBillType": "-1",
+                    "HMainSourceInterID": 0,
+                    "HMainSourceEntryID": 0,
+                    "HCheckResult": "OK",
+                    "HEmpName": "",
+                    "HEmpID": 0,
+                    "HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD"),
+                    "HDeptName": "",
+                    "HDeptID": 0,
+                    "HMainSourceBillNo": "",
+                    "HManagerName": "",
+                    "HManagerID": 0,
+                    "HMouldRepairWorkName": "",
+                    "HMouldRepairWorkID": 0,
+                    "HExplanation": "",
+                    "HRemark": "",
+                    "HOrgID": uni.getStorageSync("OrganizationID"),
+                    "HMaker": getUserInfo()["Czymc"],
+                    "HChecker": "",
+                    "HCloseMan": "",
+                    "HUpDater": "",
+                    "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD"),
+                    "HCheckDate": "",
+                    "HCloseDate": "",
+                    "HUpDateDate": "",
+                    "HDeleteMan": "",
+                    "HDeleteDate": "",
+                    "HRepairCheckMainID": 0,
+                    "HRepairCheckMainContent": "",
+                },
+                HBillSub: [{ // 鍚庣鎺ュ彛闇�瑕併�傚惁鍒欐暟鎹笉浼氭樉绀哄湪缂撳瓨涓�
+                    "HRepairCheckID": 0,
+                    "HRepairCheckCode": "",
+                    "HRepairCheckName": "",
+                    "HRepairCheckContent": "",
+                    "HManagerID": 0,
+                    "HManagerCode": "",
+                    "HManagerName": "",
+                    "HRemark": "",
+                    "LAY_TABLE_INDEX": 0
+                }]
+            };
+        },
+        computed: {
+            containerHeight: {
+                get() {
+                    return this.btnTop - this.tabsBottom - 5
+                }
+            },
+        },
+        methods: {
+            // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
+            ValidCheck() {
+                if (this.hform.HEquipID == 0) {
+                    return {
+                        Message: "鏈綍鍏ユā鍏蜂俊鎭紝璇峰厛褰曞叆妯″叿淇℃伅!",
+                        state: false
+                    }
+                }
+                if (this.hform.HDeptID == 0) {
+                    return {
+                        Message: "閮ㄩ棬涓嶅緱涓虹┖!",
+                        state: false
+                    }
+                }
+                if (this.hform.HEmpID == 0) {
+                    return {
+                        Message: "楠屾敹浜轰笉寰椾负绌�!",
+                        state: false
+                    }
+                }
+                if (this.hform.HRepairCheckMainID == 0) {
+                    return {
+                        Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
+                        state: false
+                    }
+                }
+                if (this.hform.HManagerID == 0) {
+                    return {
+                        Message: "璐熻矗浜轰笉寰椾负绌�!",
+                        state: false
+                    }
+                }
+
+                return {
+                    Message: "",
+                    state: true
+                }
+            },
+            addNew() {
+                uni.redirectTo({
+                    url: './Sb_MouldRepairCheckBill?operationType=1'
+                })
+            },
+            goBack() {
+                uni.navigateBack()
+            },
+            checkBoxChangeHandler(index, e) {
+                let cr = e.detail.value
+                if (cr.length == 0) {
+                    this.HCheckFileList[index]["HDotCheckResult"] = false
+                } else {
+                    this.HCheckFileList[index]["HDotCheckResult"] = true
+                }
+            },
+            uploadFile(index) {
+                console.log('filePath: ', this.attachmentInfo[index].filePath);
+                // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
+                uni.uploadFile({
+                    url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
+                    filePath: this.attachmentInfo[index].filePath,
+                    name: 'file',
+                    formData: {
+                        HBillNo: this.hform.HBillNo,
+                        HRemark: "",
+                        HUserName: getUserInfo()["Czymc"]
+                    },
+                    success: (uploadRes) => {
+                        CommonUtils.showTips({
+                            message: "涓婁紶鎴愬姛"
+                        })
+                        this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
+                    },
+                    fail: (err) => {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `涓婁紶澶辫触: ${err}`
+                        })
+                    }
+                })
+            },
+            delFile(index) {
+                console.log('attachmentInfo: ', this.attachmentInfo[index]);
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            this.attachmentInfo.splice(index, 1)
+                        }
+                    },
+                })
+
+            },
+            handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
+                console.log('file: ', res);
+                let fileInfo = res.data[0]
+                this.attachmentInfo.push({
+                    fileName: fileInfo.name,
+                    size: fileInfo.size,
+                    status: '绛夊緟涓婁紶',
+                    filePath: fileInfo.tempFilePath
+                })
+            },
+            // 涓婁紶鏂囦欢
+            fileUpload() {
+                this.$refs.XeUpload.upload('file', {});
+            },
+            //鑾峰彇鐝鏁版嵁
+            async getShiftList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Web/GetGy_ShiftsList_Json',
+                        data: {
+                            Shifts: "",
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HShiftsList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+            async getHDeptList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Gy_Department/list',
+                        data: {
+                            sWhere: "",
+                            user: uni.getStorageSync('HUserName'),
+                            Organization: uni.getStorageSync('Organization')
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HDeptList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            // 鑾峰彇鑱屽憳鏁版嵁
+            async getEmpList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/PublicPageMethod/UserList',
+                        data: {
+                            sWhere: " where 1=1",
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HEmpList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            // 鑾峰彇楠岃瘉椤圭洰鏁版嵁
+            async getCheckProjList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Gy_RepairCheck/GetRepairCheckList',
+                        data: {
+                            sWhere: "",
+                            user: uni.getStorageSync('HUserName'),
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HRepairCheckList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            toScanCode() {
+                MpaasScan.scanCode(cb => {
+                    this.hfrom.HBarCode = cb
+                    this.GetMessageByBarCode(cb)
+                })
+            },
+            async GetMessageByBarCode(HBarCode) {
+                try {
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: "/Sc_PDA_MouldRepairCheckBill/txtHBarCode_KeyDown_List",
+                        data: {
+                            HBarCode: HBarCode,
+                        },
+                    })
+
+
+                    if (!res) {
+                        return
+                    }
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+
+                    if (count == 1) {
+                        console.log('data: ', data);
+                        this.hform.HMouldID = data[0].hmainid
+                        this.hform.HMouldName = data[0].妯″叿鍚嶇О
+                        this.hform.HMouldSpec = data[0].妯″叿鍝佺被
+                        this.hform.HMouldModel = data[0].妯″叿鍨嬪彿
+                        this.hform.HQty = 1
+
+                        this.enableEdit = false
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: Message
+                        })
+                    }
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: err
+                    })
+                }
+            },
+            async GetItemByEquipFile() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Web/GetItemByEquipFile",
+                        data: {
+                            "EquipProjectID": this.hform.HEquipID,
+                            "Type": "DJ",
+                            "HDate": this.hform.HBeginDate
+                        }
+                    })
+
+                    let {
+                        data,
+                        Message,
+                        count
+                    } = res.data
+                    if (count == 1) {
+                        this.hform.HEquipDotCheckRuleInterID = data[0].鐐规瑙勭▼ID
+                        this.hform.HEquipDotCheckRuleInterNo = data[0].鐐规瑙勭▼鍗曞彿
+                        this.hform.HPlanNo = data[0].鐐规璁″垝鍗�
+                        this.hform.HPlanInterID = (data[0].鐐规璁″垝ID == null ? 0 : data[0].鐐规璁″垝ID) == "" ? 0 : data[0]
+                            .鐐规璁″垝ID
+                        this.hform.HPlanEntryID = (data[0].鐐规璁″垝瀛怚D == null ? 0 : data[0].鐐规璁″垝瀛怚D) == "" ? 0 : data[
+                            0].鐐规璁″垝瀛怚D
+
+                        this.HCheckFileList = Array.from(data).map(item => {
+                            return {
+                                "HDotCheckItemID": item.HDotCheckItemID,
+                                "HDotCheckCode": item.鐐规椤圭洰浠g爜,
+                                "HDotCheckItem": item.鐐规椤圭洰,
+                                "HDotCheckPart": item.鐐规閮ㄤ綅,
+                                "HClaim": item.鍏蜂綋瑕佹眰,
+                                "HManagerID": item.璐熻矗浜篒D,
+                                "HManagerCode": item.璐熻矗浜轰唬鐮�,
+                                "HManagerName": item.璐熻矗浜哄悕绉�,
+                                "HSourceInterID": item.鐐规璁″垝ID == null ? 0 : item.鐐规璁″垝ID,
+                                "HSourceEntryID": item.鐐规璁″垝瀛怚D == null ? 0 : item.鐐规璁″垝瀛怚D,
+                                "HSourceBillNo": item.鐐规璁″垝鍗�,
+                                "HDotCheckItemClassID": 0,
+                                "HDotCheckItemClassName": "",
+                                "HDotCheckItemMethodID": 0,
+                                "HDotCheckItemMethodName": "",
+                                "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
+                            }
+                        })
+
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
+                    })
+                }
+            },
+            radioChange({
+                detail: {
+                    value
+                }
+            }) {
+                this.hform.HCheckResult = value
+            },
+            async getMaxNum() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Web/GetMAXNum",
+                        data: {
+                            "HBillType": this.HBillType
+                        }
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message
+                    } = res.data
+                    console.log('data: ', data);
+                    this.hform.HInterID = 0
+                    this.hform.HBillNo = data[0]["HBillNo"]
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+                    })
+                }
+            },
+            async submit() {
+                let valid = this.ValidCheck()
+                if (!valid.state) {
+                    CommonUtils.showTips({
+                        message: valid.Message
+                    })
+                    return
+                }
+
+                try {
+                    let oMain = JSON.stringify(this.hform);
+                    this.HBillSub[0].HRepairCheckID = this.hform.HRepairCheckMainID
+                    this.HBillSub[0].HManagerID = this.hform.HManagerID
+                    this.HBillSub[0].HRepairCheckContent = this.hform.HRepairCheckMainContent
+                    let sSubStr = JSON.stringify(this.HBillSub);
+                    let sMainSub = oMain + ';' + sSubStr + ';' + getUserInfo()['Czymc'];
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: "/Sc_MouldRepairCheckBill/SaveGetMouldRepairCheckBillList",
+                        data: {
+                            "msg": sMainSub
+                        },
+                        method: "POST"
+                    })
+
+                    if (!res) {
+                        return
+                    }
+
+                    let {
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        uni.showModal({
+                            title: '鎻愮ず',
+                            content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+                            success: (res) => {
+                                if (res.confirm) {
+                                    console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                                    uni.redirectTo({
+                                        url: '/pages/MJGL/Sb_EquipRepairCheck/Sb_EquipRepairCheckBill?operationType=1'
+                                    })
+                                } else if (res.cancel) {
+                                    console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                                    setTimeout(() => {
+                                        uni.navigateBack();
+                                    }, 50)
+                                }
+                            }
+                        });
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+                        })
+                    }
+
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "鎻愪氦鍗曟嵁澶辫触: " + err
+                    })
+                }
+            }
+        },
+        onLoad(e) {
+            console.log('e: ', e);
+            if (!e.operationType) {
+                this.operationType = 1
+            } else {
+                this.operationType = e.operationType
+            }
+
+            if (this.operationType == 1) {
+                // 鏂板
+                this.getMaxNum()
+            } else if (this.operationType == 2) {
+                // 澶嶅埗
+            } else if (this.operationType == 3) {
+                // 缂栬緫
+
+            } else if (this.operationType == 4) {
+                // 娴忚
+
+            }
+
+            this.getHDeptList()
+            this.getEmpList()
+            this.getCheckProjList()
+        },
+        onReady() {
+            const query = uni.createSelectorQuery().in(this)
+            query.select("#buttons")
+                .boundingClientRect()
+                .select("#tabs")
+                .boundingClientRect()
+                .exec(res => {
+                    this.btnTop = Math.floor(res[0].top)
+                    this.tabsBottom = Math.ceil(res[1].bottom)
+                })
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJBillStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList.vue b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList.vue
new file mode 100644
index 0000000..cc1cb4a
--- /dev/null
+++ b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList.vue
@@ -0,0 +1,476 @@
+<template>
+    <view class="content">
+        <view class="form">
+            <view class="form-item">
+                <view class="title">寮�濮嬫椂闂�:</view>
+                <view class="right">
+                    <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
+                        <input :value="hform.HBeginDate" />
+                    </uni-datetime-picker>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">缁撴潫鏃堕棿:</view>
+                <view class="right">
+                    <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HEndDate">
+                        <input :value="hform.HEndDate" />
+                    </uni-datetime-picker>
+                </view>
+            </view>
+            <view v-if="showmore">
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�:</view>
+                    <view class="right">
+                        <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+                    </view>
+                </view>
+
+            </view>
+            <view class="other">
+                <view v-if="!showmore" @tap="changeShowMore">
+                    灞曞紑鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
+                </view>
+                <view v-if="showmore" @tap="changeShowMore">
+                    鎶樺彔鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
+                </view>
+            </view>
+
+            <view class="buttons">
+                <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+                <button class="btn-b" size="mini" type="default" @tap="add">鏂板</button>
+                <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+            </view>
+        </view>
+
+        <view id="divide" style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+        <view :style="{
+            height: calcContentHeight + 'px',
+            overflowY: 'auto'
+        }">
+            <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+                <uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+                    @tap="showDetail = showDetail==index?-1:index">
+                    <view class="card-detail">
+                        <view class="detail" v-if="item.鍒跺崟浜�">
+                            <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+                        </view>
+                        <view class="detail" v-if="item.浜у搧妯″叿浠g爜">
+                            <text>浜у搧妯″叿浠g爜锛�</text>{{item.浜у搧妯″叿浠g爜}}
+                        </view>
+                        <view class="detail" v-if="item.浜у搧妯″叿">
+                            <text>浜у搧妯″叿锛�</text>{{item.浜у搧妯″叿}}
+                        </view>
+                        <view class="detail" v-if="item.璐熻矗浜�">
+                            <text>璐熻矗浜猴細</text>{{item.璐熻矗浜簘}
+                        </view>
+                        <view class="detail" v-if="item.楠屾敹閮ㄩ棬">
+                            <text>楠屾敹閮ㄩ棬锛�</text>{{item.楠屾敹閮ㄩ棬}}
+                        </view>
+                        <view class="detail" v-if="item.楠屾敹浜�">
+                            <text>楠屾敹浜猴細</text>{{item.楠屾敹浜簘}
+                        </view>
+                        <view class="detail" v-if="item.楠屾敹椤圭洰">
+                            <text>楠屾敹椤圭洰锛�</text>{{item.楠屾敹椤圭洰}}
+                        </view>
+                        <view class="card-detail" v-if="showDetail == index">
+
+
+                            <view class="detail" v-if="item.琛ㄥご澶囨敞">
+                                <text>琛ㄥご澶囨敞锛�</text>{{item.琛ㄥご澶囨敞}}
+                            </view>
+                            <view class="detail" v-if="item.鍙戠敓鏃ユ湡">
+                                <text>寮�濮嬫棩鏈燂細</text>{{dayjs(item.鍙戠敓鏃ユ湡).format("YYYY-MM-DD HH:mm:DD")}}
+                            </view>
+                            <view class="detail" v-if="item.楠屾敹浜轰唬鐮�">
+                                <text>楠屾敹浜轰唬鐮侊細</text>{{item.楠屾敹浜轰唬鐮亇}
+                            </view>
+                            <view class="detail" v-if="item.缁翠慨閮ㄩ棬浠g爜">
+                                <text>缁翠慨閮ㄩ棬浠g爜锛�</text>{{item.缁翠慨閮ㄩ棬浠g爜}}
+                            </view>
+                            <view class="detail" v-if="item.璐熻矗浜轰唬鐮�">
+                                <text>璐熻矗浜轰唬鐮侊細</text>{{item.璐熻矗浜轰唬鐮亇}
+                            </view>
+                            <view class="detail" v-if="item.hmainid">
+                                <text>鍐呴儴鍗曟嵁鍙凤細</text>{{item.hmainid}}
+                            </view>
+                        </view>
+                    </view>
+
+                    <view class="more" v-if="showDetail == index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+                    <view class="more" v-if="showDetail != index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+                    <view class="op" v-if="operations == index">
+                        <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+                        <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+                        <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+                    </view>
+                </uni-card>
+            </view>
+        </view>
+        <view class="pagination-zone" id="pagination-zone">
+            <uni-pagination show-icon :page-size="size" :total="dataLength" :current="page"
+                @change="onPaginationChangeHandler"></uni-pagination>
+        </view>
+        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+    </view>
+</template>
+
+<script>
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import BarCodePopupVue from "@/components/BarCodePopup/BarCodePopup.vue";
+    import {
+        CommonUtils
+    } from "../../../utils/common";
+    import dayjs from "dayjs";
+    export default {
+        name: "Sc_MouldRepairCheckBillList",
+        data() {
+            return {
+                dayjs,
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                tabs: 0,
+                urls: '/Web/GetMouldBillsList',
+                MvarReportTitle: '妯″叿缁翠慨妫�楠屽崟缂撳瓨',
+                hform: {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 3899,
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    Type: "RC",
+                    sWhere: "",
+                    HBeginDate: dayjs(new Date()).subtract(30, 'day').format("YYYY-MM-DD"),
+                    HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                },
+                sWhere: '',
+                listData: [],
+                showList: [],
+                showDetail: -1,
+                operations: -1,
+
+                page: 1,
+                size: 20,
+                dataLength: 0,
+                divideBottom: 0,
+                paginationTop: 0,
+                showmore: false,
+            }
+        },
+        computed: {
+            calcContentHeight: {
+                get() {
+                    return this.paginationTop - this.divideBottom
+                }
+            }
+        },
+        onShow() {
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            this.CheckModRight()
+            this.changeTab(0)
+            console.log(this.userInfo, uni.getStorageSync('HUserName'))
+        },
+        components: {
+            BarCodePopupVue
+        },
+        onPullDownRefresh: function() {
+            this.clear()
+            setTimeout(() => {
+                uni.stopPullDownRefresh();
+            }, 1000);
+        },
+        onReady() {
+            this.getCalcHeight()
+        },
+        methods: {
+            changeShowMore() {
+                this.showmore = !this.showmore
+                this.$nextTick(() => {
+                    // 閲嶆柊璁$畻鍐呭瑙嗗彛楂樺害
+                    this.getCalcHeight()
+                })
+            },
+            getCalcHeight() {
+                let query = uni.createSelectorQuery().in(this)
+                query
+                    .select("#divide")
+                    .boundingClientRect()
+                    .select("#pagination-zone")
+                    .boundingClientRect()
+                    .exec(res => {
+                        this.divideBottom = Math.ceil(res[0].bottom)
+                        this.paginationTop = Math.floor(res[1].top)
+                    })
+            },
+            async qrCodeDisplay(item) {
+                this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+                await this.$nextTick()
+                this.$refs.barcodePopup.open()
+            },
+            CheckModRight() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+                    data: {
+                        ModRightName: 'CE_OtherOut',
+                        HUserName: uni.getStorageSync('HUserName')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {} else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            onPaginationChangeHandler({
+                current
+            }) {
+                this.page = current
+                this.showList = this.getPage(current, this.size, this.listData)
+            },
+            getPage(page, size, list) {
+                let sindex = (parseInt(page) - 1) * size
+                let eindex = parseInt(page) * size
+                let newList = list.slice(sindex, eindex)
+                return newList
+            },
+            changeTab(e) {
+                this.tabs = e
+                this.page = 1
+                this.showList = []
+
+                if (this.tabs == 0) {
+                    this.urls = '/Web/GetMouldBillsList'
+                }
+                // if (this.tabs == 1) {
+                // 	this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+                // }
+                this.search()
+            },
+            async getList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: this.urls,
+                        data: this.hform
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message
+                    } = res.data
+
+                    if (count == 1) {
+                        if(data == null) {
+                           data = []
+                        }
+                        this.listData = data
+                        console.log('data: ', data);
+                        this.showList = this.getPage(this.page, this.size, data)
+                        this.dataLength = data.length
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${err}`
+                    })
+                }
+
+            },
+            search() {
+                this.hform.sWhere = ''
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                console.log(this.hform)
+                if (this.hform.HBillNo) {
+                    this.hform.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+                }
+                if (this.hform.HBeginDate && this.hform.HEndDate) {
+                    this.hform.sWhere +=
+                        ` and convert(date,鏃ユ湡) between convert(date, '${this.hform.HBeginDate}') and convert(date, '${this.hform.HEndDate}')`;
+                }
+                this.getList()
+            },
+            clear() {
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                this.sWhere = ''
+                this.hform = {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 3899,
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    sWhere: '',
+                    Type: "RC",
+                    HBeginDate: dayjs(new Date()).subtract(30, 'day').format("YYYY-MM-DD"),
+                    HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                }
+                this.search()
+            },
+            add() {
+                uni.navigateTo({
+                    url: '/pages/MJGL/Sb_EquipRepariCheckBill/Sb_EquipRepariCheckBill?operationType=1'
+                })
+            },
+            //缂栬緫
+            edit(item) {
+                console.log(item)
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
+                    data: {
+                        "HInterID": item.HInterID,
+                        "HBillNo": item.鍗曟嵁鍙�,
+                        "HBillType": this.hform.HBillType
+                    },
+                    success: (res) => {
+                        console.log(1, res);
+                        if (res.data.count == 1) {
+                            uni.navigateTo({
+                                url: './OtherOutBill?OperationType=2&HInterID=' + item.HInterID
+                            })
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.hideLoading()
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                })
+            },
+            //鍒犻櫎
+            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 +
+                                    '/Sc_MouldRepairCheckBill/DeltetMouldRepairCheckBill',
+                                data: {
+                                    HInterID: item.hmainid,
+                                    user: uni.getStorageSync('HUserName'),
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+            //鎾ら攢
+            revoke(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '鏄惁纭鎾ら攢',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
+                                data: {
+                                    HInterID: item.HInterID,
+                                    HBillNo: item.鍗曟嵁鍙�,
+                                    HBillType: this.hform.HBillType,
+                                    HMaker: uni.getStorageSync('HUserName'),
+                                    MvarReportTitle: this.MvarReportTitle,
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJListStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
index 1aef13a..acd4e0e 100644
--- a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
+++ b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
@@ -50,13 +50,13 @@
                         <radio-group @change="radioChange" class="radio_Container">
                             <label>
                                 <view>
-                                    <radio value="OK" :checked="hform.HLastResult == 'OK'" />
+                                    <radio value="OK" :checked="calcHLastResult == 'OK'" />
                                     <text>OK</text>
                                 </view>
                             </label>
                             </label>
                             <view>
-                                <radio value="NG" :checked="hform.HLastResult == 'NG'" />
+                                <radio value="NG" :checked="calcHLastResult == 'NG'" />
                                 <text>NG</text>
                             </view>
                             </label>
@@ -141,7 +141,10 @@
         </template>
         <!-- 鏄庣粏淇℃伅 -->
         <template v-if="tabs == 1">
-            <view class="form">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
                 <view class="form-item">
                     <view class="left">
                         璁惧鐐规瑙勭▼
@@ -153,39 +156,40 @@
                         <uni-icons type="search" size="20" @click="toCheckFile"></uni-icons>
                     </view>
                 </view>
+
+                <view class="list" v-for="(item,index) in HCheckFileList" :key="index">
+                    <uni-card style="margin: 10px;">
+                        <view class="card-detail">
+                            <view class="detail">
+                                <text>搴忓彿锛�</text>{{index+1}}
+                            </view>
+                            <view class="detail">
+                                <text>缁撴灉锛�</text>
+                                <checkbox-group style="display: inline-block;"
+                                    @change="checkBoxChangeHandler(index, $event)">
+                                    <checkbox value="enabled" :checked="item.HDotCheckResult" />
+                                </checkbox-group>
+                            </view>
+                            <view class="detail">
+                                <text>鐐规椤圭洰鍒嗙被锛�</text>{{item.HDotCheckItemClassName}}
+                            </view>
+                            <view class="detail">
+                                <text>鐐规椤圭洰锛�</text>{{item.HDotCheckItem}}
+                            </view>
+                            <view class="detail">
+                                <text>鐐规閮ㄤ綅锛�</text>{{item.HDotCheckPart}}
+                            </view>
+                            <view class="detail">
+                                <text>璐熻矗浜哄悕绉帮細</text>{{item.HManagerName}}
+                            </view>
+                            <view class="detail">
+                                <text>澶囨敞锛�</text>{{item.HRemark}}
+                            </view>
+                        </view>
+                    </uni-card>
+                </view>
+                <view class="over" v-if="HCheckFileList.length == 0">鏆傛棤鏁版嵁</view>
             </view>
-            <view class="list" v-for="(item,index) in HCheckFileList" :key="index">
-                <uni-card style="margin: 10px;">
-                    <view class="card-detail">
-                        <view class="detail">
-                            <text>搴忓彿锛�</text>{{index+1}}
-                        </view>
-                        <view class="detail">
-                            <text>缁撴灉锛�</text>
-                            <checkbox-group style="display: inline-block;"
-                                @change="checkBoxChangeHandler(index, $event)">
-                                <checkbox value="enabled" :checked="item.HDotCheckResult" />
-                            </checkbox-group>
-                        </view>
-                        <view class="detail">
-                            <text>鐐规椤圭洰鍒嗙被锛�</text>{{item.HDotCheckItemClassName}}
-                        </view>
-                        <view class="detail">
-                            <text>鐐规鏂规硶锛�</text>{{item.HDotCheckItemMethodName}}
-                        </view>
-                        <view class="detail">
-                            <text>鐐规閮ㄤ綅锛�</text>{{item.HDotCheckPart}}
-                        </view>
-                        <view class="detail">
-                            <text>璐熻矗浜哄悕绉帮細</text>{{item.HManagerName}}
-                        </view>
-                        <view class="detail">
-                            <text>澶囨敞锛�</text>{{item.HRemark}}
-                        </view>
-                    </view>
-                </uni-card>
-            </view>
-            <view class="over" v-if="HCheckFileList.length == 0">鏆傛棤鏁版嵁</view>
         </template>
         <!-- 鍏朵粬淇℃伅 -->
         <template v-if="tabs == 2">
@@ -278,6 +282,7 @@
             <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
         </view>
         <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
+        <BillSelectorPopupVue @update="billSelectHandler" ref="billSelector" :Type="'DJ'"></BillSelectorPopupVue>
     </view>
 </template>
 
@@ -289,15 +294,15 @@
     import {
         MpaasScan
     } from "@/utils/mpaasScan.js"
-    import "@/pages/MJGL/style/MJBillStyle.scss"
     import {
         getUserInfo
     } from "../../../utils/auth";
-    import {
-        TrackOpTypes
-    } from "vue";
+    import BillSelectorPopupVue from "../../../components/MJGL/BillSelectorPopup.vue";
     export default {
         name: 'sb_EquipDotCheckBill',
+        components: {
+            BillSelectorPopupVue
+        },
         data() {
             return {
                 tabs: 0,
@@ -358,9 +363,50 @@
                 get() {
                     return this.btnTop - this.tabsBottom - 5
                 }
+            },
+            calcHLastResult: {
+                get() {
+                    if (this.HCheckFileList.length == 0) {
+                        return 'OK'
+                    } else {
+                        let okCount = this.HCheckFileList.reduce((acc, item) => {
+                            if (item.HDotCheckResult) {
+                                return acc + 1
+                            }
+                            return acc
+                        }, 0)
+                        if (okCount == this.HCheckFileList.length) {
+                            return 'OK'
+                        }
+                        return 'NG'
+                    }
+                }
             }
+
         },
         methods: {
+            billSelectHandler(billData) {
+                console.log('billData: ', billData);
+                let data = billData.retVal[this.hform.HEquipID]
+                this.get_DocCheckItem2(data.hmainid)
+            },
+            
+            toCheckFile() {
+                if (this.hform.HEquipID == 0) {
+                    return CommonUtils.showTips({
+                        message: '涓嶈兘閫夋嫨鐐规瑙勭▼锛岃鍏堟壂鎻忚澶囨潯鐮�!!!'
+                    })
+                }
+                this.$refs['billSelector'].showPopup(this.hform.HEquipID)
+            },
+            addNew() {
+                uni.redirectTo({
+                    url: './Sb_EquipDotCheckBill?operationType=1'
+                })
+            },
+            goBack() {
+                uni.navigateBack()
+            },
             checkBoxChangeHandler(index, e) {
                 let cr = e.detail.value
                 if (cr.length == 0) {
@@ -511,17 +557,88 @@
                         Message
                     } = res.data
 
-                    console.log('data: ', data);
-                    this.hform.HEquipID = data[0].HInterID
-                    this.hform.HBarName = data[0].璁惧鍚嶇О
-                    this.hform.HBarSpec = data[0].璁惧瑙勬牸
-                    this.hform.HBarModel = data[0].璁惧鍨嬪彿
-                    this.hform.HQty = 1
+                    if (count == 1) {
+                        console.log('data: ', data);
+                        this.hform.HEquipID = data[0].HInterID
+                        this.hform.HBarName = data[0].璁惧鍚嶇О
+                        this.hform.HBarSpec = data[0].璁惧瑙勬牸
+                        this.hform.HBarModel = data[0].璁惧鍨嬪彿
+                        this.hform.HQty = 1
 
-                    // 鑾峰彇妫�楠岃绋�
-                    this.GetItemByEquipFile()
+                        // 鑾峰彇妫�楠岃绋�
+                        this.GetItemByEquipFile()
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: Message
+                        })
+                    }
+
                 } catch (err) {
-
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: err
+                    })
+                }
+            },
+            // 鑾峰彇淇濆吇瑙勭▼
+            async get_DocCheckItem2(HDotCheckRuleInterID) {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Web/GetDotCheckRuleItemByDotCheckRuleID",
+                        data: {
+                            "HDotCheckRuleInterID": HDotCheckRuleInterID
+                        },
+                    })
+            
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        console.log('data: ',data);
+                        this.hform.HEquipDotCheckRuleInterID = data[0].HInterID
+                        this.hform.HEquipDotCheckRuleInterNo = data[0].HBillNo
+                        this.hform.HPlanNo = data[0].鐐规璁″垝鍗�
+                        this.hform.HPlanInterID = (data[0].鐐规璁″垝ID == null ? 0 : data[0].鐐规璁″垝ID) == "" ? 0 : data[0]
+                            .鐐规璁″垝ID
+                        this.hform.HPlanEntryID = (data[0].鐐规璁″垝瀛怚D == null ? 0 : data[0].鐐规璁″垝瀛怚D) == "" ? 0 : data[
+                            0].鐐规璁″垝瀛怚D
+                        
+                        this.HCheckFileList = Array.from(data).map(item => {
+                            return {
+                                "HDotCheckItemID": item.HDotCheckItemID,
+                                "HDotCheckCode": item.鐐规椤圭洰浠g爜,
+                                "HDotCheckItem": item.鐐规椤圭洰,
+                                "HDotCheckPart": item.鐐规閮ㄤ綅,
+                                "HClaim": item.鍏蜂綋瑕佹眰,
+                                "HManagerID": item.璐熻矗浜篒D,
+                                "HManagerCode": item.璐熻矗浜轰唬鐮�,
+                                "HManagerName": item.璐熻矗浜哄悕绉�,
+                                "HSourceInterID": item.鐐规璁″垝ID == null ? 0 : item.鐐规璁″垝ID,
+                                "HSourceEntryID": item.鐐规璁″垝瀛怚D == null ? 0 : item.鐐规璁″垝瀛怚D,
+                                "HSourceBillNo": item.鐐规璁″垝鍗�,
+                                "HDotCheckItemClassID": 0,
+                                "HDotCheckItemClassName": "",
+                                "HDotCheckItemMethodID": 0,
+                                "HDotCheckItemMethodName": "",
+                                "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
+                            }
+                        })
+            
+                        this.enableEdit = false
+                        this.$refs["billSelector"].exit()
+            
+                    } else {
+                        CommonUtils.showTips({
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        message: err
+                    })
                 }
             },
             async GetItemByEquipFile() {
@@ -626,13 +743,16 @@
                         },
                         method: "POST"
                     })
-                    
-                    if(!res) {
-                       return 
+
+                    if (!res) {
+                        return
                     }
-                    
-                    let {count, Message} = res.data
-                    if(count == 1){
+
+                    let {
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
                         uni.showModal({
                             title: '鎻愮ず',
                             content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
@@ -640,7 +760,7 @@
                                 if (res.confirm) {
                                     console.log('鐢ㄦ埛鐐瑰嚮纭畾');
                                     uni.redirectTo({
-                                        url: '/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill?operationType=1'
+                                        url: '/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill?operationType=1'
                                     })
                                 } else if (res.cancel) {
                                     console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -650,14 +770,14 @@
                                 }
                             }
                         });
-                    }else {
+                    } else {
                         CommonUtils.showTips({
                             title: "娓╅Θ鎻愮ず",
                             message: "鎻愪氦鍗曟嵁澶辫触: " + Message
                         })
                     }
-                    
-                    
+
+
                 } catch (err) {
                     CommonUtils.showTips({
                         title: "娓╅Θ鎻愮ず",
@@ -704,5 +824,6 @@
     }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJBillStyle.scss"
 </style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList.vue b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList.vue
new file mode 100644
index 0000000..ba9e5cc
--- /dev/null
+++ b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList.vue
@@ -0,0 +1,476 @@
+<template>
+    <view class="content">
+        <view class="form">
+            <view class="form-item">
+                <view class="title">寮�濮嬫椂闂�:</view>
+                <view class="right">
+                    <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
+                        <input :value="hform.HBeginDate" />
+                    </uni-datetime-picker>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">缁撴潫鏃堕棿:</view>
+                <view class="right">
+                    <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HEndDate">
+                        <input :value="hform.HEndDate" />
+                    </uni-datetime-picker>
+                </view>
+            </view>
+            <view v-if="showmore">
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�:</view>
+                    <view class="right">
+                        <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+                    </view>
+                </view>
+
+            </view>
+            <view class="other">
+                <view v-if="!showmore" @tap="changeShowMore">
+                    灞曞紑鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
+                </view>
+                <view v-if="showmore" @tap="changeShowMore">
+                    鎶樺彔鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
+                </view>
+            </view>
+
+            <view class="buttons">
+                <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+                <button class="btn-b" size="mini" type="default" @tap="creat">鏂板</button>
+                <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+            </view>
+        </view>
+
+        <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;" id="divide"></view>
+
+        <view :style="{
+            height: calcContentHeight + 'px',
+            overflowY: 'auto'
+        }">
+
+            <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+                <uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+                    @tap="showDetail = showDetail==index?-1:index">
+                    <view class="card-detail">
+                        <view class="detail" v-if="item.鍒跺崟浜�">
+                            <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+                        </view>
+                        <view class="detail" v-if="item.璁惧浠g爜">
+                            <text>璁惧浠g爜锛�</text>{{item.璁惧浠g爜}}
+                        </view>
+                        <view class="detail" v-if="item.璁惧鍚嶇О">
+                            <text>璁惧鍚嶇О锛�</text>{{item.璁惧鍚嶇О}}
+                        </view>
+                        <view class="detail" v-if="item.鏈�缁堢粨璁�">
+                            <text>鏈�缁堢粨璁猴細</text>{{item.鏈�缁堢粨璁簘}
+                        </view>
+                        <view class="card-detail" v-if="showDetail == index">
+                            <view class="detail" v-if="item.琛ㄥご澶囨敞">
+                                <text>琛ㄥご澶囨敞锛�</text>{{item.琛ㄥご澶囨敞}}
+                            </view>
+                            <view class="detail" v-if="item.寮�濮嬫棩鏈�">
+                                <text>寮�濮嬫棩鏈燂細</text>{{dayjs(item.寮�濮嬫棩鏈�).format("YYYY-MM-DD HH:mm:DD")}}
+                            </view>
+                            <view class="detail" v-if="item.缁撴潫鏃ユ湡">
+                                <text>缁撴潫鏃ユ湡锛�</text>{{dayjs(item.缁撴潫鏃ユ湡).format("YYYY-MM-DD HH:mm:DD")}}
+                            </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.hmainid">
+                                <text>鍐呴儴鍗曟嵁鍙凤細</text>{{item.hmainid}}
+                            </view>
+                        </view>
+
+                    </view>
+
+                    <view class="more" v-if="showDetail == index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+                    <view class="more" v-if="showDetail != index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+                    <view class="op" v-if="operations == index">
+                        <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+                        <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+                        <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+                    </view>
+                </uni-card>
+            </view>
+        </view>
+        <view class="pagination-zone" id="pagination-zone">
+            <uni-pagination show-icon :page-size="size" :total="dataLength" :current="page"
+                @change="onPaginationChangeHandler"></uni-pagination>
+        </view>
+        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+    </view>
+</template>
+
+<script>
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import BarCodePopupVue from "@/components/BarCodePopup/BarCodePopup.vue";
+    import {
+        CommonUtils
+    } from "../../../utils/common";
+    import dayjs from "dayjs";
+    export default {
+        data() {
+            return {
+                dayjs,
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                tabs: 0,
+                urls: '/Web/GetEquipmentBillsList',
+                MvarReportTitle: '璁惧鐐规璁板綍鍗曠紦瀛�',
+                showmore: false,
+                hform: {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 3903,
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    Type: "DJ",
+                    sWhere: "",
+                    HBeginDate: dayjs(new Date()).subtract(30, 'day').format("YYYY-MM-DD"),
+                    HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                },
+                sWhere: '',
+                listData: [],
+                showList: [],
+                showDetail: -1,
+                operations: -1,
+
+                page: 1,
+                size: 50,
+                dataLength: 0,
+                divideBottom: 0,
+                paginationTop: 0,
+            }
+        },
+        onShow() {
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            this.CheckModRight()
+            this.changeTab(0)
+            console.log(this.userInfo, uni.getStorageSync('HUserName'))
+        },
+        components: {
+            BarCodePopupVue
+        },
+        computed: {
+            calcContentHeight: {
+                get() {
+                    return this.paginationTop - this.divideBottom
+                }
+
+            }
+        },
+        // onPullDownRefresh: function() {
+        //     this.clear()
+        //     setTimeout(() => {
+        //         uni.stopPullDownRefresh();
+        //     }, 1000);
+        // },
+        onReady() {
+            this.getCalcHeight()
+        },
+        methods: {
+            
+            changeShowMore() {
+                this.showmore = !this.showmore
+                this.$nextTick(() => {
+                    // 閲嶆柊璁$畻鍐呭瑙嗗彛楂樺害
+                    this.getCalcHeight()
+                })
+            },
+            getCalcHeight() {
+                let query = uni.createSelectorQuery().in(this)
+                query
+                    .select("#divide")
+                    .boundingClientRect()
+                    .select("#pagination-zone")
+                    .boundingClientRect()
+                    .exec(res => {
+                        this.divideBottom = Math.ceil(res[0].bottom)
+                        this.paginationTop = Math.floor(res[1].top)
+                    })
+
+            },
+            async qrCodeDisplay(item) {
+                this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+                await this.$nextTick()
+                this.$refs.barcodePopup.open()
+            },
+            CheckModRight() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+                    data: {
+                        ModRightName: 'CE_OtherOut',
+                        HUserName: uni.getStorageSync('HUserName')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {} else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            onPaginationChangeHandler({
+                current
+            }) {
+                this.page = current
+                this.showList = this.getPage(current, this.size, this.listData)
+            },
+            getPage(page, size, list) {
+                let sindex = (parseInt(page) - 1) * size
+                let eindex = parseInt(page) * size
+                let newList = list.slice(sindex, eindex)
+                return newList
+            },
+            changeTab(e) {
+                this.tabs = e
+                this.page = 1
+                this.showList = []
+
+                if (this.tabs == 0) {
+                    this.urls = '/Web/GetEquipmentBillsList'
+                }
+                // if (this.tabs == 1) {
+                // 	this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+                // }
+                this.search()
+            },
+            async getList() {
+                console.log('this.hform: ', this.hform);
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: this.urls,
+                        data: this.hform
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message
+                    } = res.data
+
+                    if (count == 1) {
+                        if(data == null) {
+                           data = []
+                        }
+                        this.listData = data
+                        this.showList = this.getPage(this.page, this.size, data)
+                        this.dataLength = data.length
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${err}`
+                    })
+                }
+
+            },
+            search() {
+                this.hform.sWhere = ''
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                console.log(this.hform)
+                if (this.hform.HBillNo) {
+                    this.hform.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+                }
+                if (this.hform.HBeginDate && this.hform.HEndDate) {
+                    this.hform.sWhere +=
+                        ` and 鏃ユ湡 between convert(date, '${this.hform.HBeginDate}') and convert(date, '${this.hform.HEndDate}')`;
+                }
+                this.getList()
+            },
+            clear() {
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                this.sWhere = ''
+                this.hform = {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 3903,
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    sWhere: '',
+                    Type: "DJ",
+                    HBeginDate: dayjs(new Date()).subtract(30, 'd').format("YYYY-MM-DD"),
+                    HEndDate: dayjs(new Date()).format("YYYY-MM-DD")
+                }
+                this.search()
+            },
+            add() {
+                uni.navigateTo({
+                    url: '/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill?operationType=1'
+                })
+            },
+            //缂栬緫
+            edit(item) {
+                console.log(item)
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
+                    data: {
+                        "HInterID": item.HInterID,
+                        "HBillNo": item.鍗曟嵁鍙�,
+                        "HBillType": this.hform.HBillType
+                    },
+                    success: (res) => {
+                        console.log(1, res);
+                        if (res.data.count == 1) {
+                            uni.navigateTo({
+                                url: './OtherOutBill?OperationType=2&HInterID=' + item.HInterID
+                            })
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.hideLoading()
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                })
+            },
+            //鍒犻櫎
+            del(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/Sb_EquipDotCheckBill/DeltetEquipDotCheckBillList',
+                                data: {
+                                    HInterID: item.hmainid,
+                                    user: uni.getStorageSync('HUserName'),
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+            //鎾ら攢
+            revoke(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '鏄惁纭鎾ら攢',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
+                                data: {
+                                    HInterID: item.HInterID,
+                                    HBillNo: item.鍗曟嵁鍙�,
+                                    HBillType: this.hform.HBillType,
+                                    HMaker: uni.getStorageSync('HUserName'),
+                                    MvarReportTitle: this.MvarReportTitle,
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJListStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
index 492629a..a651419 100644
--- a/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
+++ b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
@@ -1,19 +1,831 @@
 <template>
     <view>
-        
+        <view class="tabs" id="tabs">
+            <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+            <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鏄庣粏淇℃伅</view>
+            <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
+            <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view>
+        </view>
+        <!-- 鍩烘湰淇℃伅 -->
+        <template v-if="tabs == 0">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form-item">
+                    <view class="title">璁惧鏉$爜:</view>
+                    <view :class="enableEdit?'right':'righton'">
+                        <input :disabled="!enableEdit" v-model="hform.HBarCode"
+                            @confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)璁惧鏉$爜" />
+                    </view>
+                    <view class="icon-wrapper">
+                        <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇濆吇寮�濮�:</view>
+                    <view class="right">
+                        <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
+                            <input :value="hform.HBeginDate" />
+                        </uni-datetime-picker>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇濆吇缁撴潫:</view>
+                    <view class="right">
+                        <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HEndDate">
+                            <input :value="hform.HEndDate" />
+                        </uni-datetime-picker>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鏈�缁堢粨璁�:</view>
+                    <view class="right none-border">
+                        <radio-group @change="radioChange" class="radio_Container">
+                            <label>
+                                <view>
+                                    <radio value="OK" :checked="calcHLastResult == 'OK'" />
+                                    <text>OK</text>
+                                </view>
+                            </label>
+                            </label>
+                            <view>
+                                <radio value="NG" :checked="calcHLastResult == 'NG'" />
+                                <text>NG</text>
+                            </view>
+                            </label>
+                        </radio-group>
+                    </view>
+                </view>
+
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HBillNo" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鏃ユ湡:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">閮ㄩ棬:</view>
+                    <zxz-uni-data-select class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О" dataValue="HItemID"
+                        v-model="hform.HDeptID">
+
+                    </zxz-uni-data-select>
+                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                </view>
+                <view class="form-item">
+                    <view class="title">澶囨敞:</view>
+                    <view class="right">
+                        <input v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璁惧鍚嶇О:</view>
+                    <view class="righton">
+                        <input v-model="hform.HBarName" disabled />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璁惧瑙勬牸:</view>
+                    <view class="righton">
+                        <input v-model="hform.HBarSpec" disabled />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璁惧鍨嬪彿:</view>
+                    <view class="righton">
+                        <input v-model="hform.HBarModel" disabled />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇濆吇璁″垝:</view>
+                    <view class="righton">
+                        <input v-model="hform.HPlanNo" disabled />
+                    </view>
+                </view>
+            </view>
+        </template>
+        <!-- 鏄庣粏淇℃伅 -->
+        <template v-if="tabs == 1">
+            <view :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form">
+                    <view class="form-item">
+                        <view class="left">
+                            璁惧淇濆吇瑙勭▼
+                        </view>
+                        <view class="right">
+                            <input type="text" :value="hform.HEquipMaintainRuleInterNo" />
+                        </view>
+                        <view class="icon-wrapper">
+                            <uni-icons type="search" size="20" @click="toCheckFile"></uni-icons>
+                        </view>
+                    </view>
+
+                    <view class="list" v-for="(item,index) in HCheckFileList" :key="index">
+                        <uni-card style="margin: 10px;">
+                            <view class="card-detail">
+                                <view class="detail">
+                                    <text>搴忓彿锛�</text>{{index+1}}
+                                </view>
+                                <view class="detail">
+                                    <text>缁撴灉锛�</text>
+                                    <checkbox-group style="display: inline-block;"
+                                        @change="checkBoxChangeHandler(index, $event)">
+                                        <checkbox value="enabled" :checked="item.HMaintainResult" />
+                                    </checkbox-group>
+                                </view>
+                                <view class="detail">
+                                    <text>淇濆吇椤圭洰锛�</text>{{item.HMaintainItem}}
+                                </view>
+                                <view class="detail" v-if="item.HMaintainPart">
+                                    <text>淇濆吇閮ㄤ綅锛�</text>{{item.HMaintainPart}}
+                                </view>
+                                <view class="detail" v-if="item.HClaim">
+                                    <text>鍏蜂綋瑕佹眰锛�</text>{{item.HClaim}}
+                                </view>
+                                <view class="detail">
+                                    <text>璐熻矗浜猴細</text>{{item.HManagerName}}
+                                </view>
+                                <view class="detail" v-if="item.Remark">
+                                    <text>澶囨敞锛�</text>{{item.Remark}}
+                                </view>
+                            </view>
+                        </uni-card>
+                    </view>
+                    <view class="over" v-if="HCheckFileList.length == 0">鏆傛棤鏁版嵁</view>
+                </view>
+            </view>
+        </template>
+        <!-- 鍏朵粬淇℃伅 -->
+        <template v-if="tabs == 2">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form-item">
+                    <view class="title">鍒涘缓浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMaker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍒涘缓鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMakeDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇敼浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HUpDater" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇敼鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HUpDateDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹℃牳浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HChecker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹℃牳鏃堕棿:</view>
+                    <view class="righton">
+                        <input v-model="hform.HCheckDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浣滃簾浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HDeleteMan" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浣滃簾鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HDeleteDate" />
+                    </view>
+                </view>
+            </view>
+
+        </template>
+        <!-- 闄勪欢淇℃伅 -->
+        <template v-if="tabs == 3">
+            <view class="card-item-wrapper">
+                <view class="attachment-btns">
+                    <button type="primary" size="mini" @tap="fileUpload">閫夋嫨鏂囦欢</button>
+                    <view style="flex: 1;"></view>
+                </view>
+                <view v-for="(item, index) in attachmentInfo" :key="index">
+                    <uni-card :title="item['fileName']" :thumbnail="item.filePath">
+                        <view class="card-detail">
+                            <view class="detail">
+                                <text>澶у皬锛�</text>{{item["size"]}}
+                            </view>
+                            <view class="detail">
+                                <text>鐘舵�侊細</text>{{item["status"]}}
+                            </view>
+                            <view class="detail operation" v-if="item['status']!='涓婁紶鎴愬姛'">
+                                <text>鎿嶄綔锛�</text>
+                                <button class="btn-a" size="mini" @tap.stop="uploadFile(index)">涓婁紶</button>
+                                <button class="btn-b" size="mini" @tap.stop="delFile(index)">鍒犻櫎</button>
+                            </view>
+                        </view>
+                    </uni-card>
+                </view>
+            </view>
+        </template>
+        <!-- 鎿嶄綔鎸夐挳 -->
+        <view class="buttons" id="buttons">
+            <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+            <view style="flex: 1;"></view>
+            <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+            <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+        </view>
+        <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
+        <BillSelectorPopupVue @update="billSelectHandler" ref="billSelector" :Type="'BY'"></BillSelectorPopupVue>
     </view>
 </template>
 
 <script>
+    import dayjs from "dayjs";
+    import {
+        CommonUtils
+    } from "@/utils/common";
+    import {
+        MpaasScan
+    } from "@/utils/mpaasScan.js"
+    import {
+        getUserInfo
+    } from "../../../utils/auth";
+    import BillSelectorPopupVue from "../../../components/MJGL/BillSelectorPopup.vue";
     export default {
+        name: 'sb_EquipMaintainBill',
+        components: {
+            BillSelectorPopupVue
+        },
         data() {
             return {
-                
+                tabs: 0,
+                HMainSourceBillType: "",
+                btnTop: 0,
+                tabsBottom: 0,
+                HModName: "sb_EquipMaintainBill",
+                HBillType: '3901',
+                operationType: 1,
+                enableEdit: true,
+                uploadOptions: {},
+
+                HDeptList: [],
+                HShiftsList: [],
+                HCheckFileList: [],
+                attachmentInfo: [],
+
+                hform: {
+                    HBarCode: "",
+                    HBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+                    HEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+                    HQty: 0,
+                    HErrNote: "",
+                    HBigSafeNote: "",
+                    HShiftsName: "",
+                    HShiftsID: 0,
+                    HBillNo: "",
+                    HInterID: 0,
+                    HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+                    HDeptName: "",
+                    HDeptID: 0,
+                    HRemark: "",
+                    HBarName: "",
+                    HEquipID: 0,
+                    HBarSpec: "",
+                    HBarModel: "",
+                    HPlanNo: "",
+                    HPlanInterID: 0,
+                    HPlanEntryID: 0,
+                    HEquipMaintainPlanInterID: 0,
+                    HEquipMaintainPlanEntryID: "",
+                    HMaker: getUserInfo()['Czymc'],
+                    HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                    HUpDater: "",
+                    HUpDateDate: "",
+                    HChecker: "",
+                    HCheckDate: "",
+                    HDeleteMan: "",
+                    HDeleteDate: "",
+                    lngBillKey: 0,
+                    lngBillSubKey: 0,
+                    HLastResult: "OK"
+                }
             };
+        },
+        computed: {
+            containerHeight: {
+                get() {
+                    return this.btnTop - this.tabsBottom - 5
+                }
+            },
+            calcHLastResult: {
+                get() {
+                    if (this.HCheckFileList.length == 0) {
+                        return 'OK'
+                    } else {
+                        let okCount = this.HCheckFileList.reduce((acc, item) => {
+                            if (item.HMaintainResult) {
+                                return acc + 1
+                            }
+                            return acc
+                        }, 0)
+                        if (okCount == this.HCheckFileList.length) {
+                            return 'OK'
+                        }
+                        return 'NG'
+                    }
+                }
+            }
+
+        },
+        methods: {
+            billSelectHandler(billData) {
+                console.log('billData: ', billData);
+                let data = billData.retVal[this.hform.HEquipID]
+                this.get_DocCheckItem2(data.hmainid)
+            },
+            // 鑾峰彇淇濆吇瑙勭▼
+            async get_DocCheckItem2(HEquipMaintainRuleInterID) {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Web/GetMaintainItemByMaintainRuleID",
+                        data: {
+                            "HEquipMaintainRuleInterID": HEquipMaintainRuleInterID
+                        },
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        console.log('data: ', data);
+                        this.hform.HEquipMaintainRuleInterID = data[0].淇濆吇瑙勭▼ID
+                        this.hform.HEquipMaintainRuleInterNo = data[0].淇濆吇瑙勭▼鍗曞彿
+                        this.hform.HPlanNo = data[0].淇濆吇璁″垝鍗�
+                        this.hform.HEquipMaintainPlanInterID = (data[0].淇濆吇璁″垝ID == null ? 0 : data[0].淇濆吇璁″垝ID) == "" ?
+                            0 : data[0].淇濆吇璁″垝ID
+                        this.hform.HEquipMaintainPlanEntryID = (data[0].淇濆吇璁″垝瀛怚D == null ? 0 : data[0].淇濆吇璁″垝瀛怚D) ==
+                            "" ? 0 : data[0].淇濆吇璁″垝瀛怚D
+                        this.hform.HMainSourceBillNo = data[0].淇濆吇璁″垝鍗�
+                        this.hform.HMainSourceInterID = (data[0].淇濆吇璁″垝ID == null ? 0 : data[0].淇濆吇璁″垝ID) == "" ? 0 :
+                            data[0].淇濆吇璁″垝ID
+                        this.hform.HMainSourceEntryID = (data[0].淇濆吇璁″垝瀛怚D == null ? 0 : data[0].淇濆吇璁″垝瀛怚D) == "" ? 0 :
+                            data[0].淇濆吇璁″垝瀛怚D
+                        
+                        this.HCheckFileList = Array.from(data).map(item => {
+                            return {
+                                "HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
+                                "HMaintainItemID": item.HMaintainItemID,
+                                "HMaintainNumber": item.淇濆吇椤圭洰浠g爜,
+                                "HMaintainItem": item.淇濆吇椤圭洰,
+                                "HMaintainPart": item.淇濆吇閮ㄤ綅,
+                                "HClaim": item.鍏蜂綋瑕佹眰,
+                                "HManagerID": item.璐熻矗浜篒D,
+                                "HManagerNumber": item.璐熻矗浜轰唬鐮�,
+                                "HManagerName": item.璐熻矗浜哄悕绉�,
+                                "HRemark": "",
+                                "HSourceInterID": item.淇濆吇璁″垝ID || 0,
+                                "HSourceEntryID": item.淇濆吇璁″垝瀛怚D || 0,
+                                "HSourceBillNo": item.淇濆吇璁″垝鍗� || ""
+                            }
+                        })
+
+                        this.enableEdit = false
+                        this.$refs["billSelector"].exit()
+
+                    } else {
+                        CommonUtils.showTips({
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        message: err
+                    })
+                }
+
+
+
+            },
+            toCheckFile() {
+                if (this.hform.HEquipID == 0) {
+                    return CommonUtils.showTips({
+                        message: '涓嶈兘閫夋嫨淇濆吇瑙勭▼锛岃鍏堟壂鎻忚澶囨潯鐮�!!!'
+                    })
+                }
+                this.$refs['billSelector'].showPopup(this.hform.HEquipID)
+            },
+            ValidCheck() {
+                if (this.hform.HEquipID == 0) {
+                    return {
+                        Message: "鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!",
+                        state: false
+                    }
+                }
+
+                return {
+                    Message: "",
+                    state: true
+                }
+            },
+            addNew() {
+                uni.redirectTo({
+                    url: './Sb_EquipMaintainBill?operationType=1'
+                })
+            },
+            goBack() {
+                uni.navigateBack()
+            },
+            checkBoxChangeHandler(index, e) {
+                let cr = e.detail.value
+                if (cr.length == 0) {
+                    this.HCheckFileList[index]["HMaintainResult"] = false
+                } else {
+                    this.HCheckFileList[index]["HMaintainResult"] = true
+                }
+            },
+            uploadFile(index) {
+                console.log('filePath: ', this.attachmentInfo[index].filePath);
+                // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
+                uni.uploadFile({
+                    url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
+                    filePath: this.attachmentInfo[index].filePath,
+                    name: 'file',
+                    formData: {
+                        HBillNo: this.hform.HBillNo,
+                        HRemark: "",
+                        HUserName: getUserInfo()["Czymc"]
+                    },
+                    success: (uploadRes) => {
+                        CommonUtils.showTips({
+                            message: "涓婁紶鎴愬姛"
+                        })
+                        this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
+                    },
+                    fail: (err) => {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `涓婁紶澶辫触: ${err}`
+                        })
+                    }
+                })
+            },
+            delFile(index) {
+                console.log('attachmentInfo: ', this.attachmentInfo[index]);
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            this.attachmentInfo.splice(index, 1)
+                        }
+                    },
+                })
+
+            },
+            handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
+                console.log('file: ', res);
+                let fileInfo = res.data[0]
+                this.attachmentInfo.push({
+                    fileName: fileInfo.name,
+                    size: fileInfo.size,
+                    status: '绛夊緟涓婁紶',
+                    filePath: fileInfo.tempFilePath
+                })
+            },
+            // 涓婁紶鏂囦欢
+            fileUpload() {
+                this.$refs.XeUpload.upload('file', {});
+            },
+            //鑾峰彇鐝鏁版嵁
+            async getShiftList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Web/GetGy_ShiftsList_Json',
+                        data: {
+                            Shifts: "",
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HShiftsList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+            async getHDeptList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Gy_Department/list',
+                        data: {
+                            sWhere: "",
+                            user: uni.getStorageSync('HUserName'),
+                            Organization: uni.getStorageSync('Organization')
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HDeptList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            toScanCode() {
+                MpaasScan.scanCode(cb => {
+                    this.hfrom.HBarCode = cb
+                    this.GetMessageByBarCode(cb)
+                })
+            },
+            async GetMessageByBarCode(HBarCode) {
+                try {
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: "/Gy_EquipFileBill/txtHBarCode_KeyDown",
+                        data: {
+                            HBarCode: HBarCode,
+                            user: getUserInfo()["Czymc"]
+                        },
+                    })
+
+
+                    if (!res) {
+                        return
+                    }
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+
+                    console.log('data: ', data);
+
+                    if (count == 1) {
+                        this.hform.HEquipID = data[0].HInterID
+                        this.hform.HBarName = data[0].璁惧鍚嶇О
+                        this.hform.HBarSpec = data[0].璁惧瑙勬牸
+                        this.hform.HBarModel = data[0].璁惧鍨嬪彿
+                        this.hform.HQty = 1
+
+                        // 鑾峰彇妫�楠岃绋�
+                        this.GetItemByEquipFile()
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: Message
+                        })
+                    }
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: err
+                    })
+                }
+            },
+            async GetItemByEquipFile() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Web/GetItemByEquipFile",
+                        data: {
+                            "EquipProjectID": this.hform.HEquipID,
+                            "Type": "BY",
+                            "HDate": this.hform.HBeginDate
+                        }
+                    })
+
+                    let {
+                        data,
+                        Message,
+                        count
+                    } = res.data
+                    if (count == 1) {
+                        this.hform.HEquipMaintainRuleInterID = data[0].淇濆吇瑙勭▼ID
+                        this.hform.HEquipMaintainRuleInterNo = data[0].淇濆吇瑙勭▼鍗曞彿
+                        this.hform.HPlanNo = data[0].淇濆吇璁″垝鍗�
+                        this.hform.HEquipMaintainPlanInterID = (data[0].淇濆吇璁″垝ID == null ? 0 : data[0].淇濆吇璁″垝ID) == "" ?
+                            0 : data[0].淇濆吇璁″垝ID
+                        this.hform.HEquipMaintainPlanEntryID = (data[0].淇濆吇璁″垝瀛怚D == null ? 0 : data[0].淇濆吇璁″垝瀛怚D) ==
+                            "" ? 0 : data[0].淇濆吇璁″垝瀛怚D
+                        this.hform.HMainSourceBillNo = data[0].淇濆吇璁″垝鍗�
+                        this.hform.HMainSourceInterID = (data[0].淇濆吇璁″垝ID == null ? 0 : data[0].淇濆吇璁″垝ID) == "" ? 0 :
+                            data[0].淇濆吇璁″垝ID
+                        this.hform.HMainSourceEntryID = (data[0].淇濆吇璁″垝瀛怚D == null ? 0 : data[0].淇濆吇璁″垝瀛怚D) == "" ? 0 :
+                            data[0].淇濆吇璁″垝瀛怚D
+
+                        this.HCheckFileList = Array.from(data).map(item => {
+                            return {
+                                "HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
+                                "HMaintainItemID": item.淇濆吇椤圭洰ID,
+                                "HMaintainNumber": item.淇濆吇椤圭洰浠g爜,
+                                "HMaintainItem": item.淇濆吇椤圭洰鍚嶇О,
+                                "HMaintainPart": item.淇濆吇閮ㄤ綅,
+                                "HClaim": item.鍏蜂綋瑕佹眰,
+                                "HManagerID": item.璐熻矗浜篒D,
+                                "HManagerNumber": item.璐熻矗浜轰唬鐮�,
+                                "HManagerName": item.璐熻矗浜哄悕绉�,
+                                "HRemark": "",
+                                "HSourceInterID": item.淇濆吇璁″垝ID,
+                                "HSourceEntryID": item.淇濆吇璁″垝瀛怚D,
+                                "HSourceBillNo": item.淇濆吇璁″垝鍗�
+                            }
+                        })
+
+                        this.enableEdit = false
+
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鑾峰彇淇濆吇瑙勭▼閿欒锛� ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
+                    })
+                }
+            },
+            radioChange({
+                detail: {
+                    value
+                }
+            }) {
+                this.HLastResult = value
+            },
+            async getMaxNum() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Web/GetMAXNum",
+                        data: {
+                            "HBillType": this.HBillType
+                        }
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message
+                    } = res.data
+                    console.log('data: ', data);
+                    this.hform.HInterID = 0
+                    this.hform.HBillNo = data[0]["HBillNo"]
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+                    })
+                }
+            },
+            async submit() {
+                let valid = this.ValidCheck()
+                if (!valid.state) {
+                    return CommonUtils.showTips({
+                        message: valid.Message
+                    })
+                }
+
+                try {
+                    let oMain = JSON.stringify(this.hform);
+                    let sSubStr = JSON.stringify(this.HCheckFileList);
+                    let sMainSub = oMain + ';' + sSubStr;
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: "/Sb_PDA_EquipMaintainBill/SaveGetEquipMaintainBillList",
+                        data: {
+                            "msg": sMainSub
+                        },
+                        method: "POST"
+                    })
+
+                    if (!res) {
+                        return
+                    }
+
+                    let {
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        uni.showModal({
+                            title: '鎻愮ず',
+                            content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+                            success: (res) => {
+                                if (res.confirm) {
+                                    console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                                    uni.redirectTo({
+                                        url: '/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill?operationType=1'
+                                    })
+                                } else if (res.cancel) {
+                                    console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                                    setTimeout(() => {
+                                        uni.navigateBack();
+                                    }, 50)
+                                }
+                            }
+                        });
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+                        })
+                    }
+
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "鎻愪氦鍗曟嵁澶辫触: " + err
+                    })
+                }
+            }
+        },
+        onLoad(e) {
+            console.log('e: ', e);
+            if (!e.operationType) {
+                this.operationType = 1
+            } else {
+                this.operationType = e.operationType
+            }
+
+            if (this.operationType == 1) {
+                // 鏂板
+                this.getMaxNum()
+            } else if (this.operationType == 2) {
+                // 澶嶅埗
+            } else if (this.operationType == 3) {
+                // 缂栬緫
+
+            } else if (this.operationType == 4) {
+                // 娴忚
+
+            }
+
+            this.getHDeptList()
+            this.getShiftList()
+        },
+        onReady() {
+            const query = uni.createSelectorQuery().in(this)
+            query.select("#buttons")
+                .boundingClientRect()
+                .select("#tabs")
+                .boundingClientRect()
+                .exec(res => {
+                    this.btnTop = Math.floor(res[0].top)
+                    this.tabsBottom = Math.ceil(res[1].bottom)
+                })
         }
     }
 </script>
 
-<style lang="scss">
-
-</style>
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJBillStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList.vue b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList.vue
new file mode 100644
index 0000000..73ade7e
--- /dev/null
+++ b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList.vue
@@ -0,0 +1,472 @@
+<template>
+    <view class="content">
+        <view class="form">
+            <view class="form-item">
+                <view class="title">寮�濮嬫椂闂�:</view>
+                <view class="right">
+                    <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
+                        <input :value="hform.HBeginDate" />
+                    </uni-datetime-picker>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">缁撴潫鏃堕棿:</view>
+                <view class="right">
+                    <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HEndDate">
+                        <input :value="hform.HEndDate" />
+                    </uni-datetime-picker>
+                </view>
+            </view>
+            <view v-if="showmore">
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�:</view>
+                    <view class="right">
+                        <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+                    </view>
+                </view>
+
+            </view>
+            <view class="other">
+                <view v-if="!showmore" @tap="changeShowMore">
+                    灞曞紑鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
+                </view>
+                <view v-if="showmore" @tap="changeShowMore">
+                    鎶樺彔鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
+                </view>
+            </view>
+
+            <view class="buttons">
+                <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+                <button class="btn-b" size="mini" type="default" @tap="add">鏂板</button>
+                <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+            </view>
+        </view>
+
+        <view id="divide" style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+        <view :style="{
+            height: calcContentHeight + 'px',
+            overflowY: 'auto'
+        }">
+            <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+                <uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+                    @tap="showDetail = showDetail==index?-1:index">
+                    <view class="card-detail">
+                        <view class="detail" v-if="item.鍒跺崟浜�">
+                            <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+                        </view>
+                        <view class="detail" v-if="item.璁惧浠g爜">
+                            <text>璁惧浠g爜锛�</text>{{item.璁惧浠g爜}}
+                        </view>
+                        <view class="detail" v-if="item.璁惧鍚嶇О">
+                            <text>璁惧鍚嶇О锛�</text>{{item.璁惧鍚嶇О}}
+                        </view>
+                        <view class="detail" v-if="item.鏈�缁堢粨璁�">
+                            <text>鏈�缁堢粨璁猴細</text>{{item.鏈�缁堢粨璁簘}
+                        </view>
+                        <view class="card-detail" v-if="showDetail == index">
+
+
+                            <view class="detail" v-if="item.琛ㄥご澶囨敞">
+                                <text>琛ㄥご澶囨敞锛�</text>{{item.琛ㄥご澶囨敞}}
+                            </view>
+                            <view class="detail" v-if="item.寮�濮嬫棩鏈�">
+                                <text>寮�濮嬫棩鏈燂細</text>{{dayjs(item.寮�濮嬫棩鏈�).format("YYYY-MM-DD HH:mm:DD")}}
+                            </view>
+                            <view class="detail" v-if="item.缁撴潫鏃ユ湡">
+                                <text>缁撴潫鏃ユ湡锛�</text>{{dayjs(item.缁撴潫鏃ユ湡).format("YYYY-MM-DD HH:mm:DD")}}
+                            </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.hmainid">
+                                <text>鍐呴儴鍗曟嵁鍙凤細</text>{{item.hmainid}}
+                            </view>
+                        </view>
+                    </view>
+
+                    <view class="more" v-if="showDetail == index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+                    <view class="more" v-if="showDetail != index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+                    <view class="op" v-if="operations == index">
+                        <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+                        <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+                        <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+                    </view>
+                </uni-card>
+            </view>
+        </view>
+        <view class="pagination-zone" id="pagination-zone">
+            <uni-pagination show-icon :page-size="size" :total="dataLength" :current="page"
+                @change="onPaginationChangeHandler"></uni-pagination>
+        </view>
+        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+    </view>
+</template>
+
+<script>
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import BarCodePopupVue from "@/components/BarCodePopup/BarCodePopup.vue";
+    import {
+        CommonUtils
+    } from "../../../utils/common";
+    import dayjs from "dayjs";
+    export default {
+        data() {
+            return {
+                dayjs,
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                tabs: 0,
+                urls: '/Web/GetEquipmentBillsList',
+                MvarReportTitle: '璁惧鐐规璁板綍鍗曠紦瀛�',
+                hform: {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 3901,
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    Type: "BY",
+                    sWhere: "",
+                    HBeginDate: dayjs(new Date()).subtract(30, 'day').format("YYYY-MM-DD"),
+                    HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                },
+                sWhere: '',
+                listData: [],
+                showList: [],
+                showDetail: -1,
+                operations: -1,
+
+                page: 1,
+                size: 20,
+                dataLength: 0,
+                divideBottom: 0,
+                paginationTop: 0,
+                showmore: false,
+            }
+        },
+        computed: {
+            calcContentHeight: {
+                get() {
+                    return this.paginationTop - this.divideBottom
+                }
+            }
+        },
+        onShow() {
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            this.CheckModRight()
+            this.changeTab(0)
+            console.log(this.userInfo, uni.getStorageSync('HUserName'))
+        },
+        components: {
+            BarCodePopupVue
+        },
+        onPullDownRefresh: function() {
+            this.clear()
+            setTimeout(() => {
+                uni.stopPullDownRefresh();
+            }, 1000);
+        },
+        onReady() {
+            this.getCalcHeight()
+        },
+        methods: {
+            changeShowMore() {
+                this.showmore = !this.showmore
+                this.$nextTick(() => {
+                    // 閲嶆柊璁$畻鍐呭瑙嗗彛楂樺害
+                    this.getCalcHeight()
+                })
+            },
+            getCalcHeight() {
+                let query = uni.createSelectorQuery().in(this)
+                query
+                    .select("#divide")
+                    .boundingClientRect()
+                    .select("#pagination-zone")
+                    .boundingClientRect()
+                    .exec(res => {
+                        this.divideBottom = Math.ceil(res[0].bottom)
+                        this.paginationTop = Math.floor(res[1].top)
+                    })
+            },
+            async qrCodeDisplay(item) {
+                this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+                await this.$nextTick()
+                this.$refs.barcodePopup.open()
+            },
+            CheckModRight() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+                    data: {
+                        ModRightName: 'CE_OtherOut',
+                        HUserName: uni.getStorageSync('HUserName')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {} else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            onPaginationChangeHandler({
+                current
+            }) {
+                this.page = current
+                this.showList = this.getPage(current, this.size, this.listData)
+            },
+            getPage(page, size, list) {
+                let sindex = (parseInt(page) - 1) * size
+                let eindex = parseInt(page) * size
+                let newList = list.slice(sindex, eindex)
+                return newList
+            },
+            changeTab(e) {
+                this.tabs = e
+                this.page = 1
+                this.showList = []
+
+                if (this.tabs == 0) {
+                    this.urls = '/Web/GetEquipmentBillsList'
+                }
+                // if (this.tabs == 1) {
+                // 	this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+                // }
+                this.search()
+            },
+            async getList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: this.urls,
+                        data: this.hform
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message
+                    } = res.data
+
+                    if (count == 1) {
+                        if(data == null) {
+                           data = []
+                        }
+                        this.listData = data
+                        this.showList = this.getPage(this.page, this.size, data)
+                        console.log('this.showList: ', this.showList);
+                        this.dataLength = data.length
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${err}`
+                    })
+                }
+
+            },
+            search() {
+                this.hform.sWhere = ''
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                console.log(this.hform)
+                if (this.hform.HBillNo) {
+                    this.hform.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+                }
+                if (this.hform.HBeginDate && this.hform.HEndDate) {
+                    this.hform.sWhere +=
+                        ` and 鏃ユ湡 between convert(date, '${this.hform.HBeginDate}') and convert(date, '${this.hform.HEndDate}')`;
+                }
+                this.getList()
+            },
+            clear() {
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                this.sWhere = ''
+                this.hform = {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 3901,
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    sWhere: '',
+                    Type: "BY",
+                    HBeginDate: dayjs(new Date()).subtract(30, 'day').format("YYYY-MM-DD"),
+                    HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                }
+                this.search()
+            },
+            add() {
+                uni.navigateTo({
+                    url: '/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill?operationType=1'
+                })
+            },
+            //缂栬緫
+            edit(item) {
+                console.log(item)
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
+                    data: {
+                        "HInterID": item.HInterID,
+                        "HBillNo": item.鍗曟嵁鍙�,
+                        "HBillType": this.hform.HBillType
+                    },
+                    success: (res) => {
+                        console.log(1, res);
+                        if (res.data.count == 1) {
+                            uni.navigateTo({
+                                url: './OtherOutBill?OperationType=2&HInterID=' + item.HInterID
+                            })
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.hideLoading()
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                })
+            },
+            //鍒犻櫎
+            del(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/Sb_EquipMaintainBill/DeltetEquipMaintainBillList',
+                                data: {
+                                    HInterID: item.hmainid,
+                                    user: uni.getStorageSync('HUserName'),
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+            //鎾ら攢
+            revoke(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '鏄惁纭鎾ら攢',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
+                                data: {
+                                    HInterID: item.HInterID,
+                                    HBillNo: item.鍗曟嵁鍙�,
+                                    HBillType: this.hform.HBillType,
+                                    HMaker: uni.getStorageSync('HUserName'),
+                                    MvarReportTitle: this.MvarReportTitle,
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJListStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
new file mode 100644
index 0000000..19c06df
--- /dev/null
+++ b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
@@ -0,0 +1,736 @@
+<template>
+    <view>
+        <view class="tabs" id="tabs">
+            <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+            <!-- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鏄庣粏淇℃伅</view> -->
+            <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
+            <!-- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view> -->
+        </view>
+        <!-- 鍩烘湰淇℃伅 -->
+        <template v-if="tabs == 0">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form-item">
+                    <view class="title">璁惧鏉$爜:</view>
+                    <view :class="enableEdit?'right':'righton'">
+                        <input v-model="hform.HBarCode" :disabled="!enableEdit"
+                            @confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)璁惧鏉$爜" />
+                    </view>
+                    <view class="icon-wrapper">
+                        <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鏈�缁堢粨璁�:</view>
+                    <view class="right none-border">
+                        <radio-group @change="radioChange" class="radio_Container">
+                            <label>
+                                <view>
+                                    <radio value="OK" :checked="hform.HCheckResult == 'OK'" />
+                                    <text>OK</text>
+                                </view>
+                            </label>
+                            </label>
+                            <view>
+                                <radio value="NG" :checked="hform.HCheckResult == 'NG'" />
+                                <text>NG</text>
+                            </view>
+                            </label>
+                        </radio-group>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">楠岃瘉鍐呭:</view>
+                    <view class="right">
+                        <textarea v-model="hform.HRepairCheckMainContent" placeholder="璇疯緭鍏ラ獙璇佸唴瀹�" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HBillNo" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鏃ユ湡:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title required">閮ㄩ棬:</view>
+                    <zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
+                        dataValue="HItemID" v-model="hform.HDeptID">
+
+                    </zxz-uni-data-select>
+                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                </view>
+                <view class="form-item">
+                    <view class="title required">楠屾敹浜�:</view>
+                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+                        dataValue="HItemID" v-model="hform.HEmpID">
+
+                    </zxz-uni-data-select>
+                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                </view>
+                <view class="form-item">
+                    <view class="title required">楠岃瘉椤圭洰:</view>
+                    <zxz-uni-data-select required class="right" :localdata="HRepairCheckList" dataKey="缁翠慨楠屾敹椤圭洰"
+                        dataValue="hitemid" v-model="hform.HRepairCheckMainID">
+
+                    </zxz-uni-data-select>
+                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                </view>
+                <view class="form-item">
+                    <view class="title required">璐熻矗浜�:</view>
+                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+                        dataValue="HItemID" v-model="hform.HManagerID">
+
+                    </zxz-uni-data-select>
+                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                </view>
+                <view class="form-item">
+                    <view class="title">璁惧鍚嶇О:</view>
+                    <view class="righton">
+                        <input v-model="hform.HBarName" disabled />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璁惧瑙勬牸:</view>
+                    <view class="righton">
+                        <input v-model="hform.HBarSpec" disabled />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璁惧鍨嬪彿:</view>
+                    <view class="righton">
+                        <input v-model="hform.HBarModel" disabled />
+                    </view>
+                </view>
+            </view>
+        </template>
+        <!-- 鍏朵粬淇℃伅 -->
+        <template v-if="tabs == 2">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form-item">
+                    <view class="title">鍒涘缓浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMaker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍒涘缓鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMakeDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇敼浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HUpDater" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇敼鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HUpDateDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹℃牳浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HChecker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹℃牳鏃堕棿:</view>
+                    <view class="righton">
+                        <input v-model="hform.HCheckDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浣滃簾浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HDeleteMan" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浣滃簾鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HDeleteDate" />
+                    </view>
+                </view>
+            </view>
+
+        </template>
+        <!-- 鎿嶄綔鎸夐挳 -->
+        <view class="buttons" id="buttons">
+            <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+            <view style="flex: 1;"></view>
+            <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+            <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+        </view>
+        <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
+    </view>
+</template>
+
+<script>
+    import dayjs from "dayjs";
+    import {
+        CommonUtils
+    } from "@/utils/common";
+    import {
+        MpaasScan
+    } from "@/utils/mpaasScan.js"
+    import {
+        getUserInfo
+    } from "../../../utils/auth";
+    export default {
+        name: 'sb_EquipRepairCheckBill',
+        data() {
+            return {
+                tabs: 0,
+                HMainSourceBillType: "",
+                btnTop: 0,
+                tabsBottom: 0,
+                HModName: "sb_EquipRepairCheckBill",
+                HBillType: '3911',
+                operationType: 1,
+                uploadOptions: {},
+                enableEdit: true,
+
+                HDeptList: [],
+                HRepairCheckList: [],
+                HEmpList: [],
+
+                hform: {
+                    "HBarCode": "",
+                    "HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+                    "HCheckResult": "OK",
+                    "HRepairCheckMainContent": "",
+                    "HBillNo": "",
+                    "HInterID": 0,
+                    "HDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+                    "HDeptName": "",
+                    "HDeptID": 0,
+                    "HEmpName": "",
+                    "HEmpID": 0,
+                    "HRepairCheckMainName": "",
+                    "HRepairCheckMainID": 0,
+                    "HManagerName": "",
+                    "HManagerID": 0,
+                    "HBarName": "",
+                    "HEquipID": 0,
+                    "HBarSpec": "",
+                    "HBarModel": "",
+                    "HMaker": getUserInfo()["Czymc"],
+                    "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+                    "HUpDater": "",
+                    "HUpDateDate": "",
+                    "HChecker": "",
+                    "HCheckDate": "",
+                    "HDeleteMan": "",
+                    "HDeleteDate": "",
+                    "lngBillKey": "",
+                    "lngBillSubKey": ""
+                },
+                HBillSub: [{ // 鍚庣鎺ュ彛闇�瑕併�傚惁鍒欐暟鎹笉浼氭樉绀哄湪缂撳瓨涓�
+                    "HRepairID": 0,
+                    "HRepairCode": "",
+                    "HRepairName": "",
+                    "HManagerID": 0,
+                    "HManagerCode": "",
+                    "HManagerName": "",
+                    "HRepairExplanation": "",
+                    "HRemark": "",
+                    "LAY_TABLE_INDEX": 0
+                }]
+            };
+        },
+        computed: {
+            containerHeight: {
+                get() {
+                    return this.btnTop - this.tabsBottom - 5
+                }
+            },
+        },
+        methods: {
+            // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
+            ValidCheck() {
+                if (this.hform.HEquipID == 0) {
+                    return {
+                        Message: "鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!",
+                        state: false
+                    }
+                }
+                if (this.hform.HDeptID == 0) {
+                    return {
+                        Message: "閮ㄩ棬涓嶅緱涓虹┖!",
+                        state: false
+                    }
+                }
+                if (this.hform.HEmpID == 0) {
+                    return {
+                        Message: "楠屾敹浜轰笉寰椾负绌�!",
+                        state: false
+                    }
+                }
+                if (this.hform.HRepairCheckMainID == 0) {
+                    return {
+                        Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
+                        state: false
+                    }
+                }
+                if (this.hform.HManagerID == 0) {
+                    return {
+                        Message: "璐熻矗浜轰笉寰椾负绌�!",
+                        state: false
+                    }
+                }
+
+                return {
+                    Message: "",
+                    state: true
+                }
+            },
+            addNew() {
+                uni.redirectTo({
+                    url: './Sb_EquipRepairCheckBill?operationType=1'
+                })
+            },
+            goBack() {
+                uni.navigateBack()
+            },
+            checkBoxChangeHandler(index, e) {
+                let cr = e.detail.value
+                if (cr.length == 0) {
+                    this.HCheckFileList[index]["HDotCheckResult"] = false
+                } else {
+                    this.HCheckFileList[index]["HDotCheckResult"] = true
+                }
+            },
+            uploadFile(index) {
+                console.log('filePath: ', this.attachmentInfo[index].filePath);
+                // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
+                uni.uploadFile({
+                    url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
+                    filePath: this.attachmentInfo[index].filePath,
+                    name: 'file',
+                    formData: {
+                        HBillNo: this.hform.HBillNo,
+                        HRemark: "",
+                        HUserName: getUserInfo()["Czymc"]
+                    },
+                    success: (uploadRes) => {
+                        CommonUtils.showTips({
+                            message: "涓婁紶鎴愬姛"
+                        })
+                        this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
+                    },
+                    fail: (err) => {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `涓婁紶澶辫触: ${err}`
+                        })
+                    }
+                })
+            },
+            delFile(index) {
+                console.log('attachmentInfo: ', this.attachmentInfo[index]);
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            this.attachmentInfo.splice(index, 1)
+                        }
+                    },
+                })
+
+            },
+            handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
+                console.log('file: ', res);
+                let fileInfo = res.data[0]
+                this.attachmentInfo.push({
+                    fileName: fileInfo.name,
+                    size: fileInfo.size,
+                    status: '绛夊緟涓婁紶',
+                    filePath: fileInfo.tempFilePath
+                })
+            },
+            // 涓婁紶鏂囦欢
+            fileUpload() {
+                this.$refs.XeUpload.upload('file', {});
+            },
+            //鑾峰彇鐝鏁版嵁
+            async getShiftList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Web/GetGy_ShiftsList_Json',
+                        data: {
+                            Shifts: "",
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HShiftsList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+            async getHDeptList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Gy_Department/list',
+                        data: {
+                            sWhere: "",
+                            user: uni.getStorageSync('HUserName'),
+                            Organization: uni.getStorageSync('Organization')
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HDeptList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            // 鑾峰彇鑱屽憳鏁版嵁
+            async getEmpList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/PublicPageMethod/UserList',
+                        data: {
+                            sWhere: " where 1=1",
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HEmpList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            // 鑾峰彇楠岃瘉椤圭洰鏁版嵁
+            async getCheckProjList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Gy_RepairCheck/GetRepairCheckList',
+                        data: {
+                            sWhere: "",
+                            user: uni.getStorageSync('HUserName'),
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HRepairCheckList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            toScanCode() {
+                MpaasScan.scanCode(cb => {
+                    this.hfrom.HBarCode = cb
+                    this.GetMessageByBarCode(cb)
+                })
+            },
+            async GetMessageByBarCode(HBarCode) {
+                try {
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List",
+                        data: {
+                            HBarCode: HBarCode,
+                        },
+                    })
+
+
+                    if (!res) {
+                        return
+                    }
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+
+                    if (count == 1) {
+                        console.log('data: ', data);
+                        this.hform.HEquipID = data[0].hmainid
+                        this.hform.HBarName = data[0].璁惧鍚嶇О
+                        this.hform.HBarSpec = data[0].璁惧瑙勬牸
+                        this.hform.HBarModel = data[0].璁惧鍨嬪彿
+                        this.hform.HQty = 1
+
+                        this.enableEdit = false
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: Message
+                        })
+                    }
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: err
+                    })
+                }
+            },
+            async GetItemByEquipFile() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Web/GetItemByEquipFile",
+                        data: {
+                            "EquipProjectID": this.hform.HEquipID,
+                            "Type": "DJ",
+                            "HDate": this.hform.HBeginDate
+                        }
+                    })
+
+                    let {
+                        data,
+                        Message,
+                        count
+                    } = res.data
+                    if (count == 1) {
+                        this.hform.HEquipDotCheckRuleInterID = data[0].鐐规瑙勭▼ID
+                        this.hform.HEquipDotCheckRuleInterNo = data[0].鐐规瑙勭▼鍗曞彿
+                        this.hform.HPlanNo = data[0].鐐规璁″垝鍗�
+                        this.hform.HPlanInterID = (data[0].鐐规璁″垝ID == null ? 0 : data[0].鐐规璁″垝ID) == "" ? 0 : data[0]
+                            .鐐规璁″垝ID
+                        this.hform.HPlanEntryID = (data[0].鐐规璁″垝瀛怚D == null ? 0 : data[0].鐐规璁″垝瀛怚D) == "" ? 0 : data[
+                            0].鐐规璁″垝瀛怚D
+
+                        this.HCheckFileList = Array.from(data).map(item => {
+                            return {
+                                "HDotCheckItemID": item.HDotCheckItemID,
+                                "HDotCheckCode": item.鐐规椤圭洰浠g爜,
+                                "HDotCheckItem": item.鐐规椤圭洰,
+                                "HDotCheckPart": item.鐐规閮ㄤ綅,
+                                "HClaim": item.鍏蜂綋瑕佹眰,
+                                "HManagerID": item.璐熻矗浜篒D,
+                                "HManagerCode": item.璐熻矗浜轰唬鐮�,
+                                "HManagerName": item.璐熻矗浜哄悕绉�,
+                                "HSourceInterID": item.鐐规璁″垝ID == null ? 0 : item.鐐规璁″垝ID,
+                                "HSourceEntryID": item.鐐规璁″垝瀛怚D == null ? 0 : item.鐐规璁″垝瀛怚D,
+                                "HSourceBillNo": item.鐐规璁″垝鍗�,
+                                "HDotCheckItemClassID": 0,
+                                "HDotCheckItemClassName": "",
+                                "HDotCheckItemMethodID": 0,
+                                "HDotCheckItemMethodName": "",
+                                "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
+                            }
+                        })
+
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
+                    })
+                }
+            },
+            radioChange({
+                detail: {
+                    value
+                }
+            }) {
+                this.hform.HCheckResult = value
+            },
+            async getMaxNum() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Web/GetMAXNum",
+                        data: {
+                            "HBillType": this.HBillType
+                        }
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message
+                    } = res.data
+                    console.log('data: ', data);
+                    this.hform.HInterID = 0
+                    this.hform.HBillNo = data[0]["HBillNo"]
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+                    })
+                }
+            },
+            async submit() {
+                let valid = this.ValidCheck()
+                if (!valid.state) {
+                    CommonUtils.showTips({
+                        message: valid.Message
+                    })
+                    return
+                }
+
+                try {
+                    let oMain = JSON.stringify(this.hform);
+                    let sSubStr = JSON.stringify(this.HBillSub);
+                    let sMainSub = oMain + ';' + sSubStr + ';' + getUserInfo()['Czymc'];
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: "/Sb_EqpRepairWorkBill/SaveGetEqpRepairCheckBillList",
+                        data: {
+                            "msg": sMainSub
+                        },
+                        method: "POST"
+                    })
+
+                    if (!res) {
+                        return
+                    }
+
+                    let {
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        uni.showModal({
+                            title: '鎻愮ず',
+                            content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+                            success: (res) => {
+                                if (res.confirm) {
+                                    console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                                    uni.redirectTo({
+                                        url: '/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill?operationType=1'
+                                    })
+                                } else if (res.cancel) {
+                                    console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                                    setTimeout(() => {
+                                        uni.navigateBack();
+                                    }, 50)
+                                }
+                            }
+                        });
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+                        })
+                    }
+
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "鎻愪氦鍗曟嵁澶辫触: " + err
+                    })
+                }
+            }
+        },
+        onLoad(e) {
+            console.log('e: ', e);
+            if (!e.operationType) {
+                this.operationType = 1
+            } else {
+                this.operationType = e.operationType
+            }
+
+            if (this.operationType == 1) {
+                // 鏂板
+                this.getMaxNum()
+            } else if (this.operationType == 2) {
+                // 澶嶅埗
+            } else if (this.operationType == 3) {
+                // 缂栬緫
+
+            } else if (this.operationType == 4) {
+                // 娴忚
+
+            }
+
+            this.getHDeptList()
+            this.getEmpList()
+            this.getCheckProjList()
+        },
+        onReady() {
+            const query = uni.createSelectorQuery().in(this)
+            query.select("#buttons")
+                .boundingClientRect()
+                .select("#tabs")
+                .boundingClientRect()
+                .exec(res => {
+                    this.btnTop = Math.floor(res[0].top)
+                    this.tabsBottom = Math.ceil(res[1].bottom)
+                })
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJBillStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList.vue b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList.vue
new file mode 100644
index 0000000..174694f
--- /dev/null
+++ b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList.vue
@@ -0,0 +1,472 @@
+<template>
+    <view class="content">
+        <view class="form">
+            <view class="form-item">
+                <view class="title">寮�濮嬫椂闂�:</view>
+                <view class="right">
+                    <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
+                        <input :value="hform.HBeginDate" />
+                    </uni-datetime-picker>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">缁撴潫鏃堕棿:</view>
+                <view class="right">
+                    <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HEndDate">
+                        <input :value="hform.HEndDate" />
+                    </uni-datetime-picker>
+                </view>
+            </view>
+            <view v-if="showmore">
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�:</view>
+                    <view class="right">
+                        <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+                    </view>
+                </view>
+
+            </view>
+            <view class="other">
+                <view v-if="!showmore" @tap="changeShowMore">
+                    灞曞紑鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
+                </view>
+                <view v-if="showmore" @tap="changeShowMore">
+                    鎶樺彔鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
+                </view>
+            </view>
+
+            <view class="buttons">
+                <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+                <button class="btn-b" size="mini" type="default" @tap="add">鏂板</button>
+                <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+            </view>
+        </view>
+
+        <view id="divide" style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+        <view :style="{
+            height: calcContentHeight + 'px',
+            overflowY: 'auto'
+        }">
+            <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+                <uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+                    @tap="showDetail = showDetail==index?-1:index">
+                    <view class="card-detail">
+                        <view class="detail" v-if="item.鍒跺崟浜�">
+                            <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+                        </view>
+                        <view class="detail" v-if="item.璁惧浠g爜">
+                            <text>璁惧浠g爜锛�</text>{{item.璁惧浠g爜}}
+                        </view>
+                        <view class="detail" v-if="item.璁惧鍚嶇О">
+                            <text>璁惧鍚嶇О锛�</text>{{item.璁惧鍚嶇О}}
+                        </view>
+                        <view class="detail" v-if="item.璐熻矗浜�">
+                            <text>璐熻矗浜猴細</text>{{item.璐熻矗浜簘}
+                        </view>
+                        <view class="detail" v-if="item.缁翠慨閮ㄩ棬鍚嶇О">
+                            <text>缁翠慨閮ㄩ棬锛�</text>{{item.缁翠慨閮ㄩ棬鍚嶇О}}
+                        </view>
+                        <view class="detail" v-if="item.楠屾敹浜�">
+                            <text>楠屾敹浜猴細</text>{{item.楠屾敹浜簘}
+                        </view>
+                        <view class="card-detail" v-if="showDetail == index">
+
+
+                            <view class="detail" v-if="item.琛ㄥご澶囨敞">
+                                <text>琛ㄥご澶囨敞锛�</text>{{item.琛ㄥご澶囨敞}}
+                            </view>
+                            <view class="detail" v-if="item.鍙戠敓鏃ユ湡">
+                                <text>寮�濮嬫棩鏈燂細</text>{{dayjs(item.鍙戠敓鏃ユ湡).format("YYYY-MM-DD HH:mm:DD")}}
+                            </view>
+                            <view class="detail" v-if="item.楠屾敹浜轰唬鐮�">
+                                <text>楠屾敹浜轰唬鐮侊細</text>{{item.楠屾敹浜轰唬鐮亇}
+                            </view>
+                            <view class="detail" v-if="item.缁翠慨閮ㄩ棬浠g爜">
+                                <text>缁翠慨閮ㄩ棬浠g爜锛�</text>{{item.缁翠慨閮ㄩ棬浠g爜}}
+                            </view>
+                            <view class="detail" v-if="item.璐熻矗浜轰唬鐮�">
+                                <text>璐熻矗浜轰唬鐮侊細</text>{{item.璐熻矗浜轰唬鐮亇}
+                            </view>
+                            <view class="detail" v-if="item.hmainid">
+                                <text>鍐呴儴鍗曟嵁鍙凤細</text>{{item.hmainid}}
+                            </view>
+                        </view>
+                    </view>
+
+                    <view class="more" v-if="showDetail == index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+                    <view class="more" v-if="showDetail != index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+                    <view class="op" v-if="operations == index">
+                        <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+                        <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+                        <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+                    </view>
+                </uni-card>
+            </view>
+        </view>
+        <view class="pagination-zone" id="pagination-zone">
+            <uni-pagination show-icon :page-size="size" :total="dataLength" :current="page"
+                @change="onPaginationChangeHandler"></uni-pagination>
+        </view>
+        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+    </view>
+</template>
+
+<script>
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import BarCodePopupVue from "@/components/BarCodePopup/BarCodePopup.vue";
+    import {
+        CommonUtils
+    } from "../../../utils/common";
+    import dayjs from "dayjs";
+    export default {
+        data() {
+            return {
+                dayjs,
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                tabs: 0,
+                urls: '/Web/GetEquipmentBillsList',
+                MvarReportTitle: '璁惧鐐规璁板綍鍗曠紦瀛�',
+                hform: {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 3901,
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    Type: "YS",
+                    sWhere: "",
+                    HBeginDate: dayjs(new Date()).subtract(30, 'day').format("YYYY-MM-DD"),
+                    HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                },
+                sWhere: '',
+                listData: [],
+                showList: [],
+                showDetail: -1,
+                operations: -1,
+
+                page: 1,
+                size: 20,
+                dataLength: 0,
+                divideBottom: 0,
+                paginationTop: 0,
+                showmore: false,
+            }
+        },
+        computed: {
+            calcContentHeight: {
+                get() {
+                    return this.paginationTop - this.divideBottom
+                }
+            }
+        },
+        onShow() {
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            this.CheckModRight()
+            this.changeTab(0)
+            console.log(this.userInfo, uni.getStorageSync('HUserName'))
+        },
+        components: {
+            BarCodePopupVue
+        },
+        onPullDownRefresh: function() {
+            this.clear()
+            setTimeout(() => {
+                uni.stopPullDownRefresh();
+            }, 1000);
+        },
+        onReady() {
+            this.getCalcHeight()
+        },
+        methods: {
+            changeShowMore() {
+                this.showmore = !this.showmore
+                this.$nextTick(() => {
+                    // 閲嶆柊璁$畻鍐呭瑙嗗彛楂樺害
+                    this.getCalcHeight()
+                })
+            },
+            getCalcHeight() {
+                let query = uni.createSelectorQuery().in(this)
+                query
+                    .select("#divide")
+                    .boundingClientRect()
+                    .select("#pagination-zone")
+                    .boundingClientRect()
+                    .exec(res => {
+                        this.divideBottom = Math.ceil(res[0].bottom)
+                        this.paginationTop = Math.floor(res[1].top)
+                    })
+            },
+            async qrCodeDisplay(item) {
+                this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+                await this.$nextTick()
+                this.$refs.barcodePopup.open()
+            },
+            CheckModRight() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+                    data: {
+                        ModRightName: 'CE_OtherOut',
+                        HUserName: uni.getStorageSync('HUserName')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {} else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            onPaginationChangeHandler({
+                current
+            }) {
+                this.page = current
+                this.showList = this.getPage(current, this.size, this.listData)
+            },
+            getPage(page, size, list) {
+                let sindex = (parseInt(page) - 1) * size
+                let eindex = parseInt(page) * size
+                let newList = list.slice(sindex, eindex)
+                return newList
+            },
+            changeTab(e) {
+                this.tabs = e
+                this.page = 1
+                this.showList = []
+
+                if (this.tabs == 0) {
+                    this.urls = '/Web/GetEquipmentBillsList'
+                }
+                // if (this.tabs == 1) {
+                // 	this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+                // }
+                this.search()
+            },
+            async getList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: this.urls,
+                        data: this.hform
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message
+                    } = res.data
+
+                    if (count == 1) {
+                        if(data == null) {
+                           data = []
+                        }
+                        this.listData = data
+                        console.log('data: ', data);
+                        this.showList = this.getPage(this.page, this.size, data)
+                        this.dataLength = data.length
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${err}`
+                    })
+                }
+
+            },
+            search() {
+                this.hform.sWhere = ''
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                console.log(this.hform)
+                if (this.hform.HBillNo) {
+                    this.hform.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+                }
+                if (this.hform.HBeginDate && this.hform.HEndDate) {
+                    this.hform.sWhere +=
+                        ` and convert(date,鏃ユ湡) between convert(date, '${this.hform.HBeginDate}') and convert(date, '${this.hform.HEndDate}')`;
+                }
+                this.getList()
+            },
+            clear() {
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                this.sWhere = ''
+                this.hform = {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 3911,
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    sWhere: '',
+                    Type: "YS",
+                    HBeginDate: dayjs(new Date()).subtract(30, 'day').format("YYYY-MM-DD"),
+                    HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                }
+                this.search()
+            },
+            add() {
+                uni.navigateTo({
+                    url: '/pages/MJGL/Sb_EquipRepariCheckBill/Sb_EquipRepariCheckBill?operationType=1'
+                })
+            },
+            //缂栬緫
+            edit(item) {
+                console.log(item)
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
+                    data: {
+                        "HInterID": item.HInterID,
+                        "HBillNo": item.鍗曟嵁鍙�,
+                        "HBillType": this.hform.HBillType
+                    },
+                    success: (res) => {
+                        console.log(1, res);
+                        if (res.data.count == 1) {
+                            uni.navigateTo({
+                                url: './OtherOutBill?OperationType=2&HInterID=' + item.HInterID
+                            })
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.hideLoading()
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                })
+            },
+            //鍒犻櫎
+            del(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/Sb_EqpRepairWorkBill/DeltetEqpRepairCheckBill',
+                                data: {
+                                    HInterID: item.hmainid,
+                                    user: uni.getStorageSync('HUserName'),
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+            //鎾ら攢
+            revoke(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '鏄惁纭鎾ら攢',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
+                                data: {
+                                    HInterID: item.HInterID,
+                                    HBillNo: item.鍗曟嵁鍙�,
+                                    HBillType: this.hform.HBillType,
+                                    HMaker: uni.getStorageSync('HUserName'),
+                                    MvarReportTitle: this.MvarReportTitle,
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJListStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
new file mode 100644
index 0000000..cff4b33
--- /dev/null
+++ b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
@@ -0,0 +1,800 @@
+<template>
+    <view>
+        <view class="tabs" id="tabs">
+            <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+            <!-- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鏄庣粏淇℃伅</view> -->
+            <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
+            <!-- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view> -->
+        </view>
+        <!-- 鍩烘湰淇℃伅 -->
+        <template v-if="tabs == 0">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form-item">
+                    <view class="title">璁惧鏉$爜:</view>
+                    <view :class="enableEdit?'right':'righton'">
+                        <input v-model="hform.HBarCode" :disabled="!enableEdit"
+                            @confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)璁惧鏉$爜" />
+                    </view>
+                    <view class="icon-wrapper">
+                        <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">棰勮缁翠慨寮�濮嬫椂闂�:</view>
+                    <view class="right">
+                        <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HRepairPlanBeginDate">
+                            <input :value="hform.HRepairPlanBeginDate" />
+                        </uni-datetime-picker>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">棰勮缁翠慨缁撴潫鏃堕棿:</view>
+                    <view class="right">
+                        <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HRepairPlanEndDate">
+                            <input :value="hform.HRepairPlanEndDate" />
+                        </uni-datetime-picker>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">缁翠慨鍐呭:</view>
+                    <view class="right">
+                        <textarea v-model="hform.HRepairContent" placeholder="璇疯緭鍏ラ獙璇佸唴瀹�" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HBillNo" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鏃ユ湡:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鏃堕棿鍗曚綅:</view>
+                    <zxz-uni-data-select class="right" :localdata="[
+                        {key: '灏忔椂', value: '灏忔椂'},
+                        {key: '澶�', value: '澶�'},
+                        {key: '鏈�', value: '鏈�'},
+                    ]" dataKey="key" dataValue="value" v-model="hform.HCycleUnit">
+                    </zxz-uni-data-select>
+                </view>
+                <view class="form-item">
+                    <view class="title">璁″垝缁翠慨宸ユ椂:</view>
+                    <view class="right">
+                        <input type="number" v-model="hform.HPlanTimes" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title required">缁翠慨閮ㄩ棬:</view>
+                    <zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
+                        dataValue="HItemID" v-model="hform.HDeptID">
+
+                    </zxz-uni-data-select>
+                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                </view>
+                <view class="form-item">
+                    <view class="title required">缁翠慨浜�:</view>
+                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+                        dataValue="HItemID" v-model="hform.HEmpID">
+
+                    </zxz-uni-data-select>
+                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                </view>
+                <view class="form-item">
+                    <view class="title required">缁翠慨椤圭洰:</view>
+                    <zxz-uni-data-select required class="right" :localdata="HRepairList" dataKey="缁翠慨椤圭洰"
+                        dataValue="hitemid" v-model="hform.HRepairID">
+
+                    </zxz-uni-data-select>
+                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                </view>
+                <view class="form-item">
+                    <view class="title required">璐熻矗浜�:</view>
+                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+                        dataValue="HItemID" v-model="hform.HManagerID">
+
+                    </zxz-uni-data-select>
+                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                </view>
+                <view class="form-item">
+                    <view class="title">璁惧鍚嶇О:</view>
+                    <view class="righton">
+                        <input v-model="hform.HBarName" disabled />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璁惧瑙勬牸:</view>
+                    <view class="righton">
+                        <input v-model="hform.HBarSpec" disabled />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璁惧鍨嬪彿:</view>
+                    <view class="righton">
+                        <input v-model="hform.HBarModel" disabled />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">澶囨敞:</view>
+                    <view class="right">
+                        <textarea v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">缁翠慨瑕佹眰:</view>
+                    <view class="right">
+                        <textarea v-model="HDetailList[0].HRepairExplanation" placeholder="璇疯緭鍏ョ淮淇姹�" />
+                    </view>
+                </view>
+            </view>
+        </template>
+
+        <!-- 鍏朵粬淇℃伅 -->
+        <template v-if="tabs == 2">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form-item">
+                    <view class="title">鍒涘缓浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMaker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍒涘缓鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMakeDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇敼浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HUpDater" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇敼鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HUpDateDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹℃牳浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HChecker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹℃牳鏃堕棿:</view>
+                    <view class="righton">
+                        <input v-model="hform.HCheckDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浣滃簾浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HDeleteMan" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浣滃簾鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HDeleteDate" />
+                    </view>
+                </view>
+            </view>
+
+        </template>
+        <!-- 鎿嶄綔鎸夐挳 -->
+        <view class="buttons" id="buttons">
+            <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+            <view style="flex: 1;"></view>
+            <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+            <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+        </view>
+        <!-- <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload> -->
+    </view>
+</template>
+
+<script>
+    import dayjs from "dayjs";
+    import {
+        CommonUtils
+    } from "@/utils/common";
+    import {
+        MpaasScan
+    } from "@/utils/mpaasScan.js"
+    import {
+        getUserInfo
+    } from "../../../utils/auth";
+    export default {
+        // 璁惧缁翠慨娲惧伐鍗�
+        name: 'Sb_EquipRepairSendWorkBill',
+        data() {
+            return {
+                tabs: 0,
+                HMainSourceBillType: "",
+                btnTop: 0,
+                tabsBottom: 0,
+                HModName: "Sb_EquipRepairSendWorkBill",
+                HBillType: '3909',
+                operationType: 1,
+                uploadOptions: {},
+                enableEdit: true,
+
+                HDeptList: [],
+                HRepairCheckList: [],
+                HEmpList: [],
+                HRepairList: [],
+
+                hform: {
+                    "HBarCode": "",
+                    HBillNo: '',
+                    HInterID: 0,
+                    HDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                    HInnerBillNo: '',
+                    HRepairContent: '',
+                    HDeptIDName: '',
+                    HDeptID: 0,
+                    HEmpIDName: '',
+                    HEmpID: 0,
+                    HManagerIDName: '',
+                    HManagerID: 0,
+                    HEquipIDName: '',
+                    HEquipID: 0,
+                    HRepairIDName: '',
+                    HRepairID: 0,
+                    HRepairPlanBeginDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                    HRepairPlanEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                    HCycleUnit: '灏忔椂',
+                    HPlanTimes: '',
+                    HExplanation: '',
+                    HRemark: '',
+                    HMaker: getUserInfo()["Czymc"],
+                    HChecker: '',
+                    HCloseMan: '',
+                    HUpDater: '',
+                    HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                    HCheckDate: '',
+                    HCloseDate: '',
+                    HUpDateDate: '',
+                    HDeleteMan: '',
+                    HDeleteDate: ''
+                },
+                HDetailList: [{ // 鍚庣鎺ュ彛鎻愪氦闇�瑕� 鏄庣粏淇℃伅
+                    "瀛愮淮淇」鐩�": "",
+                    "HRepairID": 0,
+                    "瀛愮淮淇」鐩唬鐮�": "",
+                    "HRepairExplanation": "",
+                    "瀛愯礋璐d汉浠g爜": "",
+                    "HManagerID": "",
+                    "瀛愯礋璐d汉": "",
+                    "HRemark": ""
+                }]
+            };
+        },
+        computed: {
+            containerHeight: {
+                get() {
+                    return this.btnTop - this.tabsBottom - 5
+                }
+            },
+        },
+        methods: {
+            // 缁翠慨椤圭洰
+            async getRepairList() {
+                try{ 
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Gy_Repair/GetRepairList',
+                        data: {
+                            sWhere: '',
+                            user: getUserInfo()["Czymc"]
+                        }
+                    })
+                    
+                    let {data, count, Message} = res.data
+                    if(count == 1){
+                        this.HRepairList = data
+                    }else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鑾峰彇妫�楠岄」鐩け璐�: ${Message}`
+                        })
+                    }
+                }catch(err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鑾峰彇妫�楠岄」鐩け璐�: ${err}`
+                    })
+                }
+            },
+            // 鍒犻櫎鏄庣粏
+            delDetail(item) {
+
+            },
+            // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
+            ValidCheck() {
+                if (this.hform.HEquipID == 0) {
+                    return {
+                        Message: "鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!",
+                        state: false
+                    }
+                }
+                if (this.hform.HDeptID == 0) {
+                    return {
+                        Message: "閮ㄩ棬涓嶅緱涓虹┖!",
+                        state: false
+                    }
+                }
+                if (this.hform.HEmpID == 0) {
+                    return {
+                        Message: "楠屾敹浜轰笉寰椾负绌�!",
+                        state: false
+                    }
+                }
+                if (this.hform.HRepairCheckMainID == 0) {
+                    return {
+                        Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
+                        state: false
+                    }
+                }
+                if (this.hform.HManagerID == 0) {
+                    return {
+                        Message: "璐熻矗浜轰笉寰椾负绌�!",
+                        state: false
+                    }
+                }
+
+                return {
+                    Message: "",
+                    state: true
+                }
+            },
+            addNew() {
+                uni.redirectTo({
+                    url: './Sb_EquipRepairSendWorkBill?operationType=1'
+                })
+            },
+            goBack() {
+                uni.navigateBack()
+            },
+            checkBoxChangeHandler(index, e) {
+                let cr = e.detail.value
+                if (cr.length == 0) {
+                    this.HCheckFileList[index]["HDotCheckResult"] = false
+                } else {
+                    this.HCheckFileList[index]["HDotCheckResult"] = true
+                }
+            },
+            uploadFile(index) {
+                console.log('filePath: ', this.attachmentInfo[index].filePath);
+                // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
+                uni.uploadFile({
+                    url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
+                    filePath: this.attachmentInfo[index].filePath,
+                    name: 'file',
+                    formData: {
+                        HBillNo: this.hform.HBillNo,
+                        HRemark: "",
+                        HUserName: getUserInfo()["Czymc"]
+                    },
+                    success: (uploadRes) => {
+                        CommonUtils.showTips({
+                            message: "涓婁紶鎴愬姛"
+                        })
+                        this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
+                    },
+                    fail: (err) => {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `涓婁紶澶辫触: ${err}`
+                        })
+                    }
+                })
+            },
+            delFile(index) {
+                console.log('attachmentInfo: ', this.attachmentInfo[index]);
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            this.attachmentInfo.splice(index, 1)
+                        }
+                    },
+                })
+
+            },
+            handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
+                console.log('file: ', res);
+                let fileInfo = res.data[0]
+                this.attachmentInfo.push({
+                    fileName: fileInfo.name,
+                    size: fileInfo.size,
+                    status: '绛夊緟涓婁紶',
+                    filePath: fileInfo.tempFilePath
+                })
+            },
+            // 涓婁紶鏂囦欢
+            fileUpload() {
+                this.$refs.XeUpload.upload('file', {});
+            },
+            //鑾峰彇鐝鏁版嵁
+            async getShiftList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Web/GetGy_ShiftsList_Json',
+                        data: {
+                            Shifts: "",
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HShiftsList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+            async getHDeptList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Gy_Department/list',
+                        data: {
+                            sWhere: "",
+                            user: uni.getStorageSync('HUserName'),
+                            Organization: uni.getStorageSync('Organization')
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HDeptList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            // 鑾峰彇鑱屽憳鏁版嵁
+            async getEmpList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/PublicPageMethod/UserList',
+                        data: {
+                            sWhere: " where 1=1",
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HEmpList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            // 鑾峰彇楠岃瘉椤圭洰鏁版嵁
+            async getCheckProjList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Gy_RepairCheck/GetRepairCheckList',
+                        data: {
+                            sWhere: "",
+                            user: uni.getStorageSync('HUserName'),
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HRepairCheckList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            toScanCode() {
+                MpaasScan.scanCode(cb => {
+                    this.hfrom.HBarCode = cb
+                    this.GetMessageByBarCode(cb)
+                })
+            },
+            async GetMessageByBarCode(HBarCode) {
+                try {
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List",
+                        data: {
+                            HBarCode: HBarCode,
+                        },
+                    })
+
+
+                    if (!res) {
+                        return
+                    }
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+
+                    if (count == 1) {
+                        console.log('data: ', data);
+                        this.hform.HEquipID = data[0].hmainid
+                        this.hform.HBarName = data[0].璁惧鍚嶇О
+                        this.hform.HBarSpec = data[0].璁惧瑙勬牸
+                        this.hform.HBarModel = data[0].璁惧鍨嬪彿
+                        this.hform.HQty = 1
+
+                        this.enableEdit = false
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: Message
+                        })
+                    }
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: err
+                    })
+                }
+            },
+            async GetItemByEquipFile() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Web/GetItemByEquipFile",
+                        data: {
+                            "EquipProjectID": this.hform.HEquipID,
+                            "Type": "DJ",
+                            "HDate": this.hform.HBeginDate
+                        }
+                    })
+
+                    let {
+                        data,
+                        Message,
+                        count
+                    } = res.data
+                    if (count == 1) {
+                        this.hform.HEquipDotCheckRuleInterID = data[0].鐐规瑙勭▼ID
+                        this.hform.HEquipDotCheckRuleInterNo = data[0].鐐规瑙勭▼鍗曞彿
+                        this.hform.HPlanNo = data[0].鐐规璁″垝鍗�
+                        this.hform.HPlanInterID = (data[0].鐐规璁″垝ID == null ? 0 : data[0].鐐规璁″垝ID) == "" ? 0 : data[0]
+                            .鐐规璁″垝ID
+                        this.hform.HPlanEntryID = (data[0].鐐规璁″垝瀛怚D == null ? 0 : data[0].鐐规璁″垝瀛怚D) == "" ? 0 : data[
+                            0].鐐规璁″垝瀛怚D
+
+                        this.HCheckFileList = Array.from(data).map(item => {
+                            return {
+                                "HDotCheckItemID": item.HDotCheckItemID,
+                                "HDotCheckCode": item.鐐规椤圭洰浠g爜,
+                                "HDotCheckItem": item.鐐规椤圭洰,
+                                "HDotCheckPart": item.鐐规閮ㄤ綅,
+                                "HClaim": item.鍏蜂綋瑕佹眰,
+                                "HManagerID": item.璐熻矗浜篒D,
+                                "HManagerCode": item.璐熻矗浜轰唬鐮�,
+                                "HManagerName": item.璐熻矗浜哄悕绉�,
+                                "HSourceInterID": item.鐐规璁″垝ID == null ? 0 : item.鐐规璁″垝ID,
+                                "HSourceEntryID": item.鐐规璁″垝瀛怚D == null ? 0 : item.鐐规璁″垝瀛怚D,
+                                "HSourceBillNo": item.鐐规璁″垝鍗�,
+                                "HDotCheckItemClassID": 0,
+                                "HDotCheckItemClassName": "",
+                                "HDotCheckItemMethodID": 0,
+                                "HDotCheckItemMethodName": "",
+                                "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
+                            }
+                        })
+
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
+                    })
+                }
+            },
+            radioChange({
+                detail: {
+                    value
+                }
+            }) {
+                this.hform.HCheckResult = value
+            },
+            async getMaxNum() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Web/GetMAXNum",
+                        data: {
+                            "HBillType": this.HBillType
+                        }
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message
+                    } = res.data
+                    console.log('data: ', data);
+                    this.hform.HInterID = data[0]["HInterID"]
+                    this.hform.HBillNo = data[0]["HBillNo"]
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+                    })
+                }
+            },
+            async submit() {
+                let valid = this.ValidCheck()
+                if (!valid.state) {
+                    CommonUtils.showTips({
+                        message: valid.Message
+                    })
+                    return
+                }
+
+                try {
+                    let oMain = JSON.stringify(this.hform);
+                    this.HDetailList[0].HManagerID = this.hform.HManagerID
+                    this.HDetailList[0].HRepairID = this.hform.HRepairID
+                    let sSubStr = JSON.stringify(this.HDetailList);
+                    let sMainSub = oMain + ';' + sSubStr + `;-1;${this.operationType}` + ';' + getUserInfo()[
+                    'Czymc'];
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: "/Sb_EquipRepairSendWorkBill/AddEquipRepairSendWorkBill",
+                        data: {
+                            "sMainSub": sMainSub
+                        },
+                        method: "POST"
+                    })
+
+                    if (!res) {
+                        return
+                    }
+
+                    let {
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        uni.showModal({
+                            title: '鎻愮ず',
+                            content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+                            success: (res) => {
+                                if (res.confirm) {
+                                    console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                                    uni.redirectTo({
+                                        url: './Sb_EquipRepairSendWorkBill?operationType=1'
+                                    })
+                                } else if (res.cancel) {
+                                    console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                                    setTimeout(() => {
+                                        uni.navigateBack();
+                                    }, 50)
+                                }
+                            }
+                        });
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+                        })
+                    }
+
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "鎻愪氦鍗曟嵁澶辫触: " + err
+                    })
+                }
+            }
+        },
+        onLoad(e) {
+            console.log('e: ', e);
+            if (!e.operationType) {
+                this.operationType = 1
+            } else {
+                this.operationType = e.operationType
+            }
+
+            if (this.operationType == 1) {
+                // 鏂板
+                this.getMaxNum()
+            } else if (this.operationType == 2) {
+                // 澶嶅埗
+            } else if (this.operationType == 3) {
+                // 缂栬緫
+
+            } else if (this.operationType == 4) {
+                // 娴忚
+
+            }
+
+            this.getHDeptList()
+            this.getEmpList()
+            this.getCheckProjList()
+            this.getRepairList()
+        },
+        onReady() {
+            const query = uni.createSelectorQuery().in(this)
+            query.select("#buttons")
+                .boundingClientRect()
+                .select("#tabs")
+                .boundingClientRect()
+                .exec(res => {
+                    this.btnTop = Math.floor(res[0].top)
+                    this.tabsBottom = Math.ceil(res[1].bottom)
+                })
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJBillStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList.vue b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList.vue
new file mode 100644
index 0000000..3dec3c5
--- /dev/null
+++ b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList.vue
@@ -0,0 +1,478 @@
+<template>
+    <view class="content">
+        <view class="form">
+            <view class="form-item">
+                <view class="title">寮�濮嬫椂闂�:</view>
+                <view class="right">
+                    <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
+                        <input :value="hform.HBeginDate" />
+                    </uni-datetime-picker>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">缁撴潫鏃堕棿:</view>
+                <view class="right">
+                    <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HEndDate">
+                        <input :value="hform.HEndDate" />
+                    </uni-datetime-picker>
+                </view>
+            </view>
+            <view v-if="showmore">
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�:</view>
+                    <view class="right">
+                        <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+                    </view>
+                </view>
+
+            </view>
+            <view class="other">
+                <view v-if="!showmore" @tap="changeShowMore">
+                    灞曞紑鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
+                </view>
+                <view v-if="showmore" @tap="changeShowMore">
+                    鎶樺彔鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
+                </view>
+            </view>
+
+            <view class="buttons">
+                <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+                <button class="btn-b" size="mini" type="default" @tap="add">鏂板</button>
+                <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+            </view>
+        </view>
+
+        <view id="divide" style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+        <view :style="{
+            height: calcContentHeight + 'px',
+            overflowY: 'auto'
+        }">
+            <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+                <uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+                    @tap="showDetail = showDetail==index?-1:index">
+                    <view class="card-detail">
+                        <view class="detail" v-if="item.鍒跺崟浜�">
+                            <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+                        </view>
+                        <view class="detail" v-if="item.璁惧浠g爜">
+                            <text>璁惧浠g爜锛�</text>{{item.璁惧浠g爜}}
+                        </view>
+                        <view class="detail" v-if="item.璁惧">
+                            <text>璁惧鍚嶇О锛�</text>{{item.璁惧}}
+                        </view>
+                        <view class="detail" v-if="item.璐熻矗浜�">
+                            <text>璐熻矗浜猴細</text>{{item.璐熻矗浜簘}
+                        </view>
+                        <view class="detail" v-if="item.缁翠慨椤圭洰">
+                            <text>缁翠慨椤圭洰锛�</text>{{item.缁翠慨椤圭洰}}
+                        </view>
+                        <view class="detail" v-if="item.缁翠慨閮ㄩ棬">
+                            <text>缁翠慨閮ㄩ棬锛�</text>{{item.缁翠慨閮ㄩ棬}}
+                        </view>
+                        <view class="detail" v-if="item.缁翠慨浜�">
+                            <text>缁翠慨浜猴細</text>{{item.缁翠慨浜簘}
+                        </view>
+                        <view class="detail" v-if="item.璁″垝缁翠慨宸ユ椂">
+                            <text>缁翠慨鏃堕棿锛�</text>{{ item.璁″垝缁翠慨宸ユ椂 + '' + item.鏃堕棿鍗曚綅}}
+                        </view>
+                        <view class="card-detail" v-if="showDetail == index">
+
+
+                            <view class="detail" v-if="item.琛ㄥご澶囨敞">
+                                <text>琛ㄥご澶囨敞锛�</text>{{item.琛ㄥご澶囨敞}}
+                            </view>
+                            <view class="detail" v-if="item.鍙戠敓鏃ユ湡">
+                                <text>寮�濮嬫棩鏈燂細</text>{{dayjs(item.鍙戠敓鏃ユ湡).format("YYYY-MM-DD HH:mm:DD")}}
+                            </view>
+                            <view class="detail" v-if="item.楠屾敹浜轰唬鐮�">
+                                <text>楠屾敹浜轰唬鐮侊細</text>{{item.楠屾敹浜轰唬鐮亇}
+                            </view>
+                            <view class="detail" v-if="item.缁翠慨閮ㄩ棬浠g爜">
+                                <text>缁翠慨閮ㄩ棬浠g爜锛�</text>{{item.缁翠慨閮ㄩ棬浠g爜}}
+                            </view>
+                            <view class="detail" v-if="item.璐熻矗浜轰唬鐮�">
+                                <text>璐熻矗浜轰唬鐮侊細</text>{{item.璐熻矗浜轰唬鐮亇}
+                            </view>
+                            <view class="detail" v-if="item.hmainid">
+                                <text>鍐呴儴鍗曟嵁鍙凤細</text>{{item.hmainid}}
+                            </view>
+                        </view>
+                    </view>
+
+                    <view class="more" v-if="showDetail == index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+                    <view class="more" v-if="showDetail != index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+                    <view class="op" v-if="operations == index">
+                        <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+                        <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+                        <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+                    </view>
+                </uni-card>
+            </view>
+        </view>
+        <view class="pagination-zone" id="pagination-zone">
+            <uni-pagination show-icon :page-size="size" :total="dataLength" :current="page"
+                @change="onPaginationChangeHandler"></uni-pagination>
+        </view>
+        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+    </view>
+</template>
+
+<script>
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import BarCodePopupVue from "@/components/BarCodePopup/BarCodePopup.vue";
+    import {
+        CommonUtils
+    } from "../../../utils/common";
+    import dayjs from "dayjs";
+    export default {
+        data() {
+            return {
+                dayjs,
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                tabs: 0,
+                urls: '/Web/GetEquipmentBillsList',
+                MvarReportTitle: '璁惧缁翠慨娲惧伐鍗曠紦瀛�',
+                hform: {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 3909,
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    Type: "PG",
+                    sWhere: "",
+                    HBeginDate: dayjs(new Date()).subtract(30, 'day').format("YYYY-MM-DD"),
+                    HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                },
+                sWhere: '',
+                listData: [],
+                showList: [],
+                showDetail: -1,
+                operations: -1,
+
+                page: 1,
+                size: 20,
+                dataLength: 0,
+                divideBottom: 0,
+                paginationTop: 0,
+                showmore: false,
+            }
+        },
+        computed: {
+            calcContentHeight: {
+                get() {
+                    return this.paginationTop - this.divideBottom
+                }
+            }
+        },
+        onShow() {
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            this.CheckModRight()
+            this.changeTab(0)
+            console.log(this.userInfo, uni.getStorageSync('HUserName'))
+        },
+        components: {
+            BarCodePopupVue
+        },
+        onPullDownRefresh: function() {
+            this.clear()
+            setTimeout(() => {
+                uni.stopPullDownRefresh();
+            }, 1000);
+        },
+        onReady() {
+            this.getCalcHeight()
+        },
+        methods: {
+            changeShowMore() {
+                this.showmore = !this.showmore
+                this.$nextTick(() => {
+                    // 閲嶆柊璁$畻鍐呭瑙嗗彛楂樺害
+                    this.getCalcHeight()
+                })
+            },
+            getCalcHeight() {
+                let query = uni.createSelectorQuery().in(this)
+                query
+                    .select("#divide")
+                    .boundingClientRect()
+                    .select("#pagination-zone")
+                    .boundingClientRect()
+                    .exec(res => {
+                        this.divideBottom = Math.ceil(res[0].bottom)
+                        this.paginationTop = Math.floor(res[1].top)
+                    })
+            },
+            async qrCodeDisplay(item) {
+                this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+                await this.$nextTick()
+                this.$refs.barcodePopup.open()
+            },
+            CheckModRight() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+                    data: {
+                        ModRightName: 'CE_OtherOut',
+                        HUserName: uni.getStorageSync('HUserName')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {} else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            onPaginationChangeHandler({
+                current
+            }) {
+                this.page = current
+                this.showList = this.getPage(current, this.size, this.listData)
+            },
+            getPage(page, size, list) {
+                let sindex = (parseInt(page) - 1) * size
+                let eindex = parseInt(page) * size
+                let newList = list.slice(sindex, eindex)
+                return newList
+            },
+            changeTab(e) {
+                this.tabs = e
+                this.page = 1
+                this.showList = []
+
+                if (this.tabs == 0) {
+                    this.urls = '/Web/GetEquipmentBillsList'
+                }
+                // if (this.tabs == 1) {
+                // 	this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+                // }
+                this.search()
+            },
+            async getList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: this.urls,
+                        data: this.hform
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message
+                    } = res.data
+
+                    if (count == 1) {
+                        if(data == null) {
+                           data = []
+                        }
+                        this.listData = data
+                        console.log('data: ', data);
+                        this.showList = this.getPage(this.page, this.size, data)
+                        this.dataLength = data.length
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${err}`
+                    })
+                }
+
+            },
+            search() {
+                this.hform.sWhere = ''
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                console.log(this.hform)
+                if (this.hform.HBillNo) {
+                    this.hform.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+                }
+                if (this.hform.HBeginDate && this.hform.HEndDate) {
+                    this.hform.sWhere +=
+                        ` and convert(date,鏃ユ湡) between convert(date, '${this.hform.HBeginDate}') and convert(date, '${this.hform.HEndDate}')`;
+                }
+                this.getList()
+            },
+            clear() {
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                this.sWhere = ''
+                this.hform = {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 3909,
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    Type: "PG",
+                    sWhere: "",
+                    HBeginDate: dayjs(new Date()).subtract(30, 'day').format("YYYY-MM-DD"),
+                    HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                }
+                this.search()
+            },
+            add() {
+                uni.navigateTo({
+                    url: '/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill?operationType=1'
+                })
+            },
+            //缂栬緫
+            edit(item) {
+                console.log(item)
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
+                    data: {
+                        "HInterID": item.HInterID,
+                        "HBillNo": item.鍗曟嵁鍙�,
+                        "HBillType": this.hform.HBillType
+                    },
+                    success: (res) => {
+                        console.log(1, res);
+                        if (res.data.count == 1) {
+                            uni.navigateTo({
+                                url: './OtherOutBill?OperationType=2&HInterID=' + item.HInterID
+                            })
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.hideLoading()
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                })
+            },
+            //鍒犻櫎
+            del(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/Sb_EquipRepairSendWorkBill/DeleteWorkBill',
+                                data: {
+                                    HInterID: item.hmainid,
+                                    user: uni.getStorageSync('HUserName'),
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+            //鎾ら攢
+            revoke(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '鏄惁纭鎾ら攢',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
+                                data: {
+                                    HInterID: item.HInterID,
+                                    HBillNo: item.鍗曟嵁鍙�,
+                                    HBillType: this.hform.HBillType,
+                                    HMaker: uni.getStorageSync('HUserName'),
+                                    MvarReportTitle: this.MvarReportTitle,
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJListStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue b/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
new file mode 100644
index 0000000..7066f6c
--- /dev/null
+++ b/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
@@ -0,0 +1,887 @@
+<template>
+    <view>
+        <view class="tabs" id="tabs">
+            <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+            <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鍏朵粬淇℃伅</view>
+            <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍒跺崟淇℃伅</view>
+            <!-- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view> -->
+        </view>
+        <!-- 鍩烘湰淇℃伅 -->
+        <template v-if="tabs == 0">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form-item">
+                    <view class="title">鍣ㄥ叿鏉$爜:</view>
+                    <view :class="enableEdit?'right':'righton'">
+                        <input v-model="hform.HBarCode" :disabled="!enableEdit"
+                            @confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍣ㄥ叿鏉$爜" />
+                    </view>
+                    <view class="icon-wrapper">
+                        <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">缁翠慨寮�濮嬫棩鏈�:</view>
+                    <view class="right">
+                        <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HRepairBeginDate">
+                            <input :value="hform.HRepairBeginDate" />
+                        </uni-datetime-picker>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">缁翠慨缁撴潫鏃ユ湡:</view>
+                    <view class="right">
+                        <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HRepairEndDate">
+                            <input :value="hform.HRepairEndDate" />
+                        </uni-datetime-picker>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HBillNo" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鏃ユ湡:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鏃堕棿鍗曚綅:</view>
+                    <zxz-uni-data-select class="right" :localdata="[
+                        {key: '灏忔椂', value: '灏忔椂'},
+                        {key: '澶�', value: '澶�'},
+                        {key: '鏈�', value: '鏈�'},
+                    ]" dataKey="key" dataValue="value" v-model="hform.HCycleUnit">
+                    </zxz-uni-data-select>
+                </view>
+                <view class="form-item">
+                    <view class="title required">璁″垝缁翠慨宸ユ椂:</view>
+                    <view class="right">
+                        <input type="number" v-model="hform.HPlanTimes" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title required">瀹為檯缁翠慨宸ユ椂:</view>
+                    <view class="right">
+                        <input type="number" v-model="hform.HTimes" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title required">缁翠慨閮ㄩ棬:</view>
+                    <zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
+                        dataValue="HItemID" v-model="hform.HDeptID">
+
+                    </zxz-uni-data-select>
+                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                </view>
+                <view class="form-item">
+                    <view class="title required">缁翠慨浜�:</view>
+                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+                        dataValue="HItemID" v-model="hform.HEmpID">
+
+                    </zxz-uni-data-select>
+                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                </view>
+                <view class="form-item">
+                    <view class="title required">缁翠慨椤圭洰:</view>
+                    <zxz-uni-data-select required class="right" :localdata="HRepairList" dataKey="缁翠慨椤圭洰"
+                        dataValue="hitemid" v-model="hform.HRepairID">
+
+                    </zxz-uni-data-select>
+                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                </view>
+                <view class="form-item">
+                    <view class="title required">涓荤:</view>
+                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+                        dataValue="HItemID" v-model="hform.HManagerID">
+
+                    </zxz-uni-data-select>
+                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                </view>
+                <view class="form-item">
+                    <view class="title">鍣ㄥ叿鍚嶇О:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMouldName" disabled />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍣ㄥ叿瑙勬牸:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMouldModel" disabled />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍣ㄥ叿鍨嬪彿:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMouldSpec" disabled />
+                    </view>
+                </view>
+            </view>
+        </template>
+        <!-- 鍏朵粬淇℃伅(闈為噸瑕佷俊鎭�) -->
+        <template v-if="tabs == 1">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form-item">
+                    <view class="title">渚涘簲鍟�:</view>
+                    <view class="right">
+                        <input v-model="hform.HSupID" placeholder="" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">缁翠慨绫诲瀷:</view>
+                    <zxz-uni-data-select class="right" :localdata="[
+                        {key: '鍐呴儴缁翠慨', value: '鍐呴儴缁翠慨'},
+                        {key: '澶栭儴缁翠慨', value: '澶栭儴缁翠慨'},
+                    ]" dataKey="key" dataValue="value" v-model="hform.HRepairType">
+                    </zxz-uni-data-select>
+                </view>
+                <view class="form-item">
+                    <view class="title">缁翠慨鍚庢柊瑙勬牸:</view>
+                    <view class="right">
+                        <input type="number" v-model="hform.HNewModel" placeholder="" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鏂拌璁″鍛�:</view>
+                    <view class="right">
+                        <input type="number" v-model="hform.HNewDesignLife" placeholder="" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璁惧:</view>
+                    <view class="right">
+                        <input v-model="hform.HEquipID" placeholder="" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">缁翠慨璐圭敤:</view>
+                    <view class="right">
+                        <input type="number" v-model="HDetailList[0].HMoney" placeholder="" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">缁翠慨鍐呭:</view>
+                    <view class="right">
+                        <textarea v-model="hform.HRepairContent" placeholder="璇疯緭鍏ョ淮淇唴瀹�" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">缁翠慨瑕佹眰:</view>
+                    <view class="right">
+                        <textarea v-model="hform.HExplanation" placeholder="璇疯緭鍏ョ淮淇姹�" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">澶囨敞:</view>
+                    <view class="right">
+                        <textarea v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+                    </view>
+                </view>
+            </view>
+        </template>
+        <!-- 鍒跺崟淇℃伅  -->
+        <template v-if="tabs == 2">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form-item">
+                    <view class="title">鍒涘缓浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMaker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍒涘缓鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMakeDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇敼浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HUpDater" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇敼鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HUpDateDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹℃牳浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HChecker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹℃牳鏃堕棿:</view>
+                    <view class="righton">
+                        <input v-model="hform.HCheckDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浣滃簾浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HDeleteMan" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浣滃簾鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HDeleteDate" />
+                    </view>
+                </view>
+            </view>
+
+        </template>
+        <!-- 鎿嶄綔鎸夐挳 -->
+        <view class="buttons" id="buttons">
+            <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+            <view style="flex: 1;"></view>
+            <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+            <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+        </view>
+        <!-- <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload> -->
+    </view>
+</template>
+
+<script>
+    import dayjs from "dayjs";
+    import {
+        CommonUtils
+    } from "@/utils/common";
+    import {
+        MpaasScan
+    } from "@/utils/mpaasScan.js"
+    import {
+        getUserInfo
+    } from "../../../utils/auth";
+    export default {
+        // 鍣ㄥ叿缁翠慨娲惧伐鍗�
+        name: 'Sc_MouldRepairSendWorkBill',
+        data() {
+            return {
+                tabs: 0,
+                HMainSourceBillType: "",
+                btnTop: 0,
+                tabsBottom: 0,
+                HModName: "Sc_MouldRepairSendWorkBill",
+                HBillType: '3843',
+                operationType: 1,
+                uploadOptions: {},
+                enableEdit: true,
+
+                HDeptList: [],
+                HRepairCheckList: [],
+                HEmpList: [],
+                HRepairList: [],
+
+                hform: {
+                    "HBarCode": "",
+                    "HBillNo": "",
+                    "HInterID": "0",
+                    "HDate": dayjs(new Date()).format('YYYY-MM-DD'),
+                    "HInnerBillNo": "",
+                    "MouldHNumber": "",
+                    "HMouldID": "0",
+                    "HRepairIDName": "",
+                    "HRepairID": "0",
+                    "HCycleUnit": "灏忔椂",
+                    "MouldHName": "",
+                    "MouldHModel": "",
+                    "HDeptIDName": "",
+                    "HDeptID": "0",
+                    "HManagerIDName": "",
+                    "HManagerID": "0",
+                    "HEmpIDName": "",
+                    "HEmpID": "0",
+                    "HRepairBeginDate": dayjs(new Date()).format('YYYY-MM-DD'),
+                    "HMainSourceBillType": "",
+                    "HMainSourceInterID": "0",
+                    "HMainSourceEntryID": "0",
+                    "HPlanTimes": "0",
+                    "HTimes": "0",
+                    "HRepairEndDate": dayjs(new Date()).format('YYYY-MM-DD'),
+                    "HMainSourceBillNo": "",
+                    "HSupIDName": "",
+                    "HSupID": "0",
+                    "HRepairType": "鍐呴儴缁翠慨",
+                    "HNewModel": "0",
+                    "HOrgID": "",
+                    "HNewDesignLife": "0",
+                    "HEquipIDName": "",
+                    "HEquipID": "0",
+                    "HRepairContent": "",
+                    "HExplanation": "",
+                    "HRemark": "",
+                    "HMaker": getUserInfo()["Czymc"],
+                    "HChecker": "",
+                    "HCloseMan": "",
+                    "HUpDater": "",
+                    "HMakeDate": dayjs(new Date()).format('YYYY-MM-DD'),
+                    "HCheckDate": "",
+                    "HCloseDate": "",
+                    "HUpDateDate": "",
+                    "HDeleteMan": "",
+                    "HDeleteDate": "",
+                    HMouldName: "",
+                    HMouldSpec: "",
+                    HMouldModel: "",
+                },
+                HDetailList: [{ // 鍚庣鎺ュ彛鎻愪氦闇�瑕� 鏄庣粏淇℃伅
+                    "瀛愮淮淇」鐩�": "",
+                    "HRepairID": 0,
+                    "瀛愮淮淇」鐩唬鐮�": "",
+                    "HRepairExplanation": "",
+                    "瀛愯礋璐d汉浠g爜": "",
+                    "HManagerID": "",
+                    "瀛愯礋璐d汉": "",
+                    "HMoney": 0,
+                    "HRemark": ""
+                }]
+            };
+        },
+        computed: {
+            containerHeight: {
+                get() {
+                    return this.btnTop - this.tabsBottom - 5
+                }
+            },
+        },
+        methods: {
+            // 缁翠慨椤圭洰
+            async getRepairList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Gy_Repair/GetRepairList',
+                        data: {
+                            sWhere: '',
+                            user: getUserInfo()["Czymc"]
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HRepairList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鑾峰彇妫�楠岄」鐩け璐�: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鑾峰彇妫�楠岄」鐩け璐�: ${err}`
+                    })
+                }
+            },
+            // 鍒犻櫎鏄庣粏
+            delDetail(item) {
+
+            },
+            // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
+            ValidCheck() {
+                if (this.hform.HMouldID == 0) {
+                    return {
+                        Message: "鏈綍鍏ュ櫒鍏蜂俊鎭紝璇峰厛褰曞叆鍣ㄥ叿淇℃伅!",
+                        state: false
+                    }
+                }
+                if (this.hform.HDeptID == 0) {
+                    return {
+                        Message: "閮ㄩ棬涓嶅緱涓虹┖!",
+                        state: false
+                    }
+                }
+                if (this.hform.HEmpID == 0) {
+                    return {
+                        Message: "楠屾敹浜轰笉寰椾负绌�!",
+                        state: false
+                    }
+                }
+                if (this.hform.HRepairCheckMainID == 0) {
+                    return {
+                        Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
+                        state: false
+                    }
+                }
+                if (this.hform.HManagerID == 0) {
+                    return {
+                        Message: "璐熻矗浜轰笉寰椾负绌�!",
+                        state: false
+                    }
+                }
+                if (this.hform.HPlanTimes == '') {
+                    return {
+                        Message: "璁″垝缁翠慨宸ユ椂涓嶅緱涓虹┖!",
+                        state: false
+                    }
+                }
+                if (this.hform.HTimes == '') {
+                    return {
+                        Message: "瀹為檯缁翠慨宸ユ椂涓嶅緱涓虹┖!",
+                        state: false
+                    }
+                }
+
+
+                return {
+                    Message: "",
+                    state: true
+                }
+            },
+            addNew() {
+                uni.redirectTo({
+                    url: './Sb_EquipRepairSendWorkBill?operationType=1'
+                })
+            },
+            goBack() {
+                uni.navigateBack()
+            },
+            checkBoxChangeHandler(index, e) {
+                let cr = e.detail.value
+                if (cr.length == 0) {
+                    this.HCheckFileList[index]["HDotCheckResult"] = false
+                } else {
+                    this.HCheckFileList[index]["HDotCheckResult"] = true
+                }
+            },
+            uploadFile(index) {
+                console.log('filePath: ', this.attachmentInfo[index].filePath);
+                // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
+                uni.uploadFile({
+                    url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
+                    filePath: this.attachmentInfo[index].filePath,
+                    name: 'file',
+                    formData: {
+                        HBillNo: this.hform.HBillNo,
+                        HRemark: "",
+                        HUserName: getUserInfo()["Czymc"]
+                    },
+                    success: (uploadRes) => {
+                        CommonUtils.showTips({
+                            message: "涓婁紶鎴愬姛"
+                        })
+                        this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
+                    },
+                    fail: (err) => {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `涓婁紶澶辫触: ${err}`
+                        })
+                    }
+                })
+            },
+            delFile(index) {
+                console.log('attachmentInfo: ', this.attachmentInfo[index]);
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            this.attachmentInfo.splice(index, 1)
+                        }
+                    },
+                })
+
+            },
+            handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
+                console.log('file: ', res);
+                let fileInfo = res.data[0]
+                this.attachmentInfo.push({
+                    fileName: fileInfo.name,
+                    size: fileInfo.size,
+                    status: '绛夊緟涓婁紶',
+                    filePath: fileInfo.tempFilePath
+                })
+            },
+            // 涓婁紶鏂囦欢
+            fileUpload() {
+                this.$refs.XeUpload.upload('file', {});
+            },
+            //鑾峰彇鐝鏁版嵁
+            async getShiftList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Web/GetGy_ShiftsList_Json',
+                        data: {
+                            Shifts: "",
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HShiftsList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+            async getHDeptList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Gy_Department/list',
+                        data: {
+                            sWhere: "",
+                            user: uni.getStorageSync('HUserName'),
+                            Organization: uni.getStorageSync('Organization')
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HDeptList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            // 鑾峰彇鑱屽憳鏁版嵁
+            async getEmpList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/PublicPageMethod/UserList',
+                        data: {
+                            sWhere: " where 1=1",
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HEmpList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            // 鑾峰彇楠岃瘉椤圭洰鏁版嵁
+            async getCheckProjList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Gy_RepairCheck/GetRepairCheckList',
+                        data: {
+                            sWhere: "",
+                            user: uni.getStorageSync('HUserName'),
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HRepairCheckList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            toScanCode() {
+                MpaasScan.scanCode(cb => {
+                    this.hfrom.HBarCode = cb
+                    this.GetMessageByBarCode(cb)
+                })
+            },
+            async GetMessageByBarCode(HBarCode) {
+                try {
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: "/Sc_PDA_MouldRepairCheckBill/txtHBarCode_KeyDown_List",
+                        data: {
+                            HBarCode: HBarCode,
+                        },
+                    })
+
+
+                    if (!res) {
+                        return
+                    }
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+
+                    if (count == 1) {
+                        console.log('data: ', data);
+                        this.hform.HMouldID = data[0].hmainid
+                        this.hform.HMouldName = data[0].妯″叿鍚嶇О
+                        this.hform.HMouldSpec = data[0].妯″叿鍝佺被
+                        this.hform.HMouldModel = data[0].妯″叿鍨嬪彿
+                        this.hform.HQty = 1
+
+                        this.enableEdit = false
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: Message
+                        })
+                    }
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: err
+                    })
+                }
+            },
+            async GetItemByEquipFile() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Web/GetItemByEquipFile",
+                        data: {
+                            "EquipProjectID": this.hform.HEquipID,
+                            "Type": "DJ",
+                            "HDate": this.hform.HBeginDate
+                        }
+                    })
+
+                    let {
+                        data,
+                        Message,
+                        count
+                    } = res.data
+                    if (count == 1) {
+                        this.hform.HEquipDotCheckRuleInterID = data[0].鐐规瑙勭▼ID
+                        this.hform.HEquipDotCheckRuleInterNo = data[0].鐐规瑙勭▼鍗曞彿
+                        this.hform.HPlanNo = data[0].鐐规璁″垝鍗�
+                        this.hform.HPlanInterID = (data[0].鐐规璁″垝ID == null ? 0 : data[0].鐐规璁″垝ID) == "" ? 0 : data[0]
+                            .鐐规璁″垝ID
+                        this.hform.HPlanEntryID = (data[0].鐐规璁″垝瀛怚D == null ? 0 : data[0].鐐规璁″垝瀛怚D) == "" ? 0 : data[
+                            0].鐐规璁″垝瀛怚D
+
+                        this.HCheckFileList = Array.from(data).map(item => {
+                            return {
+                                "HDotCheckItemID": item.HDotCheckItemID,
+                                "HDotCheckCode": item.鐐规椤圭洰浠g爜,
+                                "HDotCheckItem": item.鐐规椤圭洰,
+                                "HDotCheckPart": item.鐐规閮ㄤ綅,
+                                "HClaim": item.鍏蜂綋瑕佹眰,
+                                "HManagerID": item.璐熻矗浜篒D,
+                                "HManagerCode": item.璐熻矗浜轰唬鐮�,
+                                "HManagerName": item.璐熻矗浜哄悕绉�,
+                                "HSourceInterID": item.鐐规璁″垝ID == null ? 0 : item.鐐规璁″垝ID,
+                                "HSourceEntryID": item.鐐规璁″垝瀛怚D == null ? 0 : item.鐐规璁″垝瀛怚D,
+                                "HSourceBillNo": item.鐐规璁″垝鍗�,
+                                "HDotCheckItemClassID": 0,
+                                "HDotCheckItemClassName": "",
+                                "HDotCheckItemMethodID": 0,
+                                "HDotCheckItemMethodName": "",
+                                "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
+                            }
+                        })
+
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
+                    })
+                }
+            },
+            radioChange({
+                detail: {
+                    value
+                }
+            }) {
+                this.hform.HCheckResult = value
+            },
+            async getMaxNum() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Web/GetMAXNum",
+                        data: {
+                            "HBillType": this.HBillType
+                        }
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message
+                    } = res.data
+                    console.log('data: ', data);
+                    this.hform.HInterID = data[0]["HInterID"]
+                    this.hform.HBillNo = data[0]["HBillNo"]
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+                    })
+                }
+            },
+            async submit() {
+                let valid = this.ValidCheck()
+                if (!valid.state) {
+                    CommonUtils.showTips({
+                        message: valid.Message
+                    })
+                    return
+                }
+
+                try {
+                    let oMain = JSON.stringify(this.hform);
+                    this.HDetailList[0].HManagerID = this.hform.HManagerID
+                    this.HDetailList[0].HRepairID = this.hform.HRepairID
+                    let sSubStr = JSON.stringify(this.HDetailList);
+                    let sMainSub = oMain + ';' + sSubStr + `;${this.operationType}` + ';' + getUserInfo()[
+                        'Czymc'];
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: "/Sc_MouldRepairSendWorkBill/AddBill",
+                        data: {
+                            "sMainSub": sMainSub
+                        },
+                        method: "POST"
+                    })
+
+                    if (!res) {
+                        return
+                    }
+
+                    let {
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        uni.showModal({
+                            title: '鎻愮ず',
+                            content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+                            success: (res) => {
+                                if (res.confirm) {
+                                    console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                                    uni.redirectTo({
+                                        url: './Sb_EquipRepairSendWorkBill?operationType=1'
+                                    })
+                                } else if (res.cancel) {
+                                    console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                                    setTimeout(() => {
+                                        uni.navigateBack();
+                                    }, 50)
+                                }
+                            }
+                        });
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+                        })
+                    }
+
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "鎻愪氦鍗曟嵁澶辫触: " + err
+                    })
+                }
+            }
+        },
+        onLoad(e) {
+            console.log('e: ', e);
+            if (!e.operationType) {
+                this.operationType = 1
+            } else {
+                this.operationType = e.operationType
+            }
+
+            if (this.operationType == 1) {
+                // 鏂板
+                this.getMaxNum()
+            } else if (this.operationType == 2) {
+                // 澶嶅埗
+            } else if (this.operationType == 3) {
+                // 缂栬緫
+
+            } else if (this.operationType == 4) {
+                // 娴忚
+
+            }
+
+            this.getHDeptList()
+            this.getEmpList()
+            this.getCheckProjList()
+            this.getRepairList()
+        },
+        onReady() {
+            const query = uni.createSelectorQuery().in(this)
+            query.select("#buttons")
+                .boundingClientRect()
+                .select("#tabs")
+                .boundingClientRect()
+                .exec(res => {
+                    this.btnTop = Math.floor(res[0].top)
+                    this.tabsBottom = Math.ceil(res[1].bottom)
+                })
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJBillStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBillList.vue b/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBillList.vue
new file mode 100644
index 0000000..a05ae16
--- /dev/null
+++ b/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBillList.vue
@@ -0,0 +1,478 @@
+<template>
+    <view class="content">
+        <view class="form">
+            <view class="form-item">
+                <view class="title">寮�濮嬫椂闂�:</view>
+                <view class="right">
+                    <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
+                        <input :value="hform.HBeginDate" />
+                    </uni-datetime-picker>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">缁撴潫鏃堕棿:</view>
+                <view class="right">
+                    <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HEndDate">
+                        <input :value="hform.HEndDate" />
+                    </uni-datetime-picker>
+                </view>
+            </view>
+            <view v-if="showmore">
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�:</view>
+                    <view class="right">
+                        <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+                    </view>
+                </view>
+
+            </view>
+            <view class="other">
+                <view v-if="!showmore" @tap="changeShowMore">
+                    灞曞紑鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
+                </view>
+                <view v-if="showmore" @tap="changeShowMore">
+                    鎶樺彔鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
+                </view>
+            </view>
+
+            <view class="buttons">
+                <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+                <button class="btn-b" size="mini" type="default" @tap="add">鏂板</button>
+                <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+            </view>
+        </view>
+
+        <view id="divide" style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+        <view :style="{
+            height: calcContentHeight + 'px',
+            overflowY: 'auto'
+        }">
+            <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+                <uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+                    @tap="showDetail = showDetail==index?-1:index">
+                    <view class="card-detail">
+                        <view class="detail" v-if="item.鍒跺崟浜�">
+                            <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+                        </view>
+                        <view class="detail" v-if="item.浜у搧妯″叿浠g爜">
+                            <text>妯″叿浠g爜锛�</text>{{item.浜у搧妯″叿浠g爜}}
+                        </view>
+                        <view class="detail" v-if="item.浜у搧妯″叿">
+                            <text>妯″叿鍚嶇О锛�</text>{{item.浜у搧妯″叿}}
+                        </view>
+                        <view class="detail" v-if="item.璐熻矗浜�">
+                            <text>璐熻矗浜猴細</text>{{item.璐熻矗浜簘}
+                        </view>
+                        <view class="detail" v-if="item.缁翠慨椤圭洰">
+                            <text>缁翠慨椤圭洰锛�</text>{{item.缁翠慨椤圭洰}}
+                        </view>
+                        <view class="detail" v-if="item.缁翠慨閮ㄩ棬">
+                            <text>缁翠慨閮ㄩ棬锛�</text>{{item.缁翠慨閮ㄩ棬}}
+                        </view>
+                        <view class="detail" v-if="item.缁翠慨浜�">
+                            <text>缁翠慨浜猴細</text>{{item.缁翠慨浜簘}
+                        </view>
+                        <view class="detail" v-if="item.璁″垝缁翠慨宸ユ椂">
+                            <text>缁翠慨鏃堕棿锛�</text>{{ item.璁″垝缁翠慨宸ユ椂 + '' + item.鏃堕棿鍗曚綅}}
+                        </view>
+                        <view class="card-detail" v-if="showDetail == index">
+
+
+                            <view class="detail" v-if="item.琛ㄥご澶囨敞">
+                                <text>琛ㄥご澶囨敞锛�</text>{{item.琛ㄥご澶囨敞}}
+                            </view>
+                            <view class="detail" v-if="item.鍙戠敓鏃ユ湡">
+                                <text>寮�濮嬫棩鏈燂細</text>{{dayjs(item.鍙戠敓鏃ユ湡).format("YYYY-MM-DD HH:mm:DD")}}
+                            </view>
+                            <view class="detail" v-if="item.缁翠慨浜轰唬鐮�">
+                                <text>缁翠慨浜轰唬鐮侊細</text>{{item.缁翠慨浜轰唬鐮亇}
+                            </view>
+                            <view class="detail" v-if="item.缁翠慨閮ㄩ棬浠g爜">
+                                <text>缁翠慨閮ㄩ棬浠g爜锛�</text>{{item.缁翠慨閮ㄩ棬浠g爜}}
+                            </view>
+                            <view class="detail" v-if="item.璐熻矗浜轰唬鐮�">
+                                <text>璐熻矗浜轰唬鐮侊細</text>{{item.璐熻矗浜轰唬鐮亇}
+                            </view>
+                            <view class="detail" v-if="item.hmainid">
+                                <text>鍐呴儴鍗曟嵁鍙凤細</text>{{item.hmainid}}
+                            </view>
+                        </view>
+                    </view>
+
+                    <view class="more" v-if="showDetail == index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+                    <view class="more" v-if="showDetail != index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+                    <view class="op" v-if="operations == index">
+                        <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+                        <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+                        <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+                    </view>
+                </uni-card>
+            </view>
+        </view>
+        <view class="pagination-zone" id="pagination-zone">
+            <uni-pagination show-icon :page-size="size" :total="dataLength" :current="page"
+                @change="onPaginationChangeHandler"></uni-pagination>
+        </view>
+        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+    </view>
+</template>
+
+<script>
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import BarCodePopupVue from "@/components/BarCodePopup/BarCodePopup.vue";
+    import {
+        CommonUtils
+    } from "../../../utils/common";
+    import dayjs from "dayjs";
+    export default {
+        data() {
+            return {
+                dayjs,
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                tabs: 0,
+                urls: '/Web/GetMouldBillsList',
+                MvarReportTitle: '妯″叿缁翠慨娲惧伐鍗曠紦瀛�',
+                hform: {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 3843,
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    Type: "PG",
+                    sWhere: "",
+                    HBeginDate: dayjs(new Date()).subtract(30, 'day').format("YYYY-MM-DD"),
+                    HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                },
+                sWhere: '',
+                listData: [],
+                showList: [],
+                showDetail: -1,
+                operations: -1,
+
+                page: 1,
+                size: 20,
+                dataLength: 0,
+                divideBottom: 0,
+                paginationTop: 0,
+                showmore: false,
+            }
+        },
+        computed: {
+            calcContentHeight: {
+                get() {
+                    return this.paginationTop - this.divideBottom
+                }
+            }
+        },
+        onShow() {
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            this.CheckModRight()
+            this.changeTab(0)
+            console.log(this.userInfo, uni.getStorageSync('HUserName'))
+        },
+        components: {
+            BarCodePopupVue
+        },
+        onPullDownRefresh: function() {
+            this.clear()
+            setTimeout(() => {
+                uni.stopPullDownRefresh();
+            }, 1000);
+        },
+        onReady() {
+            this.getCalcHeight()
+        },
+        methods: {
+            changeShowMore() {
+                this.showmore = !this.showmore
+                this.$nextTick(() => {
+                    // 閲嶆柊璁$畻鍐呭瑙嗗彛楂樺害
+                    this.getCalcHeight()
+                })
+            },
+            getCalcHeight() {
+                let query = uni.createSelectorQuery().in(this)
+                query
+                    .select("#divide")
+                    .boundingClientRect()
+                    .select("#pagination-zone")
+                    .boundingClientRect()
+                    .exec(res => {
+                        this.divideBottom = Math.ceil(res[0].bottom)
+                        this.paginationTop = Math.floor(res[1].top)
+                    })
+            },
+            async qrCodeDisplay(item) {
+                this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+                await this.$nextTick()
+                this.$refs.barcodePopup.open()
+            },
+            CheckModRight() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+                    data: {
+                        ModRightName: 'CE_OtherOut',
+                        HUserName: uni.getStorageSync('HUserName')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {} else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            onPaginationChangeHandler({
+                current
+            }) {
+                this.page = current
+                this.showList = this.getPage(current, this.size, this.listData)
+            },
+            getPage(page, size, list) {
+                let sindex = (parseInt(page) - 1) * size
+                let eindex = parseInt(page) * size
+                let newList = list.slice(sindex, eindex)
+                return newList
+            },
+            changeTab(e) {
+                this.tabs = e
+                this.page = 1
+                this.showList = []
+
+                if (this.tabs == 0) {
+                    this.urls = '/Web/GetMouldBillsList'
+                }
+                // if (this.tabs == 1) {
+                // 	this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+                // }
+                this.search()
+            },
+            async getList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: this.urls,
+                        data: this.hform
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message
+                    } = res.data
+
+                    if (count == 1) {
+                        if (data == null) {
+                            data = []
+                        }
+                        this.listData = data
+                        console.log('data: ', data);
+                        this.showList = this.getPage(this.page, this.size, data)
+                        this.dataLength = data.length
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${err}`
+                    })
+                }
+
+            },
+            search() {
+                this.hform.sWhere = ''
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                console.log(this.hform)
+                if (this.hform.HBillNo) {
+                    this.hform.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+                }
+                if (this.hform.HBeginDate && this.hform.HEndDate) {
+                    this.hform.sWhere +=
+                        ` and convert(date,鏃ユ湡) between convert(date, '${this.hform.HBeginDate}') and convert(date, '${this.hform.HEndDate}')`;
+                }
+                this.getList()
+            },
+            clear() {
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                this.sWhere = ''
+                this.hform = {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 3843,
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    Type: "PG",
+                    sWhere: "",
+                    HBeginDate: dayjs(new Date()).subtract(30, 'day').format("YYYY-MM-DD"),
+                    HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                }
+                this.search()
+            },
+            add() {
+                uni.navigateTo({
+                    url: '/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill?operationType=1'
+                })
+            },
+            //缂栬緫
+            edit(item) {
+                console.log(item)
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
+                    data: {
+                        "HInterID": item.HInterID,
+                        "HBillNo": item.鍗曟嵁鍙�,
+                        "HBillType": this.hform.HBillType
+                    },
+                    success: (res) => {
+                        console.log(1, res);
+                        if (res.data.count == 1) {
+                            uni.navigateTo({
+                                url: './OtherOutBill?OperationType=2&HInterID=' + item.HInterID
+                            })
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.hideLoading()
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                })
+            },
+            //鍒犻櫎
+            del(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/Sc_MouldRepairSendWorkBill/MouldDeleteBill',
+                                data: {
+                                    HInterID: item.hmainid,
+                                    user: uni.getStorageSync('HUserName'),
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+            //鎾ら攢
+            revoke(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '鏄惁纭鎾ら攢',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
+                                data: {
+                                    HInterID: item.HInterID,
+                                    HBillNo: item.鍗曟嵁鍙�,
+                                    HBillType: this.hform.HBillType,
+                                    HMaker: uni.getStorageSync('HUserName'),
+                                    MvarReportTitle: this.MvarReportTitle,
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJListStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujubaoyangjiludan/MouldMaintainBill.vue b/pages/MJGL/mujubaoyangjiludan/MouldMaintainBill.vue
deleted file mode 100644
index 39935b7..0000000
--- a/pages/MJGL/mujubaoyangjiludan/MouldMaintainBill.vue
+++ /dev/null
@@ -1,772 +0,0 @@
-<template>
-	<view>
-		<view class="form">
-			<view class="form-item">
-				<view class="title">鍗曟嵁鍙�:</view>
-				<view class="righton">
-					<input name="HBillNo" v-model="hform.HBillNo" disabled placeholder="璇疯緭鍏ュ崟鎹彿" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鏃ユ湡:</view>
-				<view class="righton">
-					<input name="HDate" disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鍐呴儴鍗曟嵁鍙�:</view>
-				<view class="right">
-					<input name="HInnerBillNo" v-model="hform.HInnerBillNo" placeholder="璇疯緭鍏ュ唴閮ㄥ崟鎹彿" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">妯″叿缂栫爜:</view>
-				<view class="righton">
-					<input name="HMouldNumber" disabled v-model="hform.HMouldNumber" placeholder="璇疯緭鍏ユā鍏风紪鐮�" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title"><text>*</text>妯″叿:</view>
-				<view class="right" style="width: 380rpx;">
-					<input name="HMouldName" v-model="hform.HMouldName" @blur="getHBarCodeData(hform.HMouldName)"
-						placeholder="璇锋壂鎻忔ā鍏锋潯鐮�" />
-				</view>
-				<uni-icons type="scan"
-					style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;font-weight: 500;"
-					size="20" @click="toScanCode"></uni-icons>
-			</view>
-
-
-			<view class="tab_area"></view>
-
-			<view class="form-item">
-				<view class="title">淇濆吇寮�濮�:</view>
-				<view class="right">
-					<picker mode="date" v-model="hform.HBeginDate" @change="HBeginDateChange">
-						<view class="picker-overlay"></view>
-						<input name="HBeginDate" disabled v-model="hform.HBeginDate" placeholder="璇烽�夋嫨淇濆吇寮�濮嬫棩鏈�" />
-					</picker>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">淇濆吇缁撴潫:</view>
-				<view class="right">
-					<picker mode="date" v-model="hform.HEndDate" @change="HEndDateChange">
-						<view class="picker-overlay"></view>
-						<input name="HEndDate" disabled v-model="hform.HEndDate" placeholder="璇烽�夋嫨淇濆吇缁撴潫鏃ユ湡" />
-					</picker>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">淇濆吇璁″垝缂栧彿:</view>
-				<view class="right" style="width: 380rpx;" @tap="showPlan=true">
-					<input name="HPlanName" disabled v-model="hform.HPlanName" placeholder="璇烽�夋嫨淇濆吇璁″垝缂栧彿" />
-				</view>
-				<uni-icons type="list"
-					style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;font-weight: 500;"
-					size="20" @click="showPlan=true"></uni-icons>
-			</view>
-			<view class="form-item">
-				<view class="title"><text>*</text>妯″叿淇濆吇瑙勭▼:</view>
-				<view class="right">
-					<uni-combox :candidates="arrayHMouldMaintainRuleInterNo" placeholder="璇烽�夋嫨妯″叿淇濆吇瑙勭▼"
-						v-model="hform.HMouldMaintainRuleInterNo" @input="HMouldMaintainRuleInterNoChange"></uni-combox>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title"><text>*</text>妯″叿淇濆吇绾у埆:</view>
-				<view class="right">
-					<uni-combox :candidates="arrayHMaintainLev" placeholder="璇烽�夋嫨妯″叿淇濆吇绾у埆" v-model="hform.HMaintainLevName"
-						@input="HMaintainLevChange"></uni-combox>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title"><text>*</text>缁撴灉鍒ゅ畾:</view>
-				<view class="right" style="display: flex; align-items: center; padding: 0 20rpx; border: none;">
-					<view style="display: flex; align-items: center;">
-						<checkbox-group @change="onLastResultChange">
-							<checkbox :value="'true'" :checked="hform.HLastResult"></checkbox>
-						</checkbox-group>
-						<text style="margin-left: 10rpx;">鍚堟牸</text>
-
-					</view>
-				</view>
-			</view>
-
-			<view class="tab_area"></view>
-
-			<view class="form-item" style="align-items: flex-start;">
-				<view class="title">鎽樿:</view>
-				<view class="right" style="min-height: 150rpx;">
-					<textarea name="HExplanation" v-model="hform.HExplanation" auto-height maxlength="-1"
-						placeholder="璇疯緭鍏ユ憳瑕�"></textarea>
-				</view>
-			</view>
-
-			<view class="tab_area"></view>
-
-			<view class="form-item" style="align-items: flex-start;">
-				<view class="title">澶囨敞:</view>
-				<view class="right" style="min-height: 150rpx;">
-					<textarea name="HRemark" v-model="hform.HRemark" auto-height maxlength="-1"
-						placeholder="璇疯緭鍏ュ娉�"></textarea>
-				</view>
-			</view>
-
-			<view class="tab_area"></view>
-
-			<view v-if="showmore">
-				<view class="form-item">
-					<view class="title">鍒跺崟浜�:</view>
-					<view class="righton">
-						<input v-model="hform.HMaker" disabled />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鍒跺崟鏃ユ湡:</view>
-					<view class="righton">
-						<input v-if="hform.HMakeDate" v-model="hform.HMakeDate.substr(0,10)" disabled />
-						<input v-else v-model="hform.HMakeDate" disabled />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">淇敼浜�:</view>
-					<view class="righton">
-						<input v-model="hform.HUpDater" disabled />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">淇敼鏃ユ湡:</view>
-					<view class="righton">
-						<input v-if="hform.HUpDateDate" v-model="hform.HUpDateDate.substr(0,10)" disabled />
-						<input v-else v-model="hform.HUpDateDate" disabled />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">瀹℃牳浜�:</view>
-					<view class="righton">
-						<input v-model="hform.HChecker" disabled />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">瀹℃牳鏃ユ湡:</view>
-					<view class="righton">
-						<input v-if="hform.HCheckDate" v-model="hform.HCheckDate.substr(0,10)" disabled />
-						<input v-else v-model="hform.HCheckDate" disabled />
-					</view>
-				</view>
-			</view>
-			<view class="other">
-				<view v-if="!showmore" @tap="showmore = true">
-					灞曞紑鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
-				</view>
-				<view v-if="showmore" @tap="showmore = false">
-					鎶樺彔鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="tip"><text>*</text>娉�: 璇风偣鍑讳笅鏂圭豢鑹叉柊澧炴寜閽坊鍔犱繚鍏婚」淇℃伅锛堝繀濉級</view>
-			</view>
-
-			<view class="bottom-btn">
-				<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-				<button class="btn-b" size="mini" @tap="showMask = true">鏂板</button>
-				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
-			</view>
-		</view>
-
-		<plan @planData="getPlanData" @close="closeMask" v-if="showPlan"></plan>
-		<formDetail :form1List='form1List' @hformList='hformList' v-if="showMask"></formDetail>
-	</view>
-</template>
-<script>
-	import getDateTime from '@/utils/getdateTime.js';
-	import plan from './plan.vue';
-	import formDetail from './formDetail.vue';
-	import {
-		getUserInfo
-	} from '../../../utils/auth'
-	export default {
-		components: {
-			plan,
-			formDetail
-		},
-		data() {
-			return {
-				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-				arrayHMouldName: [],
-				showPlan: false,
-				showmore: false,
-				arrayHMouldMaintainRuleInterNo: [], //瑙勭▼
-				HMouldMaintainRuleInterNoList: [],
-				arrayHMaintainLev: [], //绾у埆
-				HMaintainLevList: [],
-				hform: {
-					HInterID: 0,
-					HBillNo: '',
-					HDate: getDateTime.dateTimeStr('y-m-d'),
-					HInnerBillNo: '',
-					HMouldID: '',
-					HMouldName: '',
-					HMouldNumber: '',
-					HQty: 0,
-					HLastResult: 'true',
-					HPlanNo: '',
-					HPlanInterID: '',
-					HMouldMaintainPlanInterID: '',
-					HMouldMaintainPlanEntryID: '1',
-					HMainSourceInterID: '',
-					HMainSourceEntryID: '0',
-					HMainSourceBillNo: '',
-					HMaintainLevID: '',
-					HMaintainLevName: '',
-					HBeginDate: '',
-					HEndDate: '',
-					HMouldMaintainRuleInterID: '',
-					HMouldMaintainRuleInterNo: '',
-					HExplanation: '',
-					HRemark: '',
-					HMaker: getUserInfo().Czymc,
-					HMakeDate: '',
-					HUpDater: '',
-					HUpDateDate: '',
-					HChecker: '',
-					HCheckDate: '',
-					HCloseMan: '',
-					HCloseDate: '',
-					HDeleteMan: '',
-					HDeleteDate: '',
-				},
-
-				showMask: false,
-				form1List: [],
-				form2List: [],
-			}
-		},
-		onLoad(e) {
-			this.getHMouldMaintainRuleInterList()
-			this.getHMaintainLevList()
-			if (e.hmainid) {
-				this.getEditData(e.hmainid)
-			} else {
-				this.getNewData()
-			}
-
-		},
-		methods: {
-			//鐩戝惉澶嶉�夋
-			onLastResultChange(e) {
-				// 閫氳繃 value 鍒ゆ柇鐘舵��
-				this.hform.HLastResult = e.detail.value.includes('true');
-			},
-			//鎵爜
-			toScanCode() {
-				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
-				mpaasScanModule.mpaasScan({
-					'hideAlbum': true,
-					'timeoutInterval': '10', //瓒呮椂鏃堕棿
-					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
-				}, (ret) => {
-					console.log(ret.resp_result)
-					this.hform.HMouldName = ret.resp_result
-					this.getHBarCodeData(ret.resp_result)
-				})
-			},
-			getHBarCodeData(HBarCode) {
-				uni.request({
-					url: this.serverUrl + '/QJ_PDA_MouldDotCheckBill/txtHBarCode_KeyDown',
-					data: {
-						HBarCode: this.hform.HMouldName
-					},
-					success: (res) => {
-						console.log(res.data);
-						if (res.data.count == 1) {
-							var data = res.data.data[0]
-							this.hform.HMouldID = data.HInterID
-							this.hform.HMouldName = data.HName
-							this.hform.HMouldNumber = data.HMouldNo
-						}
-						uni.showToast({
-							title: res.data.Message,
-							icon: 'none'
-						})
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//淇濆吇寮�濮嬮�夋嫨
-			HBeginDateChange(e) {
-				console.log(e.detail.value)
-				this.hform.HBeginDate = e.detail.value
-			},
-			//淇濆吇缁撴潫閫夋嫨
-			HEndDateChange(e) {
-				console.log(e.detail.value)
-				this.hform.HEndDate = e.detail.value
-			},
-
-			//閫夋嫨淇濆吇璁″垝缂栧彿
-			getPlanData(e) {
-				console.log(e)
-				this.hform.HPlanNo = e.HPlanName
-				this.hform.HPlanName = e.HPlanName
-				this.hform.HPlanInterID = e.HInterID
-				this.hform.HMouldMaintainPlanInterID = e.HInterID
-				this.hform.HMainSourceInterID = e.HInterID
-				this.hform.HMainSourceBillNo = e.HPlanName
-				this.showPlan = false
-				//瀛愯〃
-				uni.request({
-					url: this.serverUrl + '/Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBillListProjectDetaiNew',
-					data: {
-						HInterID: e.HPlanNo
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.form1List = res.data.list[0];
-							console.log(2, res.data.list[0]);
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			closeMask(e) {
-				this.showPlan = false
-			},
-			//鑾峰彇妯″叿淇濆吇绾у埆
-			getHMaintainLevList() {
-				uni.request({
-					url: this.serverUrl + '/Gy_BadReason/Gy_MaintainLevList',
-					data: {
-						sWhere: '',
-						user: uni.getStorageSync('HUserName')
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.arrayHMaintainLevList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHMaintainLev[i] = res.data.data[i].淇濆吇绾у埆鍚嶇О
-							}
-							this.$forceUpdate();
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			// 閫夋嫨妯″叿淇濆吇绾у埆
-			HMaintainLevChange(e) {
-				for (var i = 0; i < this.arrayHMaintainLevList.length; i++) {
-					if (this.arrayHMaintainLevList[i].淇濆吇绾у埆鍚嶇О == e) {
-						this.hform.HMaintainLevID = this.arrayHMaintainLevList[i].HItemID;
-						this.hform.HMaintainLevName = this.arrayHMaintainLevList[i].淇濆吇绾у埆鍚嶇О;
-					}
-				}
-			},
-			//鑾峰彇妯″叿淇濆吇瑙勭▼鍒楄〃鏁版嵁
-			getHMouldMaintainRuleInterList() {
-				uni.request({
-					url: this.serverUrl + '/Sc_MouldMaintainRuleBill/GetMouldMaintainRuleList',
-					data: {
-						sWhere: '',
-						user: uni.getStorageSync('HUserName')
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HMouldMaintainRuleInterNoList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHMouldMaintainRuleInterNo[i] = res.data.data[i].鍗曟嵁鍙�
-							}
-							this.$forceUpdate();
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨妯″叿淇濆吇瑙勭▼
-			HMouldMaintainRuleInterNoChange(e) {
-				for (var i = 0; i < this.HMouldMaintainRuleInterNoList.length; i++) {
-					if (this.HMouldMaintainRuleInterNoList[i].鍗曟嵁鍙� == e) {
-						this.hform.HMouldMaintainRuleInterID = this.HMouldMaintainRuleInterNoList[i].hmainid
-						this.hform.HMouldMaintainRuleInterNo = this.HMouldMaintainRuleInterNoList[i].鍗曟嵁鍙�
-						//瀛愯〃
-						uni.request({
-							url: this.serverUrl +
-								'/Sc_MouldMaintainRuleBill/GetMouldRuleSubList-Detail',
-							data: {
-								HInterID: this.hform.HMouldMaintainRuleInterID,
-								HBillType: '3819'
-							},
-							success: (res) => {
-								if (res.data.count == 1) {
-									this.form1List = res.data.list[0];
-									console.log(2, res.data.list[0]);
-								} else {
-									uni.showToast({
-										title: res.data.Message,
-										icon: 'none'
-									})
-								}
-							},
-							fail: (res) => {
-								console.log(res);
-								uni.showToast({
-									title: '鎺ュ彛璇锋眰澶辫触',
-									icon: 'none'
-								})
-							},
-						});
-					}
-				}
-			},
-
-			hformList(e) {
-				console.log(e)
-				this.form1List = e
-				this.showMask = false
-			},
-
-			//缂栬緫
-			getEditData(hmainid) {
-				//涓昏〃
-				uni.request({
-					url: this.serverUrl + '/Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai',
-					data: {
-						HID: hmainid
-					},
-					success: (res) => {
-						console.log(1, res.data.data.h_v_Sc_MouldMaintain);
-						if (res.data.code == 1) {
-							var data = res.data.data.h_v_Sc_MouldMaintain[0]
-							this.hform = {
-								HInterID: hmainid,
-								HBillNo: data.鍗曟嵁鍙�,
-								HDate: data.鏃ユ湡.substr(0, 10),
-								HInnerBillNo: data.鍐呴儴鍗曟嵁鍙�,
-								HMouldID: data.HMouldID,
-								HMouldNumber: data.浜у搧妯″叿缂栧彿,
-								HMouldName: data.浜у搧妯″叿,
-								HPlanNo: data.淇濆吇璁″垝缂栧彿,
-								HPlanName: data.淇濆吇璁″垝缂栧彿,
-								HPlanInterID: data.淇濆吇璁″垝鍐呯爜,
-								HBeginDate: data.淇濆吇寮�濮嬫棩鏈�.substr(0, 10),
-								HEndDate: data.淇濆吇缁撴潫鏃ユ湡.substr(0, 10),
-								HMouldMaintainRuleInterID: data.HMouldMaintainRuleInterID,
-								HMouldMaintainRuleInterNo: data.鍣ㄥ叿淇濆吇瑙勭▼,
-								HMaintainLevID: data.HMaintainLevID,
-								HMaintainLevName: data.淇濆吇绾у埆鍚嶇О,
-								HExplanation: data.鎽樿,
-								HRemark: data.琛ㄥご澶囨敞,
-								HLastResult: data.鏈�缁堢粨璁� === '鍚堟牸',
-								
-								HMaker: data.鍒跺崟浜�,
-								HMakeDate: data.鍒跺崟鏃ユ湡,
-								HUpDater: data.淇敼浜�,
-								HUpDateDate: data.淇敼鏃ユ湡,
-								HChecker: data.瀹℃牳浜�,
-								HCheckDate: data.瀹℃牳鏃ユ湡,
-								HDeleteMan: data.浣滃簾浜�,
-								HDeleteDate: data.浣滃簾鏃ユ湡,
-							}
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-				//瀛愯〃
-				uni.request({
-					url: this.serverUrl + '/Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew',
-					data: {
-						HInterID: hmainid
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.form1List = res.data.list[0];
-							console.log(2, res.data.list[0]);
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//鏂板
-			getNewData() {
-				uni.request({
-					url: this.serverUrl + '/Web/GetMAXNum',
-					data: {
-						HBillType: '3819'
-					},
-					success: (res) => {
-						console.log(res.data)
-						if (res.data.count == 1) {
-							this.hform.HInterID = 0
-							this.hform.HBillNo = res.data.data[0].HBillNo
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-
-			submit() {
-				if (!this.hform.HDate) {
-					uni.showToast({
-						title: '璇烽�夋嫨鏃ユ湡',
-						icon: 'none'
-					})
-				} else if (!this.hform.HMouldID) {
-					uni.showToast({
-						title: '璇烽�夋嫨妯″叿',
-						icon: 'none'
-					})
-				} else if (!this.hform.HBeginDate) {
-					uni.showToast({
-						title: '璇烽�夋嫨淇濆吇寮�濮嬫棩鏈�',
-						icon: 'none'
-					})
-				} else if (!this.hform.HEndDate) {
-					uni.showToast({
-						title: '璇烽�夋嫨淇濆吇缁撴潫鏃ユ湡',
-						icon: 'none'
-					})
-				} else if (!this.hform.HMouldMaintainRuleInterID) {
-					uni.showToast({
-						title: '璇烽�夋嫨妯″叿淇濆吇瑙勭▼',
-						icon: 'none'
-					})
-				} else if (this.form1List.length == 0) {
-					uni.showToast({
-						title: '璇锋柊澧炰繚鍏婚」淇℃伅锛屼繚鍏婚」涓嶅彲涓虹┖',
-						icon: 'none'
-					})
-				} else {
-					uni.showLoading({
-						title: '璇风◢鍊�'
-					})
-					var sMainStr = JSON.stringify(this.hform);
-					var sSubStr = JSON.stringify(this.form1List);
-					this.form2List = [{
-						HManagerID: 0,
-						HManagerName: '',
-						HManagerNumber: '',
-						HMaterID: 0,
-						HMaterName: '',
-						HMaterNumber: '',
-						HQty: 0,
-						HQtyMust: 0,
-						HRemark: "",
-						HUnitID: 0,
-						HUnitName: '',
-						HUnitNumber: '',
-					}]
-					var sSubStr1 = JSON.stringify(this.form2List);
-					//PDA鐩墠鍙兘鏀寔涓�涓瓙琛�
-					//var sMainSub = sMainStr + ';' + sSubStr + ";" + sSubStr1 + ";" + uni.getStorageSync('HUserName');
-					var sMainSub = sMainStr + ';' + sSubStr + ";" + uni.getStorageSync('HUserName');
-					console.log(sMainSub);
-					uni.request({
-						url: this.serverUrl + '/Sc_MouldMaintainBill/SaveGetMouldMaintainBillListPDA',
-						method: 'POST',
-						dataType: "json",
-						data: {
-							msg: sMainSub
-						},
-						success: (res) => {
-							console.log(1, res);
-							uni.hideLoading()
-							if (res.data.count == 1) {
-
-							}
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						},
-						fail: (res) => {
-							console.log(res);
-							uni.showToast({
-								title: '鎺ュ彛璇锋眰澶辫触',
-								icon: 'none'
-							})
-						},
-					});
-				}
-			},
-			goBack() {
-				uni.navigateBack()
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.form {
-		width: 668rpx;
-		margin: 20rpx auto;
-		padding-bottom: 240rpx;
-	}
-
-	.tab_area {
-		width: 100%;
-		height: 50rpx;
-	}
-
-	.form-item {
-		display: flex;
-		align-items: center;
-		font-size: 30rpx;
-		padding: 6rpx 0;
-
-		.title {
-			width: 208rpx;
-		}
-
-		.right {
-			width: 450rpx;
-			border-radius: 22rpx;
-			border: 1px solid #acacac;
-		}
-
-		.righton {
-			width: 450rpx;
-			border-radius: 22rpx;
-			border: 1px solid #e4e4e4;
-			background-color: #e4e4e4;
-		}
-
-		text {
-			color: red;
-			font-weight: bold;
-		}
-
-		input {
-			width: 100%;
-			padding: 8rpx 20rpx;
-			font-size: 30rpx;
-		}
-
-		textarea {
-			width: 98%;
-			padding: 8rpx 20rpx;
-			font-size: 30rpx;
-		}
-
-		.tip {
-			color: #da9100;
-			margin-top: 20rpx;
-		}
-	}
-
-	.other {
-		margin-top: 8rpx;
-		text-align: center;
-		font-size: 28rpx;
-		padding: 4rpx 18rpx;
-		color: #1890FF;
-	}
-
-	.bottom-btn {
-		width: 100%;
-		// height: 120rpx;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		background-color: #fff;
-		box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
-		padding: 30rpx 40rpx 40rpx 40rpx;
-
-		button {
-			border-radius: 50rpx;
-			width: 180rpx;
-			height: 66rpx;
-			line-height: 66rpx;
-			font-size: 28rpx;
-		}
-
-		.btn-a {
-			background-color: #3A78FF;
-			color: #fff;
-		}
-
-		.btn-b {
-			background-color: #41a863;
-			color: #fff;
-			margin-left: 30rpx;
-		}
-
-		.btn-c {
-			background-color: #acacac;
-			color: #fff;
-			position: absolute;
-			right: 120rpx;
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue
new file mode 100644
index 0000000..be9739d
--- /dev/null
+++ b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue
@@ -0,0 +1,872 @@
+<template>
+	<view>
+		<view class="tabs" id="tabs">
+			<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+			<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鏄庣粏淇℃伅</view>
+			<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
+			<view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view>
+		</view>
+		<!-- 鍩烘湰淇℃伅 -->
+		<template v-if="tabs == 0">
+			<view class="form" :style="{height: containerHeight + 'px',overflow: 'auto' }">
+				<view class="form-item">
+					<view class="title">妯″叿鏉$爜:</view>
+					<view class="right">
+						<input v-model="hform.HBarCode" @confirm="GetMessageByBarCode(hform.HBarCode)"
+							placeholder="璇疯緭鍏�(鎴栨壂鎻�)妯″叿鏉$爜" />
+					</view>
+					<view class="icon-wrapper">
+						<uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇濆吇寮�濮�:</view>
+					<view class="right">
+						<uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
+							<input :value="hform.HBeginDate" />
+						</uni-datetime-picker>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇濆吇缁撴潫:</view>
+					<view class="right">
+						<uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HEndDate">
+							<input :value="hform.HEndDate" />
+						</uni-datetime-picker>
+					</view>
+				</view>
+				<view class="form-item" v-if="false">
+					<view class="title">鏁伴噺:</view>
+					<view class="right">
+						<input type="number" v-model="hform.HQty" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏈�缁堢粨璁�:</view>
+					<view class="right none-border">
+						<radio-group @change="radioChange" class="radio_Container">
+							<label>
+								<view>
+									<radio value="OK" :checked="hform.HLastResult == 'OK'" />
+									<text>OK</text>
+								</view>
+							</label>
+							</label>
+							<view>
+								<radio value="NG" :checked="hform.HLastResult == 'NG'" />
+								<text>NG</text>
+							</view>
+							</label>
+						</radio-group>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HBillNo" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鏃ユ湡:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">澶囨敞:</view>
+					<view class="right">
+						<input v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">妯″叿鍚嶇О:</view>
+					<view class="righton">
+						<input v-model="hform.HBarName" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">妯″叿瑙勬牸:</view>
+					<view class="righton">
+						<input v-model="hform.HBarSpec" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">妯″叿鍨嬪彿:</view>
+					<view class="righton">
+						<input v-model="hform.HBarModel" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇濆吇璁″垝:</view>
+					<view class="righton">
+						<input v-model="hform.HPlanNo" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇濆吇绾у埆:</view>
+					<zxz-uni-data-select class="right" :localdata="HMaintainLevList" dataKey="淇濆吇绾у埆鍚嶇О"
+						dataValue="HItemID" v-model="hform.HMaintainLevID">
+					</zxz-uni-data-select>
+				</view>
+			</view>
+		</template>
+		<!-- 鏄庣粏淇℃伅 -->
+		<template v-if="tabs == 1">
+			<view class="form">
+				<view class="form-item">
+					<view class="left">
+						妯″叿淇濆吇瑙勭▼
+					</view>
+					<view class="right">
+						<input type="text" :value="hform.HMouldMaintainRuleInterNo" />
+					</view>
+					<view class="icon-wrapper">
+						<uni-icons type="search" size="20" @click="toCheckFile"></uni-icons>
+					</view>
+				</view>
+			</view>
+			<view class="list" v-for="(item,index) in HCheckFileList" :key="index">
+				<uni-card style="margin: 10px;">
+					<view class="card-detail">
+						<view class="detail">
+							<text>搴忓彿锛�</text>{{index+1}}
+						</view>
+						<view class="detail">
+							<text>缁撴灉锛�</text>
+							<checkbox-group style="display: inline-block;"
+								@change="checkBoxChangeHandler(index, $event)">
+								<checkbox value="enabled" :checked="item.HMaintainResult" />
+							</checkbox-group>
+						</view>
+						<view class="detail" v-if="false">
+							<text>淇濆吇椤圭洰ID锛�</text>{{item.HMaintainItemID}}
+						</view>
+						<view class="detail">
+							<text>淇濆吇椤圭洰锛�</text>{{item.HMaintainItem}}
+						</view>
+						<view class="detail">
+							<text>淇濆吇閮ㄤ綅锛�</text>{{item.HMaintainPart}}
+						</view>
+						<view class="detail">
+							<text>鍏蜂綋瑕佹眰锛�</text>{{item.HClaim}}
+						</view>
+						<view class="detail" v-if="false">
+							<text>璐熻矗浜篒D锛�</text>{{item.HManagerID}}
+						</view>
+						<view class="detail">
+							<text>璐熻矗浜哄悕绉帮細</text>{{item.HManagerName}}
+						</view>
+						<view class="detail">
+							<text>澶囨敞锛�</text>{{item.HRemark}}
+						</view>
+						<view class="detail" v-if="false">
+							<text>婧愬崟ID锛�</text>{{item.HSourceInterID}}
+						</view>
+						<view class="detail" v-if="false">
+							<text>婧愬崟瀛怚D锛�</text>{{item.HSourceEntryID}}
+						</view>
+						<view class="detail" v-if="false">
+							<text>婧愬崟鍙凤細</text>{{item.HSourceBillNo}}
+						</view>
+
+					</view>
+				</uni-card>
+			</view>
+			<view class="over" v-if="HCheckFileList.length == 0">鏆傛棤鏁版嵁</view>
+		</template>
+		<!-- 鍏朵粬淇℃伅 -->
+		<template v-if="tabs == 2">
+			<view class="form" :style="{height: containerHeight + 'px', overflow: 'auto'}">
+				<view class="form-item">
+					<view class="title">鍒涘缓浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HMaker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒涘缓鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HMakeDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDater" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDateDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HChecker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳鏃堕棿:</view>
+					<view class="righton">
+						<input v-model="hform.HCheckDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteMan" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteDate" />
+					</view>
+				</view>
+			</view>
+
+		</template>
+		<!-- 闄勪欢淇℃伅 -->
+		<template v-if="tabs == 3">
+			<view class="card-item-wrapper">
+				<view class="attachment-btns">
+					<button type="primary" size="mini" @tap="fileUpload">閫夋嫨鏂囦欢</button>
+					<view style="flex: 1;"></view>
+				</view>
+				<view v-for="(item, index) in attachmentInfo" :key="index">
+					<uni-card :title="item['fileName']" :thumbnail="item.filePath">
+						<view class="card-detail">
+							<view class="detail">
+								<text>澶у皬锛�</text>{{item["size"]}}
+							</view>
+							<view class="detail">
+								<text>鐘舵�侊細</text>{{item["status"]}}
+							</view>
+							<view class="detail operation" v-if="item['status']!='涓婁紶鎴愬姛'">
+								<text>鎿嶄綔锛�</text>
+								<button class="btn-a" size="mini" @tap.stop="uploadFile(index)">涓婁紶</button>
+								<button class="btn-b" size="mini" @tap.stop="delFile(index)">鍒犻櫎</button>
+							</view>
+						</view>
+					</uni-card>
+				</view>
+			</view>
+		</template>
+		<!-- 鎿嶄綔鎸夐挳 -->
+		<view class="buttons" id="buttons">
+			<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			<view style="flex: 1;"></view>
+			<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+			<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+		</view>
+		<xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
+	</view>
+</template>
+
+<script>
+	import dayjs from "dayjs";
+	import {
+		CommonUtils
+	} from "@/utils/common";
+	import {
+		MpaasScan
+	} from "@/utils/mpaasScan.js"
+	import "@/pages/MJGL/style/MJBillStyle.scss"
+	import {
+		getUserInfo
+	} from "../../../utils/auth";
+	import {
+		TrackOpTypes
+	} from "vue";
+	export default {
+		name: 'Sc_MouldMaintainBill',
+		data() {
+			return {
+				tabs: 0,
+				HMainSourceBillType: "",
+				btnTop: 0,
+				tabsBottom: 0,
+				HModName: "Sc_MouldMaintainBill",
+				HBillType: '3819',
+				operationType: 1,
+				uploadOptions: {},
+
+				HMaintainLevList: [],
+				HCheckFileList: [],
+				attachmentInfo: [],
+
+				hform: {
+					HBarCode: "",
+					HBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+					HEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+					HQty: 1,
+					HBillNo: "",
+					HInterID: 0,
+					HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+					HMaintainLevName: "",
+					HMaintainLevID: 0,
+					HRemark: "",
+					HBarName: "",
+					HMouldID: 0,
+					HBarSpec: "",
+					HBarModel: "",
+					HPlanNo: "",
+					HPlanInterID: 0,
+					HMouldMaintainRuleInterID: 0,
+					HMouldMaintainRuleInterNo: "",
+					HRequestComDate: dayjs(new Date()).format("YYYY-MM-DD"),
+					HRecentMainModule: 0,
+					HCumulativeModule: 0,
+					HProductionModule: 0,
+					HExplanation: "",
+					HInnerBillNo: "",
+					HMainSourceInterID: 0,
+					HMainSourceEntryID: 0,
+					HMainSourceBillNo: "",
+					HMaker: getUserInfo()['Czymc'],
+					HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
+					HUpDater: "",
+					HUpDateDate: "",
+					HChecker: "",
+					HCheckDate: "",
+					HDeleteMan: "",
+					HDeleteDate: "",
+					lngBillKey: 0,
+					lngBillSubKey: 0,
+					HLastResult: "OK"
+				}
+			};
+		},
+		computed: {
+			containerHeight: {
+				get() {
+					return this.btnTop - this.tabsBottom - 5
+				}
+			}
+		},
+		methods: {
+			goBack() {
+				uni.navigateBack()
+			},
+			checkBoxChangeHandler(index, e) {
+				let cr = e.detail.value
+				if (cr.length == 0) {
+					this.HCheckFileList[index]["HMaintainResult"] = false
+				} else {
+					this.HCheckFileList[index]["HMaintainResult"] = true
+				}
+			},
+			uploadFile(index) {
+				console.log('filePath: ', this.attachmentInfo[index].filePath);
+				// 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
+				uni.uploadFile({
+					url: CommonUtils.getServerUrl() + "/Sc_MouldMaintainBill/UploadFile",
+					filePath: this.attachmentInfo[index].filePath,
+					name: 'file',
+					formData: {
+						HBillNo: this.hform.HBillNo,
+						HRemark: "",
+						HUserName: getUserInfo()["Czymc"]
+					},
+					success: (uploadRes) => {
+						CommonUtils.showTips({
+							message: "涓婁紶鎴愬姛"
+						})
+						this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
+					},
+					fail: (err) => {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: `涓婁紶澶辫触: ${err}`
+						})
+					}
+				})
+			},
+			delFile(index) {
+				console.log('attachmentInfo: ', this.attachmentInfo[index]);
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+					success: (res) => {
+						if (res.confirm) {
+							this.attachmentInfo.splice(index, 1)
+						}
+					},
+				})
+
+			},
+			handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
+				console.log('file: ', res);
+				let fileInfo = res.data[0]
+				this.attachmentInfo.push({
+					fileName: fileInfo.name,
+					size: fileInfo.size,
+					status: '绛夊緟涓婁紶',
+					filePath: fileInfo.tempFilePath
+				})
+			},
+			// 涓婁紶鏂囦欢
+			fileUpload() {
+				this.$refs.XeUpload.upload('file', {});
+			},
+			//鑾峰彇淇濆吇绾у埆鏁版嵁
+			async getHMaintainLevList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Gy_BadReason/Gy_MaintainLevList',
+						data: {
+							sWhere: " and HUSEORGID = " + uni.getStorageSync('OrganizationID'),
+							user: uni.getStorageSync('HUserName')
+						}
+					})
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HMaintainLevList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			toScanCode() {
+				MpaasScan.scanCode(cb => {
+					this.hfrom.HBarCode = cb
+					this.GetMessageByBarCode(cb)
+				})
+			},
+			async GetMessageByBarCode(HBarCode) {
+				try {
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/QJ_PDA_MouldDotCheckBill/txtHBarCode_KeyDown",
+						data: {
+							HBarCode: HBarCode,
+							user: uni.getStorageSync('HUserName')
+						},
+					})
+					if (!res) {
+						return
+					}
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+
+					console.log('data: ', data);
+					this.hform.HMouldID = data[0].HInterID
+					this.hform.HBarName = data[0].HName
+					this.hform.HBarSpec = data[0].HModel
+					this.hform.HBarModel = data[0].HModel2
+					this.hform.HQty = 1
+					// 鑾峰彇妫�楠岃绋�
+					this.GetItemByMouldFile()
+				} catch (err) {
+
+				}
+			},
+			async GetItemByMouldFile() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Web/GetItemByMouldFile",
+						data: {
+							"MouldProjectID": this.hform.HMouldID,
+							"Type": "BY",
+							"HDate": this.hform.HBeginDate
+						}
+					})
+
+					let {
+						data,
+						Message,
+						count
+					} = res.data
+					if (count == 1) {
+						this.hform.HMouldMaintainRuleInterID = data[0].HMouldMaintainRuleID
+						this.hform.HMouldMaintainRuleInterNo = data[0].鍣ㄥ叿淇濆吇瑙勭▼
+						this.hform.HPlanNo = data[0].鍗曟嵁鍙�
+						this.hform.HMouldMaintainPlanInterID = (data[0].hmainid == null ? 0 : data[0].hmainid) == "" ?
+							0 : data[0].hmainid
+						this.hform.HMouldMaintainPlanEntryID = (data[0].HEntryID == null ? 0 : data[0].HEntryID) ==
+							"" ? 0 : data[0].HEntryID
+
+						this.HCheckFileList = Array.from(data).map(item => {
+							return {
+								"HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
+								"HMaintainItemID": item.淇濆吇椤圭洰ID,
+								"HMaintainItem": item.淇濆吇椤圭洰鍚嶇О,
+								"HMaintainPart": item.淇濆吇閮ㄤ綅, // 淇敼瀛楁鍚�
+								"HClaim": item.鍏蜂綋瑕佹眰,
+								"HManagerID": item.璐熻矗浜篒D,
+								"HManagerName": item.璐熻矗浜哄悕绉�,
+								"HSourceInterID": item.hmainid == null ? 0 : item.hmainid, // 闇�纭鏄惁姝g‘
+								"HSourceEntryID": item.HEntryID == null ? 0 : item.HEntryID, // 闇�纭鏄惁姝g‘
+								"HSourceBillNo": item.鍗曟嵁鍙� // 闇�纭鏄惁姝g‘
+
+							}
+						})
+
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: `鑾峰彇淇濆吇瑙勭▼閿欒锛� ${Message}`
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: `鑾峰彇淇濆吇瑙勭▼閿欒锛� ${err}`
+					})
+				}
+			},
+			toCheckFile() {
+				// 鍒ゆ柇鏄惁宸叉壂鎻忔ā鍏�
+				if (!this.hform.HMouldID || this.hform.HMouldID == 0) {
+					uni.showToast({
+						title: '璇峰厛鎵弿妯″叿浜岀淮鐮佸甫鍑烘ā鍏蜂俊鎭�',
+						icon: 'none'
+					});
+					return;
+				}
+
+				// 鎵撳紑淇濆吇瑙勭▼閫夋嫨椤甸潰
+				uni.navigateTo({
+					url: '/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList?mouldId=' + this.hform
+						.HMouldID,
+					success: (res) => {
+						// 閫氳繃浜嬩欢閫氶亾鐩戝惉杩斿洖鐨勬暟鎹�
+						res.eventChannel.on('selectedPlanData', (data) => {
+							console.log('鎺ユ敹鍒伴�夋嫨鐨勬暟鎹�:', data);
+							// 璧嬪�煎瓧娈�
+							this.hform.HMouldMaintainRuleInterNo = data.鍗曟嵁鍙�;
+							this.hform.HMouldMaintainRuleInterID = data.hmainid;
+							this.hform.HPlanNo = data.淇濆吇璁″垝鍙� == null ? "" : data.淇濆吇璁″垝鍙�;
+							this.hform.HPlanInterID = data.淇濆吇璁″垝id == null ? 0 : ata.淇濆吇璁″垝id,
+							this.hform.HMouldMaintainPlanInterID = data.淇濆吇璁″垝id == null ? 0 : data.淇濆吇璁″垝id;
+							this.hform.HMouldMaintainPlanEntryID = data.淇濆吇璁″垝瀛恑d == null ? 0 : data.淇濆吇璁″垝瀛恑d;
+							this.hform.HMainSourceBillNo = data.淇濆吇璁″垝鍙� == null ? "" : data.淇濆吇璁″垝鍙�;
+							this.hform.HMaintainLevName = data.淇濆吇绾у埆;
+							this.hform.HMaintainLevID = data.HMaintainLevID;
+
+							// 璋冪敤鑾峰彇淇濆吇椤圭洰鐨勬柟娉�
+							this.get_MaintainItem2();
+						});
+
+						res.eventChannel.on('closePage', () => {
+							console.log('鍏抽棴閫夋嫨椤甸潰');
+						});
+					}
+				});
+			},
+
+			// 鑾峰彇淇濆吇瑙勫垯椤圭洰
+			async get_MaintainItem2() {
+				try {
+					// 楠岃瘉鏄惁宸查�夋嫨淇濆吇瑙勭▼
+					if (!this.hform.HMouldMaintainRuleInterID || this.hform.HMouldMaintainRuleInterID == 0) {
+						uni.showToast({
+							title: '璇峰厛閫夋嫨淇濆吇瑙勭▼',
+							icon: 'none'
+						});
+						return;
+					}
+
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Web/GetMaintainItemByMaintainRuleID/Mould',
+						data: {
+							"HMouldMaintainRuleInterID": this.hform.HMouldMaintainRuleInterID
+						}
+					});
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data;
+
+					if (count == 1) {
+						if (data && data.length > 0) {
+							this.HCheckFileList = Array.from(data).map(item => {
+								return {
+									"HMaintainItemID": item.HMaintainItemID || 0,
+									"HMaintainItem": item.淇濆吇椤圭洰 || "",
+									"HMaintainPart": item.淇濆吇閮ㄤ綅 || "",
+									"HClaim": item.鍏蜂綋瑕佹眰 || "",
+									"HManagerID": item.璐熻矗浜篒D || 0,
+									"HManagerCode": item.璐熻矗浜轰唬鐮� || "",
+									"HManagerName": item.璐熻矗浜哄悕绉� || "",
+									"HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
+									"HRemark": item.琛ㄤ綋澶囨敞 || ""
+								};
+							});
+						} else {
+							this.HCheckFileList = [];
+							uni.showToast({
+								title: '璇ヤ繚鍏昏绋嬫殏鏃犱繚鍏婚」鐩褰�',
+								icon: 'none'
+							});
+						}
+					} else {
+						this.HCheckFileList = [];
+						uni.showToast({
+							title: Message || '鑾峰彇淇濆吇椤圭洰澶辫触',
+							icon: 'none'
+						});
+					}
+				} catch (err) {
+					this.HCheckFileList = [];
+					uni.showToast({
+						title: `鑾峰彇淇濆吇椤圭洰澶辫触: ${err}`,
+						icon: 'none'
+					});
+				}
+			},
+			radioChange(e) {
+				console.log('radioChange:', e.detail.value);
+				this.hform.HLastResult = e.detail.value;
+			},
+			getEditData(hmainid) {
+				// 涓昏〃鏁版嵁
+				uni.request({
+					url: CommonUtils.getServerUrl() + '/Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai',
+					data: {
+						HID: hmainid
+					},
+					success: (res) => {
+						console.log('缂栬緫鎺ュ彛杩斿洖鏁版嵁:', res.data);
+						if (res.data.code == 1) {
+							var data = res.data.data.h_v_Sc_MouldMaintain[0];
+							this.hform = {
+								HInterID: hmainid,
+								HBillNo: data.鍗曟嵁鍙�,
+								HDate: data.鏃ユ湡.substr(0, 10),
+								HMouldID: data.HMouldID || 0,
+								HBarCode: data.妯″叿鏉$爜 || "",
+								HBarName: data.浜у搧妯″叿 || "",
+								HBarSpec: data.妯″叿瑙勬牸 || "",
+								HBarModel: data.妯″叿鍨嬪彿 || "",
+								HPlanNo: data.淇濆吇璁″垝缂栧彿 || "",
+								HPlanInterID: data.淇濆吇璁″垝鍐呯爜 || 0,
+								HBeginDate: data.淇濆吇寮�濮嬫棩鏈� ? data.淇濆吇寮�濮嬫棩鏈�.substr(0, 10) : dayjs(new Date())
+									.format("YYYY-MM-DD HH:mm:ss"),
+								HEndDate: data.淇濆吇缁撴潫鏃ユ湡 ? data.淇濆吇缁撴潫鏃ユ湡.substr(0, 10) : dayjs(new Date())
+									.format("YYYY-MM-DD HH:mm:ss"),
+								HLastResult: data.鏈�缁堢粨璁� === '鍚堟牸' ? 'OK' : (data.鏈�缁堢粨璁� === '涓嶅悎鏍�' ? 'NG' :
+									'OK'),
+								HMouldMaintainRuleInterID: data.HMouldMaintainRuleInterID || 0,
+								HMouldMaintainRuleInterNo: data.鍣ㄥ叿淇濆吇瑙勭▼ || "",
+								HRemark: data.澶囨敞 || "",
+								HMaintainLevID: data.HMaintainLevID || 0,
+								HMaintainLevName: data.淇濆吇绾у埆鍚嶇О || "",
+								HQty: data.鏁伴噺 || 1,
+								HMaker: data.鍒跺崟浜� || getUserInfo()['Czymc'],
+								HMakeDate: data.鍒跺崟鏃ユ湡 ? data.鍒跺崟鏃ユ湡.substr(0, 10) : dayjs(new Date()).format(
+									"YYYY-MM-DD"),
+								HUpDater: data.淇敼浜� || "",
+								HUpDateDate: data.淇敼鏃ユ湡 ? data.淇敼鏃ユ湡.substr(0, 10) : "",
+								HChecker: data.瀹℃牳浜� || "",
+								HCheckDate: data.瀹℃牳鏃ユ湡 ? data.瀹℃牳鏃ユ湡.substr(0, 10) : "",
+								HDeleteMan: data.浣滃簾浜� || "",
+								HDeleteDate: data.浣滃簾鏃ユ湡 ? data.浣滃簾鏃ユ湡.substr(0, 10) : "",
+								lngBillKey: 0,
+								lngBillSubKey: 0,
+								HInnerBillNo: data.鍐呴儴鍗曟嵁鍙� || "",
+								HExplanation: data.鎽樿 || "",
+								HRequestComDate: data.瑕佹眰瀹屾垚鏃ユ湡 ? data.瑕佹眰瀹屾垚鏃ユ湡.substr(0, 10) : "",
+								HRecentMainModule: data.鏈�杩戜繚鍏绘ā鏁� || 0,
+								HCumulativeModule: data.绱妯℃暟 || 0,
+								HProductionModule: data.鏈鐢熶骇妯℃暟 || 0
+							};
+
+							// 鑾峰彇閮ㄩ棬鍒楄〃骞惰缃繚鍏荤骇鍒�
+							if (data.HMaintainLevID) {
+								this.$nextTick(() => {
+									this.hform.HMaintainLevID = data.HMaintainLevID;
+								});
+							}
+						} else {
+							uni.showToast({
+								title: res.data.Message || '鑾峰彇鏁版嵁澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log('涓昏〃璇锋眰澶辫触:', res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+					complete: () => {
+						// 鑾峰彇瀛愯〃鏁版嵁
+						this.getSubEditData(hmainid);
+					}
+				});
+			},
+
+			// 鑾峰彇瀛愯〃鏁版嵁
+			getSubEditData(hmainid) {
+				uni.request({
+					url: CommonUtils.getServerUrl() +
+						'/Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew',
+					data: {
+						"HInterID":hmainid 
+					},
+					success: (res) => {
+						console.log('瀛愯〃鏁版嵁:', res.data);
+						if (res.data.count == 1) {
+							this.HCheckFileList = res.data.list[0].map(item => {
+								const isChecked = item.HMaintainResult === '鍚堟牸' ? true : false;
+								return {
+									"HMaintainItemID": item.HMaintainItemID || 0,
+									"HMaintainItem": item.HMaintainItem || "",
+									"HMaintainPart": item.HMaintainPart || "",
+									"HClaim": item.HClaim || "",
+									"HManagerID": item.HManagerID || 0,
+									"HManagerName": item.HManagerName || "",
+									"HMaintainResult": isChecked,
+									"HRemark": item.HManagerName || ""
+								};
+							});
+						} else {
+							console.log('瀛愯〃鏁版嵁涓虹┖鎴栬幏鍙栧け璐�:', res.data.Message);
+							this.HCheckFileList = [];
+						}
+					},
+					fail: (res) => {
+						console.log('瀛愯〃璇锋眰澶辫触:', res);
+						this.HCheckFileList = [];
+					}
+				});
+			},
+			async getMaxNum() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Web/GetMAXNum",
+						data: {
+							"HBillType": this.HBillType
+						}
+					})
+
+					let {
+						count,
+						data,
+						Message
+					} = res.data
+					console.log('data: ', data);
+					this.hform.HInterID = 0
+					this.hform.HBillNo = data[0]["HBillNo"]
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+					})
+				}
+			},
+			async submit() {
+				try {
+					let oMain = JSON.stringify(this.hform);
+					let sSubStr = JSON.stringify(this.HCheckFileList);
+					let sMainSub = oMain + ';' + sSubStr + ';' + uni.getStorageSync('HUserName');
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Sc_MouldMaintainBill/SaveGetMouldMaintainBillListAPP",
+						data: {
+							"msg": sMainSub
+						},
+						method: "POST"
+					})
+
+					if (!res) {
+						return
+					}
+
+					let {
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						uni.showModal({
+							title: '鎻愮ず',
+							content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+							success: (res) => {
+								if (res.confirm) {
+									console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+									uni.redirectTo({
+										url: '/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill?operationType=1'
+									})
+								} else if (res.cancel) {
+									console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+									setTimeout(() => {
+										uni.navigateBack();
+									}, 50)
+								}
+							}
+						});
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+						})
+					}
+
+
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鎻愪氦鍗曟嵁澶辫触: " + err
+					})
+				}
+			}
+		},
+		onLoad(e) {
+			console.log('e: ', e);
+			this.getHMaintainLevList()
+			if (!e.operationType) {
+				this.operationType = 1
+			} else {
+				this.operationType = e.operationType
+			}
+
+			if (this.operationType == 1) {
+				// 鏂板
+				this.getMaxNum()
+			} else if (this.operationType == 2) {
+				// 澶嶅埗
+			} else if (this.operationType == 3) {
+				// 缂栬緫
+				this.getEditData(e.hmainid)
+			} else if (this.operationType == 4) {
+				// 娴忚
+
+			}
+		},
+		onReady() {
+			const query = uni.createSelectorQuery().in(this)
+			query.select("#buttons")
+				.boundingClientRect()
+				.select("#tabs")
+				.boundingClientRect()
+				.exec(res => {
+					this.btnTop = Math.floor(res[0].top)
+					this.tabsBottom = Math.ceil(res[1].bottom)
+				})
+		}
+	}
+</script>
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBillList.vue
similarity index 96%
rename from pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue
rename to pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBillList.vue
index 19b1b9a..445dcea 100644
--- a/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue
+++ b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBillList.vue
@@ -126,7 +126,6 @@
 					</view>
 
 					<view class="op" v-if="operations == index">
-						<button class="op1" size="mini" plain @tap.stop="toSon(item)">瀛愯〃淇℃伅</button>
 						<button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
 						<button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
 						<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
@@ -319,14 +318,14 @@
 			// 鏂板妯″叿淇濆吇璁板綍鍗�
 			onAddClickHandler() {
 				uni.navigateTo({
-					url: "/pages/MJGL/mujubaoyangjiludan/form"
+					url: "/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill?operationType=1"
 				})
 			},
 			//缂栬緫淇濆吇璁板綍鍗�
 			edit(item) {
 				console.log(item)
 				uni.navigateTo({
-					url: '/pages/MJGL/mujubaoyangjiludan/form?hmainid=' + item.hmainid
+					url: '/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill?operationType=3&hmainid=' + item.hmainid
 				})
 			},
 			//鍒犻櫎淇濆吇璁板綍鍗�
@@ -372,13 +371,6 @@
 							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
 						}
 					}
-				});
-			},
-			//瀛愯〃鏌ョ湅
-			toSon(item) {
-				uni.navigateTo({
-					url: '/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList_son?HInterID=' + item.hmainid + '&浜у搧妯″叿=' + item
-						.浜у搧妯″叿 + '&浜у搧妯″叿浠g爜=' + item.浜у搧妯″叿浠g爜,
 				});
 			}
 		},
diff --git a/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList.vue b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList.vue
new file mode 100644
index 0000000..1b2d665
--- /dev/null
+++ b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList.vue
@@ -0,0 +1,516 @@
+<template>
+	<view class="content">
+		<!-- 琛ㄥ崟鍖哄煙 -->
+		<view class="form-container">
+			<view class="form">
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="right">
+						<input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="right">
+						<input v-model="hform.HCreateBy" placeholder="璇疯緭鍏ュ埗鍗曚汉" />
+					</view>
+				</view>
+				<view class="form-item" v-show="false">
+					<view class="title">寮�濮嬫椂闂�:</view>
+					<view class="right">
+						<picker mode="date" :value="hform.BenginHCreateDate" @change="BenginHCreateDateChange">
+							<input name="BenginHCreateDate" disabled :value="hform.BenginHCreateDate"
+								placeholder="璇烽�夋嫨" />
+						</picker>
+					</view>
+				</view>
+				<view class="form-item" v-show="false">
+					<view class="title">缁撴潫鏃堕棿:</view>
+					<view class="right">
+						<picker mode="date" :value="hform.EndHCreateDate" @change="EndHCreateDateChange">
+							<input name="EndHCreateDate" disabled :value="hform.EndHCreateDate" placeholder="璇烽�夋嫨" />
+						</picker>
+					</view>
+				</view>
+			</view>
+
+			<!-- 鎸夐挳鍖哄煙 -->
+			<view class="buttons-container">
+				<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+				<view class="buttons">
+					<button class="op5" size="mini" type="default" @tap="clear">閲嶇疆</button>
+					<button class="op3" size="mini" type="default" @tap="search">鏌ヨ</button>
+					<button class="op4" size="mini" type="default" @tap="close">鍏抽棴</button>
+				</view>
+			</view>
+		</view>
+
+		<!-- 鍒楄〃鍖哄煙 -->
+		<scroll-view class="list-container" scroll-y="true" :style="{height: listHeight + 'px'}">
+			<view class="list" v-for="(item,index) in listData" :key="index">
+				<uni-card :title="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.hmainid" v-show="false">
+							<text>hmainid锛�</text>{{item.hmainid}}
+						</view>
+						<view class="detail" v-if="item.hsubid" v-show="false">>
+							<text>hsubid锛�</text>{{item.hsubid}}
+						</view>
+						<view class="detail" v-if="item.HInterID" v-show="false">
+							<text>HInterID锛�</text>{{item.HInterID}}
+						</view>
+					</view>
+					<view class="card-detail" v-if="showDetail == index">
+						<view class="detail" v-if="item.鍒跺崟浜�">
+							<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+						</view>
+						<view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+							<text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
+						</view>
+						<view class="detail" v-if="item.瀹℃牳浜�">
+							<text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
+						</view>
+						<view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+							<text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
+						</view>
+						<view class="detail" v-if="item.淇敼浜�">
+							<text>淇敼浜猴細</text>{{item.淇敼浜簘}
+						</view>
+						<view class="detail" v-if="item.淇敼鏃ユ湡">
+							<text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
+						</view>
+						<view class="detail" v-if="item.鍏抽棴浜�">
+							<text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
+						</view>
+						<view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+							<text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
+						</view>
+					</view>
+
+					<view class="more" v-if="showDetail == index">
+						<view class="part" style="border-right: 1px solid #eee;">
+							<uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+						</view>
+						<view class="part" @tap.stop="choose(item)">
+							<uni-icons type="checkmarkempty" style="color: #888;margin-right: 10rpx;"
+								size="14"></uni-icons>閫夊彇璇ユ暟鎹�
+						</view>
+					</view>
+					<view class="more" v-if="showDetail != index">
+						<view class="part" style="border-right: 1px solid #eee;">
+							<uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+						</view>
+						<view class="part" @tap.stop="choose(item)">
+							<uni-icons type="checkmarkempty" style="color: #888;margin-right: 10rpx;"
+								size="14"></uni-icons>閫夊彇璇ユ暟鎹�
+						</view>
+					</view>
+				</uni-card>
+			</view>
+
+			<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+			<view class="over" v-if="listData.length != 0">宸插埌搴�</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
+	export default {
+		data() {
+			return {
+				bottomBtnTop: 0,
+				listTableTop: 0,
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				// 鏂板瀛楁
+				mouldId: 0,
+				hform: {
+					HBillNo: '',
+					HCreateBy: '',
+					BenginHCreateDate: '',
+					EndHCreateDate: '',
+				},
+				sWhere: '',
+				listData: [],
+				showDetail: -1,
+				listHeight: 0, // 鍔ㄦ�佽绠楀垪琛ㄩ珮搴�
+				safeAreaInsets: {} // 瀹夊叏鍖哄煙淇℃伅
+			}
+		},
+		created() {
+			this.getList()
+			console.log(this.userInfo, uni.getStorageSync('HUserName'))
+
+			// 鑾峰彇瀹夊叏鍖哄煙淇℃伅
+			try {
+				const systemInfo = uni.getSystemInfoSync();
+				this.safeAreaInsets = systemInfo.safeAreaInsets || {
+					top: 0,
+					bottom: 0
+				};
+			} catch (e) {
+				console.error('鑾峰彇瀹夊叏鍖哄煙澶辫触:', e);
+				this.safeAreaInsets = {
+					top: 0,
+					bottom: 0
+				};
+			}
+		},
+		mounted() {
+			// 鍔ㄦ�佽绠楀垪琛ㄩ珮搴�
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.calculateListHeight();
+				}, 100);
+			});
+		},
+		onReady() {
+			this.calculateListHeight();
+		},
+		onResize() {
+			this.calculateListHeight();
+		},
+		methods: {
+			// 璁$畻鍒楄〃鍖哄煙鐨勯珮搴�
+			calculateListHeight() {
+				const query = uni.createSelectorQuery().in(this);
+				query.select('.form-container').boundingClientRect(data => {
+					if (data) {
+						const systemInfo = uni.getSystemInfoSync();
+						const windowHeight = systemInfo.windowHeight;
+						const formHeight = data.height;
+						// 璁$畻鍓╀綑鍙敤楂樺害锛屽噺鍘昏〃鍗曞尯鍩熺殑楂樺害
+						this.listHeight = windowHeight - formHeight - (this.safeAreaInsets.bottom || 0);
+					}
+				}).exec();
+			},
+			getList() {
+				uni.showLoading({
+					title: '鍔犺浇涓�...'
+				})
+				uni.request({
+					url: this.serverUrl + '/Sc_MouldMaintainRuleBill/GetMouldMaintainRuleListPDA',
+					data: {
+						sWhere: this.sWhere,
+						user: uni.getStorageSync('HUserName')
+					},
+					success: (res) => {
+						console.log(1, res);
+						if (res.data.count == 1) {
+							this.listData = res.data.data
+							uni.hideLoading()
+						} else {
+							uni.hideLoading()
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.hideLoading()
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨鍗曟嵁鏃ユ湡
+			BenginHCreateDateChange(e) {
+				console.log(e.detail.value)
+				this.hform.BenginHCreateDate = e.detail.value
+			},
+			//閫夋嫨鍗曟嵁鏃ユ湡
+			EndHCreateDateChange(e) {
+				console.log(e.detail.value)
+				this.hform.EndHCreateDate = e.detail.value
+			},
+			search() {
+				this.sWhere = ''
+				if (this.mouldId && this.mouldId != 0) {
+					this.sWhere += " and HInterID = " + this.mouldId;
+				}
+				if (this.hform.HBillNo) {
+					this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+				}
+				if (this.hform.HCreateBy) {
+					this.sWhere += " and 鍒跺崟浜� like '%" + this.hform.HCreateBy + "%'";
+				}
+				if (this.hform.BenginHCreateDate) {
+					this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
+				}
+				if (this.hform.EndHCreateDate) {
+					this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
+				}
+
+				this.getList()
+			},
+			clear() {
+				this.sWhere = ''
+				this.showDetail = -1,
+					this.hform = {
+						HBillNo: '',
+						HCreateBy: '',
+						BenginHCreateDate: '',
+						EndHCreateDate: '',
+					},
+					this.search()
+			},
+			choose(item) {
+				var data = {
+					鍗曟嵁鍙�: item.鍗曟嵁鍙�,  
+					hmainid: item.hmainid,  
+					淇濆吇璁″垝鍙�:item.淇濆吇璁″垝鍙�,
+					淇濆吇璁″垝id:item.淇濆吇璁″垝id,
+					淇濆吇璁″垝瀛恑d:item.淇濆吇璁″垝瀛恑d,
+					淇濆吇绾у埆:item.淇濆吇绾у埆,
+					HMaintainLevID:item.HMaintainLevID
+				}
+
+				// 淇敼杩欓噷锛氫娇鐢ㄤ簨浠堕�氶亾杩斿洖鏁版嵁缁欑埗椤甸潰
+				const eventChannel = this.getOpenerEventChannel();
+				eventChannel.emit('selectedPlanData', data);
+
+				// 鍏抽棴褰撳墠椤甸潰
+				uni.navigateBack();
+			},
+
+			close() {
+				// 鍏抽棴褰撳墠椤甸潰
+				uni.navigateBack();
+			},
+		},
+		onLoad(options) {
+			// 鎺ユ敹浼犻�掔殑鍙傛暟
+			if (options.mouldId) {
+				this.mouldId = options.mouldId;
+			}
+			// 鏍规嵁妯″叿ID鑷姩鏌ヨ鐩稿叧鐐规瑙勭▼
+			this.search();
+			// 鑾峰彇浜嬩欢閫氶亾锛岀敤浜庨〉闈㈤棿閫氫俊
+			if (this.getOpenerEventChannel) {
+				const eventChannel = this.getOpenerEventChannel();
+
+				// 鐩戝惉椤甸潰鍏抽棴浜嬩欢锛堝鏋滈渶瑕佷粠鐖堕〉闈㈠叧闂綋鍓嶉〉闈級
+				eventChannel.on('closePage', () => {
+					uni.navigateBack();
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		width: 100%;
+		height: 100vh;
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+	}
+
+	// 琛ㄥ崟瀹瑰櫒锛屽寘鍚煡璇㈡潯浠跺拰鎸夐挳
+	.form-container {
+		flex-shrink: 0;
+		background-color: #fff;
+		z-index: 10;
+	}
+
+	.form {
+		width: 100%;
+		padding: 20rpx 30rpx;
+		box-sizing: border-box;
+	}
+
+	.form-item {
+		display: flex;
+		align-items: center;
+		font-size: 28rpx;
+		padding: 12rpx 0;
+		margin-bottom: 10rpx;
+
+		.title {
+			width: 180rpx;
+			flex-shrink: 0;
+
+			text {
+				color: red;
+				font-weight: bold;
+			}
+		}
+
+		.right {
+			flex: 1;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+		}
+
+		input {
+			width: 100%;
+			padding: 16rpx 20rpx;
+			font-size: 30rpx;
+			box-sizing: border-box;
+		}
+	}
+
+	// 鎸夐挳瀹瑰櫒
+	.buttons-container {
+		width: 100%;
+		background-color: #fff;
+	}
+
+	.buttons {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		padding: 20rpx 0;
+
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+			color: #fff;
+			margin: 0 15rpx;
+		}
+	}
+
+	// 鍒楄〃瀹瑰櫒锛屼娇鐢ㄦ粴鍔ㄨ鍥�
+	.list-container {
+		flex: 1;
+		width: 100%;
+		-webkit-overflow-scrolling: touch;
+	}
+
+	.list {
+		width: 100%;
+
+		.card-detail {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			line-height: 120%;
+
+			.detail {
+				font-size: 26rpx;
+				margin-bottom: 12rpx;
+				color: #555;
+				margin-right: 20rpx;
+
+				text {
+					color: #999;
+					font-size: 26rpx;
+				}
+			}
+		}
+
+		.more {
+			color: #888;
+			font-size: 24rpx;
+			display: flex;
+			border-top: 1px solid #eee;
+			padding-top: 20rpx;
+
+			.part {
+				width: 50%;
+				text-align: center;
+			}
+		}
+
+		.op {
+			display: flex;
+			justify-content: space-around;
+			margin-top: 20rpx;
+
+			button {
+				padding: 0;
+				width: 130rpx;
+				font-size: 25rpx;
+			}
+		}
+	}
+
+	.over {
+		text-align: center;
+		padding: 40rpx 0;
+		color: #999;
+		font-size: 28rpx;
+	}
+
+	.op1 {
+		border: 1px solid #41a863;
+		background-color: #41a863;
+	}
+
+	.op2 {
+		border: 1px solid #d98d00;
+		background-color: #d98d00;
+	}
+
+	.op3 {
+		border: 1px solid #3a78ff;
+		background-color: #3a78ff;
+	}
+
+	.op4 {
+		border: 1px solid #da0000;
+		background-color: #da0000;
+	}
+
+	.op5 {
+		border: 1px solid #888;
+		background-color: #888;
+	}
+
+	/* 閫傞厤涓嶅悓灞忓箷灏哄 */
+	@media screen and (max-width: 360px) {
+		.form {
+			padding: 20rpx 20rpx;
+		}
+
+		.form-item {
+			font-size: 26rpx;
+			padding: 10rpx 0;
+
+			.title {
+				width: 160rpx;
+			}
+		}
+
+		.buttons {
+			button {
+				width: 160rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				font-size: 26rpx;
+				margin: 0 10rpx;
+			}
+		}
+	}
+
+	/* 纭繚鍦╥OS涓婅緭鍏ユ涓嶄細琚敭鐩橀伄鎸� */
+	.form-item input,
+	.form-item .right {
+		max-height: 100rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujubaoyangjiludan/formDetail.vue b/pages/MJGL/mujubaoyangjiludan/formDetail.vue
deleted file mode 100644
index 560c08f..0000000
--- a/pages/MJGL/mujubaoyangjiludan/formDetail.vue
+++ /dev/null
@@ -1,463 +0,0 @@
-<template>
-	<view class="content">
-		<view class="mains" v-if="num==1">
-			<!-- 淇濆吇椤逛俊鎭儴鍒嗕繚鎸佷笉鍙� -->
-			<view class="title">淇濆吇椤逛俊鎭�</view>
-			<view class="table">
-				<uni-collapse accordion>
-					<uni-collapse-item v-for="(item,index) in hformList" :key="index">
-						<template v-slot:title>
-							<view class="table-line">
-								<view class="line">
-									<view class="font">
-										<text>淇濆吇椤圭洰锛�</text>{{item.HMaintainItem}}
-									</view>
-									<view>
-										<text>淇濆吇閮ㄤ綅锛�</text>{{item.HMaintainPart}}
-									</view>
-								</view>
-								<view class="line">
-									<text>璐熻矗浜猴細</text>{{item.HManagerName}}
-								</view>
-							</view>
-						</template>
-						<view class="table-detail">
-							<view class="detail">
-								<text>鍏蜂綋瑕佹眰锛�</text>{{item.HClaim?item.HClaim:'鏆傛棤鍏蜂綋瑕佹眰'}}
-							</view>
-							<view class="detail">
-								<text>鏄惁鍚堟牸锛�</text>{{ item.HMaintainResult ? '鍚堟牸' : '涓嶅悎鏍�' }}
-							</view>
-							<view class="detail" v-if="item.HRemark">
-								<text>澶囨敞锛�</text>{{item.HRemark}}
-							</view>
-							<view class="btns">
-								<button class="btnd" size="mini" @tap="edit(index)">缂栬緫</button>
-								<button class="btne" size="mini" @tap="del(index)">鍒犻櫎</button>
-							</view>
-						</view>
-					</uni-collapse-item>
-				</uni-collapse>
-			</view>
-			<view class="foot">
-				<button class="btna" size="mini" @tap="creat">鏂板</button>
-				<button class="btnb" size="mini" @tap="over">纭</button>
-			</view>
-		</view>
-
-		<view class="mains" v-if="num == 2">
-			<view class="title">淇濆吇椤圭紪杈�</view>
-			<view class="form">
-				<view class="form-item">
-					<view class="item-title">淇濆吇椤圭洰:</view>
-					<view class="item-right">
-						<uni-combox :candidates="arrayHMaintainItem" placeholder="璇烽�夋嫨淇濆吇椤圭洰" v-model="hform.HMaintainItem"
-							@input="HMaintainItemInput"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="item-title">淇濆吇閮ㄤ綅:</view>
-					<view class="item-right">
-						<input v-model="hform.HMaintainPart" placeholder="璇疯緭鍏ヤ繚鍏婚儴浣�" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="item-title">璐熻矗浜�:</view>
-					<view class="item-right">
-						<uni-combox :candidates="arrayHManagerName" placeholder="璇烽�夋嫨璐熻矗浜�" v-model="hform.HManagerName"
-							@input="HManagerNameInput"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item" style="align-items: flex-start;">
-					<view class="item-title">鍏蜂綋瑕佹眰:</view>
-					<view class="item-right" style="min-height: 150rpx;">
-						<textarea v-model="hform.HClaim" auto-height maxlength="-1" placeholder="璇疯緭鍏ュ叿浣撹姹�"></textarea>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="item-title">缁撴灉:</view>
-					<view class="right" style="display: flex; align-items: center; padding: 0 20rpx; border: none;">
-						<view style="display: flex; align-items: center;">
-							<checkbox-group @change="onResultChange">
-							  <checkbox :value="'true'" :checked="hform.HMaintainResult"></checkbox>
-							</checkbox-group>
-							<text style="margin-left: 10rpx;">鍚堟牸</text>
-						</view>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="item-title">澶囨敞:</view>
-					<view class="item-right">
-						<input v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
-					</view>
-				</view>
-			</view>
-			<view class="foot">
-				<button class="btnc" size="mini" @tap="back">杩斿洖</button>
-				<button class="btnb" size="mini" @tap="add">纭</button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-				num: 1,
-				editIndex: -1,
-
-				HMaintainItemList: [],
-				arrayHMaintainItem: [],
-
-				HManagerNameList: [],
-				arrayHManagerName: [],
-
-				hformList: [],
-				hform: {},
-			}
-		},
-		props: {
-			form1List: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-		},
-		created() {
-			this.getHMaintainItemList()
-			this.getHManagerNameList()
-			this.hformList = this.form1List
-		},
-		methods: {
-			// 鏂板锛氬鐞嗗閫夋鍙樺寲浜嬩欢
-			onResultChange(e) {
-				this.hform.HMaintainResult = e.detail.value.includes('true');
-			},
-
-			//淇濆吇椤圭洰
-			getHMaintainItemList() {
-				uni.request({
-					url: this.serverUrl + '/PublicPageMethod/MaintainList',
-					data: {
-						sWhere: "where HStopFlag=0 and HEndFlag=1"
-					},
-					success: (res) => {
-						console.log(1, res.data.data);
-						if (res.data.count == 1) {
-							this.HMaintainItemList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHMaintainItem[i] = res.data.data[i].HName
-							}
-							this.$forceUpdate();
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			HMaintainItemInput(e) {
-				console.log(e)
-				for (var i = 0; i < this.HMaintainItemList.length; i++) {
-					if (this.HMaintainItemList[i].HName == e) {
-						this.hform.HMaintainItemID = this.HMaintainItemList[i].HItemID
-						this.hform.HMaintainItemNumber = this.HMaintainItemList[i].HNumber
-						this.hform.HMaintainItem = this.HMaintainItemList[i].HName
-					}
-				}
-			},
-
-			//璐熻矗浜�
-			getHManagerNameList() {
-				uni.request({
-					url: this.serverUrl + '/PublicPageMethod/UserList',
-					data: {
-						sWhere: ''
-					},
-					success: (res) => {
-						console.log(2, res.data.data);
-						if (res.data.count == 1) {
-							this.HManagerNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHManagerName[i] = res.data.data[i].HName
-							}
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			HManagerNameInput(e) {
-				console.log(e)
-				for (var i = 0; i < this.HManagerNameList.length; i++) {
-					if (this.HManagerNameList[i].HName == e) {
-						this.hform.HManagerID = this.HManagerNameList[i].HItemID
-						this.hform.HManagerNumber = this.HManagerNameList[i].HNumber
-						this.hform.HManagerName = this.HManagerNameList[i].HName
-					}
-				}
-			},
-
-			creat() {
-				this.hform = {
-						HMaintainItemID: '',
-						HMaintainItemNumber: '',
-						HMaintainItem: '',
-						HMaintainPart: '',
-						HClaim: '',
-						HManagerID: '',
-						HManagerNumber: '',
-						HManagerName: '',
-						HMaintainResult: true, // 榛樿璁句负true锛屽嵆榛樿鍕鹃��
-						HRemark: '',
-					},
-					this.num = 2
-			},
-			back() {
-				this.hformList[this.editIndex] = uni.getStorageSync('hform')
-				uni.removeStorageSync('hform')
-				this.editIndex = -1
-				this.num = 1
-			},
-			edit(index) {
-				this.hform = this.hformList[index]
-				uni.setStorageSync('hform', this.hformList[index]);
-				this.editIndex = index
-				this.num = 2
-			},
-			del(index) {
-				this.hformList.splice(index, 1);
-			},
-			add() {
-				if (!this.hform.HMaintainItemID) {
-					uni.showToast({
-						title: '璇烽�夋嫨淇濆吇椤圭洰淇℃伅',
-						icon: 'none'
-					})
-				} else if (!this.hform.HMaintainPart) {
-					uni.showToast({
-						title: '璇疯緭鍏ヤ繚鍏婚儴浣嶄俊鎭�',
-						icon: 'none'
-					})
-				} else if (!this.hform.HManagerID) {
-					uni.showToast({
-						title: '璇烽�夋嫨璐熻矗浜�',
-						icon: 'none'
-					})
-				} else {
-					uni.showModal({
-						title: '鎻愮ず',
-						content: '鏄惁纭鎻愪氦淇濆吇椤圭洰鍐呭锛屾槸鐨勮瘽灏嗘坊鍔犲埌淇濆吇椤逛俊鎭腑銆�',
-						success: (res) => {
-							if (res.confirm) {
-								if (this.editIndex > -1) {
-									this.hformList.splice(this.editIndex, 1);
-									this.editIndex = -1
-
-									uni.showToast({
-										title: '淇敼瀹屾垚',
-										icon: 'none'
-									})
-								}
-								this.num = 1
-								this.hformList.unshift(this.hform)
-							}
-						}
-					});
-				}
-			},
-
-			over() {
-				this.$emit('hformList', this.hformList)
-			},
-		}
-	}
-</script>
-
-<!-- 鏍峰紡閮ㄥ垎淇濇寔涓嶅彉 -->
-<style lang="scss" scoped>
-	.content {
-		width: 100%;
-		height: 100%;
-		position: fixed;
-		z-index: 999;
-		top: 0;
-		left: 0;
-		background-color: rgba(0, 0, 0, 0.5);
-	}
-
-	.mains {
-		width: 88%;
-		height: 88%;
-		background-color: #f5f5f5;
-		margin: 12% auto;
-		border-radius: 14rpx;
-
-		.title {
-			width: 100%;
-			height: 6%;
-			background-color: #fff;
-			border-bottom: 1px solid #acacac;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			border-radius: 14rpx 14rpx 0 0;
-		}
-
-		.foot {
-			padding: 0 40rpx;
-			height: 8%;
-			background-color: #fff;
-			border-top: 1px solid #eee;
-			display: flex;
-			align-items: center;
-			border-radius: 0 0 14rpx 14rpx;
-
-			button {
-				width: 180rpx;
-			}
-		}
-
-		.table {
-			width: 100%;
-			height: 86%;
-			overflow: hidden;
-			overflow-y: auto;
-
-			.table-line {
-				padding: 18rpx 10rpx 18rpx 20rpx;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-
-				.line {
-					font-size: 30rpx;
-					color: #555;
-
-					text {
-						color: #999;
-						font-size: 27rpx;
-					}
-
-					.font {
-						color: #333;
-						line-height: 150%;
-					}
-				}
-			}
-
-			.table-detail {
-				font-size: 30rpx;
-				color: #555;
-				padding: 0 10rpx 24rpx 20rpx;
-
-				text {
-					color: #999;
-					font-size: 27rpx;
-				}
-
-				.detail {}
-
-				.btns {
-					text-align: right;
-					margin-top: 14rpx;
-
-					button {
-						width: 150rpx;
-						margin-right: 30rpx;
-					}
-				}
-			}
-		}
-
-		.form {
-			height: 82%;
-			padding: 4%;
-			overflow: hidden;
-			overflow-y: auto;
-
-			.form-item {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				font-size: 30rpx;
-				padding: 10rpx 0;
-
-				.item-title {
-					width: 140rpx;
-
-					text {
-						color: red;
-						font-weight: bold;
-					}
-				}
-
-				.item-right {
-					width: 450rpx;
-					border-radius: 22rpx;
-					border: 1px solid #acacac;
-					background-color: #fff;
-				}
-
-				input {
-					width: 100%;
-					padding: 8rpx 20rpx;
-					font-size: 30rpx;
-				}
-
-				textarea {
-					width: 98%;
-					padding: 8rpx 20rpx;
-					font-size: 30rpx;
-				}
-			}
-		}
-	}
-
-	.btna {
-		background-color: #41a863;
-		color: #fff;
-	}
-
-	.btnb {
-		background-color: #3A78FF;
-		color: #fff;
-	}
-
-	.btnc {
-		background-color: #acacac;
-		color: #fff;
-	}
-
-	.btnd {
-		background-color: #d98d00;
-		color: #fff;
-	}
-
-	.btne {
-		background-color: #da0000;
-		color: #fff;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList_son.vue b/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList_son.vue
deleted file mode 100644
index 1338729..0000000
--- a/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList_son.vue
+++ /dev/null
@@ -1,250 +0,0 @@
-<template>
-	<view class="content">
-		<view class="infoArea">
-			<view class="name">{{infoData.浜у搧妯″叿}}</view>
-			<view class="dm">浠g爜锛歿{infoData.浜у搧妯″叿浠g爜}}</view>
-			
-			<view class="choose">
-				<view class="tab" :class="{focus: number == 1}" @tap="number = 1">淇濆吇椤逛俊鎭�</view>
-				<view class="tab" :class="{focus: number == 2}" @tap="number = 2">閰嶄欢淇℃伅</view>
-			</view>
-		</view>
-		
-		<view style="width: 100%;height: 200rpx;"></view>
-		<view v-if="number == 1">
-			<view class="list" v-for="(item,index) in listData1" :key="index">
-				<uni-card :title="item.HMaintainItem" :extra="item.HMaintainItemNumber" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
-					<view class="card-detail">
-						<view class="detail" v-if="item.HMaintainPart">
-							<text>淇濆吇閮ㄤ綅锛�</text>{{item.HMaintainPart}}
-						</view>
-						<view class="detail" v-if="item.HManagerName">
-							<text>璐熻矗浜猴細</text>{{item.HManagerName}}
-						</view>
-						<view class="detail" v-if="item.HManagerNumber">
-							<text>璐熻矗浜轰唬鐮侊細</text>{{item.HManagerNumber}}
-						</view>
-						<view class="detail" v-if="item.HRemark">
-							<text>澶囨敞锛�</text>{{item.HRemark}}
-						</view>
-					</view>
-					<view class="card-detail" v-if="showDetail == index">
-						<view class="detail">
-							<text>鍏蜂綋瑕佹眰锛�</text>{{item.HClaim?item.HClaim:'鏆傛棤鍏蜂綋瑕佹眰'}}
-						</view>
-					</view>
-					
-					<view class="morea" v-if="showDetail == index" >
-						<uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
-					</view>
-					<view class="morea" v-if="showDetail != index">
-						<uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏌ョ湅鍏蜂綋瑕佹眰
-					</view>
-				</uni-card>
-			</view>
-			
-			<view class="over" v-if="listData1.length == 0 ">鏆傛棤鏁版嵁</view>
-			<view class="over" v-if="listData1.length != 0 ">宸插埌搴�</view>
-		</view>
-
-		<view v-if="number == 2">
-			<view class="list" v-for="(item,index) in listData2" :key="index" >
-				<uni-card :title="item.HMaterName" :extra="item.HMaterNumber" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
-					<view class="card-detail">
-						<view class="detail" v-if="item.HUnitName">
-							<text>鍗曚綅鍚嶇О锛�</text>{{item.HUnitName}}
-						</view>
-						<view class="detail" v-if="item.HUnitNumber">
-							<text>鍗曚綅浠g爜锛�</text>{{item.HUnitNumber}}
-						</view>
-						<view class="detail" v-if="item.HManagerName">
-							<text>璐熻矗浜猴細</text>{{item.HManagerName}}
-						</view>
-						<view class="detail" v-if="item.HManagerNumber">
-							<text>璐熻矗浜轰唬鐮侊細</text>{{item.HManagerNumber}}
-						</view>
-						<view class="detail" v-if="item.HQty">
-							<text>瀹為檯鐢ㄩ噺锛�</text>{{item.HQty}}
-						</view>
-						<view class="detail" v-if="item.HQtyMust">
-							<text>鏍囧噯鐢ㄩ噺锛�</text>{{item.HQtyMust}}
-						</view>
-						<view class="detail" v-if="item.HRemark">
-							<text>澶囨敞锛�</text>{{item.HRemark}}
-						</view>
-					</view>
-				</uni-card>
-			</view>
-			<view class="over" v-if="listData2.length == 0">鏆傛棤鏁版嵁</view>
-			<view class="over" v-if="listData2.length != 0">宸插埌搴�</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { getUserInfo } from "@/utils/auth.js";
-	export default {
-	    data() {
-	        return {
-				userInfo:getUserInfo(),
-				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
-				infoData:{},
-				number:1,
-				listData1:[],
-				listData2:[],
-				showDetail:-1,
-	        }
-	    },
-		onLoad(e) {
-			console.log(e)
-			uni.setNavigationBarTitle({
-				title: e.浜у搧妯″叿
-			});
-			this.infoData = e
-			this.getList(e.HInterID)
-		},
-	    methods: {
-			getList(HInterID){
-				uni.showLoading({
-					title:'鍔犺浇涓�...'
-				})
-				uni.request({
-				    url: this.serverUrl + '/Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew',
-					data: { "HInterID": HInterID },
-				    success: (res) => {
-						if(res.data.count == 1){
-							this.listData1 = res.data.list[0]
-							this.listData2 = res.data.list[1]
-							console.log(1,this.listData1);
-							console.log(2,this.listData2);
-							uni.hideLoading()
-						}else{
-							uni.hideLoading()
-							uni.showToast({
-								title:res.data.Message,
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.hideLoading()
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-			},
-	    }
-	}
-</script>
-
-<style lang="scss" scoped>
-	.infoArea{
-		width: 100%;
-		padding-top: 20rpx;
-		background-color: #f0f0f0;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 99;
-		.name{
-			text-align: center;
-			font-size: 32rpx;
-			font-weight: 600;
-			color: #333;
-			line-height: 150%;
-		}
-		.dm{
-			text-align: center;
-			font-size: 27rpx;
-			font-weight: 500;
-			color: #333;
-			margin-top: 10px;
-		}
-		.other{
-			display: flex;
-			flex-wrap: wrap;
-			width: 90%;
-			margin: 0 auto;
-			margin-top: 12rpx;
-			font-size: 27rpx;
-			color: #666;
-			text{
-				font-size: 28rpx;
-				color: #333;
-				margin-left: 10rpx;
-			}
-			.half{
-				width: 50%;
-			}
-			.all{
-				width: 100%;
-			}
-		}
-		.choose{
-			height: 70rpx;
-			margin-top: 20rpx;
-			padding: 0 30rpx;
-			background-color: #fff;
-			line-height: 86rpx;
-			border-radius: 40rpx 40rpx 0 0;
-			border-bottom: 2px solid #eee;
-			display: flex;
-			.tab{
-				margin: 0 20rpx;
-				text-align: center;
-				font-size: 28rpx;
-				color: #666;
-			}
-			.focus{
-				font-size: 30rpx;
-				color: #333;
-				font-weight: 600;
-				border-bottom: 2px solid #3a78ff;
-			}
-		}
-	}
-	
-	.list{
-		width: 100%;
-		.card-detail{
-			width: 100%;
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-			line-height: 120%;
-			.detail{
-				// width: 50%;
-				font-size: 26rpx;
-				margin-bottom: 12rpx;
-				color: #555;
-				margin-right: 20rpx;
-				text{
-					color: #999;
-					font-size: 26rpx;
-				}
-			}
-		}
-		.more{
-			color: #888;
-			font-size: 24rpx;
-			display: flex;
-			border-top: 1px solid #eee;
-			padding-top: 20rpx;
-			.part{
-				width: 50%;
-				text-align: center;
-			}
-		}
-		
-		.morea{
-			color: #888;
-			font-size: 24rpx;
-			padding-top: 10rpx;
-			text-align: right;
-		}
-	}
-
-</style>
diff --git a/pages/MJGL/mujubaoyangjiludan/plan.vue b/pages/MJGL/mujubaoyangjiludan/plan.vue
deleted file mode 100644
index 582f828..0000000
--- a/pages/MJGL/mujubaoyangjiludan/plan.vue
+++ /dev/null
@@ -1,351 +0,0 @@
-<template>
-	<view class="content">
-		<view class="form">
-			<view class="form-item">
-				<view class="title">鍗曟嵁鍙�:</view>
-				<view class="right">
-					<input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鍒跺崟浜�:</view>
-				<view class="right">
-					<input v-model="hform.HCreateBy" placeholder="璇疯緭鍏ュ埗鍗曚汉" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">寮�濮嬫椂闂�:</view>
-				<view class="right">
-					<picker mode="date" :value="hform.BenginHCreateDate" @change="BenginHCreateDateChange">
-						<input name="BenginHCreateDate" disabled :value="hform.BenginHCreateDate" placeholder="璇烽�夋嫨" />
-					</picker>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">缁撴潫鏃堕棿:</view>
-				<view class="right">
-					<picker mode="date" :value="hform.EndHCreateDate" @change="EndHCreateDateChange">
-						<input name="EndHCreateDate" disabled :value="hform.EndHCreateDate" placeholder="璇烽�夋嫨" />
-					</picker>
-				</view>
-			</view>
-			
-			<view class="buttons">
-				<button class="op5" size="mini" type="default" @tap="clear">閲嶇疆</button>
-				<button class="op3" size="mini" type="default" @tap="search">鏌ヨ</button>
-				<button class="op4" size="mini" type="default" @tap="close">鍏抽棴</button>
-			</view>
-		</view>
-		
-		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
-		
-		<view class="list" v-for="(item,index) in listData" :key="index">
-			<uni-card :title="item.鍣ㄥ叿鍚嶇О" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
-				<view class="card-detail">
-					<view class="detail" v-if="item.鍣ㄥ叿缂栧彿">
-						<text>鍣ㄥ叿缂栧彿锛�</text>{{item.鍣ㄥ叿缂栧彿}}
-					</view>
-					<view class="detail" v-if="item.鍐呴儴鍗曟嵁鍙�">
-						<text>鍐呴儴鍗曟嵁鍙凤細</text>{{item.鍐呴儴鍗曟嵁鍙穧}
-					</view>
-					<view class="detail" v-if="item.寮�濮嬫棩鏈�">
-						<text>寮�濮嬫棩鏈燂細</text>{{item.寮�濮嬫棩鏈�.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.缁撴潫鏃ユ湡">
-						<text>缁撴潫鏃ユ湡锛�</text>{{item.缁撴潫鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.淇濆吇鍛ㄦ湡">
-						<text>淇濆吇鍛ㄦ湡(鍗曚綅)锛�</text>{{item.淇濆吇鍛ㄦ湡}}({{item.鍛ㄦ湡鍗曚綅}})
-					</view>
-					<view class="detail" v-if="item.澶囨敞">
-						<text>澶囨敞锛�</text>{{item.澶囨敞}}
-					</view>
-				</view>
-				<view class="card-detail" v-if="showDetail == index">
-					<view class="detail" v-if="item.鍒跺崟浜�">
-						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
-					</view>
-					<view class="detail" v-if="item.鍒跺崟鏃ユ湡">
-						<text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.瀹℃牳浜�">
-						<text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
-					</view>
-					<view class="detail" v-if="item.瀹℃牳鏃ユ湡">
-						<text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.淇敼浜�">
-						<text>淇敼浜猴細</text>{{item.淇敼浜簘}
-					</view>
-					<view class="detail" v-if="item.淇敼鏃ユ湡">
-						<text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.鍏抽棴浜�">
-						<text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
-					</view>
-					<view class="detail" v-if="item.鍏抽棴鏃ユ湡">
-						<text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
-					</view>
-				</view>
-				
-				<view class="more" v-if="showDetail == index">
-					<view class="part" style="border-right: 1px solid #eee;">
-						<uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
-					</view>
-					<view class="part" @tap.stop="choose(item)">
-						<uni-icons type="checkmarkempty" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>閫夊彇璇ユ暟鎹�
-					</view>
-				</view>
-				<view class="more" v-if="showDetail != index">
-					<view class="part" style="border-right: 1px solid #eee;">
-						<uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
-					</view>
-					<view class="part" @tap.stop="choose(item)">
-						<uni-icons type="checkmarkempty" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>閫夊彇璇ユ暟鎹�
-					</view>
-				</view>
-			</uni-card>
-		</view>
-		
-		<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
-		<view class="over" v-if="listData.length != 0">宸插埌搴�</view>
-	</view>
-</template>
-
-<script>
-	import { getUserInfo } from "@/utils/auth.js";
-	export default {
-	    data() {
-	        return {
-				userInfo:getUserInfo(),
-				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
-				hform:{
-					HBillNo:'',
-					HCreateBy:'',
-					BenginHCreateDate:'',
-					EndHCreateDate:'',
-				},
-				sWhere:'',
-				listData:[],
-				showDetail:-1,
-	        }
-	    },
-		created() {
-			this.getList()
-			console.log(this.userInfo,uni.getStorageSync('HUserName'))
-		},
-	    methods: {
-			getList(){
-				// console.log(this.sWhere)
-				uni.showLoading({
-					title:'鍔犺浇涓�...'
-				})
-				uni.request({
-				    url: this.serverUrl + '/Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList',
-					data:{ 
-						sWhere: this.sWhere,
-						user: uni.getStorageSync('HUserName')
-					},
-				    success: (res) => {
-				        console.log(1,res);
-						if(res.data.count == 1){
-							this.listData = res.data.data
-							uni.hideLoading()
-						}else{
-							uni.hideLoading()
-							uni.showToast({
-								title:res.data.Message,
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.hideLoading()
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨鍗曟嵁鏃ユ湡
-			BenginHCreateDateChange(e){
-				console.log(e.detail.value)
-				this.hform.BenginHCreateDate = e.detail.value
-			},
-			//閫夋嫨鍗曟嵁鏃ユ湡
-			EndHCreateDateChange(e){
-				console.log(e.detail.value)
-				this.hform.EndHCreateDate = e.detail.value
-			},
-			search(){
-				this.sWhere = ''
-				
-				console.log(this.hform)
-				if (this.hform.HBillNo) {
-				    this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
-				}
-				if (this.hform.HCreateBy) {
-				    this.sWhere += " and 鍒跺崟浜� like '%" + this.hform.HCreateBy + "%'";
-				}
-				if (this.hform.BenginHCreateDate) {
-				    this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
-				}
-				if (this.hform.EndHCreateDate) {
-				    this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
-				}
-				
-				this.getList()
-			},
-			clear(){
-				this.sWhere = ''
-				this.showDetail = -1,
-				this.hform = {
-					HBillNo:'',
-					HCreateBy:'',
-					BenginHCreateDate:'',
-					EndHCreateDate:'',
-				}
-				this.getList()
-			},
-			choose(item){
-				console.log(item)
-				var data = {
-					HPlanName:item.鍗曟嵁鍙�,
-					HPlanNo:item.hmainid,
-					HInterID:item.hmainid,
-				}
-				this.$emit('planData', data)
-			},
-			close(){
-				this.$emit('close',true)
-			},
-	    }
-	}
-</script>
-
-<style lang="scss" scoped>
-	.content{
-		width: 100%;
-		height: 100%;
-		background-color: #fff;
-		overflow: hidden;
-		overflow-y: auto;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 99;
-	}
-	.form{
-		width: 640rpx;
-		margin: 20rpx auto;
-	}
-    .form-item{
-		display: flex;
-		align-items: center;
-		font-size: 28rpx;
-		padding: 6rpx 0;
-		.title{
-			width: 180rpx;
-			text{
-				color: red;
-				font-weight: bold;
-			}
-		}
-		.right{
-			width: 450rpx;
-			border-radius: 22rpx;
-			border: 1px solid #acacac;
-		}
-		.righton{
-			width: 450rpx;
-			border-radius: 22rpx;
-			border: 1px solid #e4e4e4;
-			background-color: #e4e4e4;
-		}
-		input{
-			width: 100%;
-			padding: 8rpx 20rpx;
-			font-size: 30rpx;
-		}
-	}
-	.buttons{
-		width: 100%;
-		display: flex;
-		justify-content: center;
-		margin-top: 20rpx;
-		button{
-			border-radius: 50rpx;
-			width: 180rpx;
-			height: 66rpx;
-			line-height: 66rpx;
-			font-size: 28rpx;
-			color: #fff;
-		}
-	}
-	
-	.list{
-		width: 100%;
-		.card-detail{
-			width: 100%;
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-			line-height: 120%;
-			.detail{
-				// width: 50%;
-				font-size: 26rpx;
-				margin-bottom: 12rpx;
-				color: #555;
-				margin-right: 20rpx;
-				text{
-					color: #999;
-					font-size: 26rpx;
-				}
-			}
-		}
-		.more{
-			color: #888;
-			font-size: 24rpx;
-			display: flex;
-			border-top: 1px solid #eee;
-			padding-top: 20rpx;
-			.part{
-				width: 50%;
-				text-align: center;
-			}
-		}
-		.op{
-			display: flex;
-			justify-content: space-around;
-			margin-top: 20rpx;
-			button{
-				padding: 0;
-				width: 130rpx;
-				font-size: 25rpx;
-			}
-		}
-	}
-
-	.op1{
-		border: 1px solid #41a863;
-		background-color: #41a863;
-	}
-	.op2{
-		border: 1px solid #d98d00;
-		background-color: #d98d00;
-	}
-	.op3{
-		border: 1px solid #3a78ff;
-		background-color: #3a78ff;
-	}
-	.op4{
-		border: 1px solid #da0000;
-		background-color: #da0000;
-	}
-	.op5{
-		border: 1px solid #888;
-		background-color: #888;
-	}
-</style>
diff --git a/pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList_son.vue b/pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList_son.vue
deleted file mode 100644
index cd61e2c..0000000
--- a/pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList_son.vue
+++ /dev/null
@@ -1,221 +0,0 @@
-<template>
-	<view class="content">
-		<view class="infoArea">
-			<view class="name">{{infoData.浜у搧妯″叿}}</view>
-			<view class="dm">浠g爜锛歿{infoData.浜у搧妯″叿浠g爜}}</view>
-			
-			<view class="choose">
-				<view class="tab" :class="{focus: number == 1}" @tap="number = 1">鐐规椤逛俊鎭�</view>
-			</view>
-		</view>
-		
-		<view style="width: 100%;height: 200rpx;"></view>
-		<view v-if="number == 1">
-			<view class="list" v-for="(item,index) in listData1" :key="index">
-				<uni-card :title="item.HDotCheckItem" :extra="item.HDotCheckItemNumber" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
-					<view class="card-detail">
-						<view class="detail" v-if="item.HDotCheckItemMethodName">
-							<text>鐐规鏂规硶锛�</text>{{item.HDotCheckItemMethodName}}
-						</view>
-						<view class="detail" v-if="item.HDotCheckPart">
-							<text>鐐规閮ㄤ綅锛�</text>{{item.HDotCheckPart}}
-						</view>
-						<view class="detail" v-if="item.HManagerNumber">
-							<text>璐熻矗浜轰唬鐮侊細</text>{{item.HManagerNumber}}
-						</view>
-						<view class="detail" v-if="item.HManagerName">
-							<text>璐熻矗浜猴細</text>{{item.HManagerName}}
-						</view>
-						<view class="detail" v-if="item.HDotCheckResult">
-							<text>鐐规缁撴灉锛�</text>{{item.HDotCheckResult}}
-						</view>
-						<view class="detail" v-if="item.HRemark">
-							<text>澶囨敞锛�</text>{{item.HRemark}}
-						</view>
-					</view>
-					<view class="card-detail" v-if="showDetail == index">
-						<view class="detail">
-							<text>鍏蜂綋瑕佹眰锛�</text>{{item.HClaim?item.HClaim:'鏆傛棤鍏蜂綋瑕佹眰'}}
-						</view>
-					</view>
-					
-					<view class="morea" v-if="showDetail == index" >
-						<uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
-					</view>
-					<view class="morea" v-if="showDetail != index">
-						<uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏌ョ湅鍏蜂綋瑕佹眰
-					</view>
-				</uni-card>
-			</view>
-			
-			<view class="over" v-if="listData1.length == 0 ">鏆傛棤鏁版嵁</view>
-			<view class="over" v-if="listData1.length != 0 ">宸插埌搴�</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { getUserInfo } from "@/utils/auth.js";
-	export default {
-	    data() {
-	        return {
-				userInfo:getUserInfo(),
-				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
-				infoData:{},
-				number:1,
-				listData1:[],
-				listData2:[],
-				showDetail:-1,
-	        }
-	    },
-		onLoad(e) {
-			console.log(e)
-			uni.setNavigationBarTitle({
-				title: e.浜у搧妯″叿
-			});
-			this.infoData = e
-			this.getList(e.HInterID)
-		},
-	    methods: {
-			getList(HInterID){
-				uni.showLoading({
-					title:'鍔犺浇涓�...'
-				})
-				uni.request({
-				    url: this.serverUrl + '/Sc_MouldDotCheckBill/Sc_MouldDotCheckBillList_sub',
-					data: { "HInterID": HInterID },
-				    success: (res) => {
-						if(res.data.count == 1){
-							this.listData1 = res.data.list[0]
-							console.log(1,this.listData1);
-							uni.hideLoading()
-						}else{
-							uni.hideLoading()
-							uni.showToast({
-								title:res.data.Message,
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.hideLoading()
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-			},
-	    }
-	}
-</script>
-
-<style lang="scss" scoped>
-	.infoArea{
-		width: 100%;
-		padding-top: 20rpx;
-		background-color: #f0f0f0;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 99;
-		.name{
-			text-align: center;
-			font-size: 32rpx;
-			font-weight: 600;
-			color: #333;
-			line-height: 150%;
-		}
-		.dm{
-			text-align: center;
-			font-size: 27rpx;
-			font-weight: 500;
-			color: #333;
-			margin-top: 10px;
-		}
-		.other{
-			display: flex;
-			flex-wrap: wrap;
-			width: 90%;
-			margin: 0 auto;
-			margin-top: 12rpx;
-			font-size: 27rpx;
-			color: #666;
-			text{
-				font-size: 28rpx;
-				color: #333;
-				margin-left: 10rpx;
-			}
-			.half{
-				width: 50%;
-			}
-			.all{
-				width: 100%;
-			}
-		}
-		.choose{
-			height: 70rpx;
-			margin-top: 20rpx;
-			padding: 0 30rpx;
-			background-color: #fff;
-			line-height: 86rpx;
-			border-radius: 40rpx 40rpx 0 0;
-			border-bottom: 2px solid #eee;
-			display: flex;
-			.tab{
-				margin: 0 20rpx;
-				text-align: center;
-				font-size: 28rpx;
-				color: #666;
-			}
-			.focus{
-				font-size: 30rpx;
-				color: #333;
-				font-weight: 600;
-				border-bottom: 2px solid #3a78ff;
-			}
-		}
-	}
-	
-	.list{
-		width: 100%;
-		.card-detail{
-			width: 100%;
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-			line-height: 120%;
-			.detail{
-				// width: 50%;
-				font-size: 26rpx;
-				margin-bottom: 12rpx;
-				color: #555;
-				margin-right: 20rpx;
-				text{
-					color: #999;
-					font-size: 26rpx;
-				}
-			}
-		}
-		.more{
-			color: #888;
-			font-size: 24rpx;
-			display: flex;
-			border-top: 1px solid #eee;
-			padding-top: 20rpx;
-			.part{
-				width: 50%;
-				text-align: center;
-			}
-		}
-		
-		.morea{
-			color: #888;
-			font-size: 24rpx;
-			padding-top: 10rpx;
-			text-align: right;
-		}
-	}
-
-</style>
diff --git a/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue b/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue
new file mode 100644
index 0000000..6d8027b
--- /dev/null
+++ b/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue
@@ -0,0 +1,954 @@
+<template>
+	<view>
+		<view class="tabs" id="tabs">
+			<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+			<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鏄庣粏淇℃伅</view>
+			<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
+			<view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view>
+		</view>
+		<!-- 鍩烘湰淇℃伅 -->
+		<template v-if="tabs == 0">
+			<view class="form" :style="{height: containerHeight + 'px',overflow: 'auto' }">
+				<view class="form-item">
+					<view class="title">妯″叿鏉$爜:</view>
+					<view class="right">
+						<input v-model="hform.HBarCode" @confirm="GetMessageByBarCode(hform.HBarCode)"
+							placeholder="璇疯緭鍏�(鎴栨壂鎻�)妯″叿鏉$爜" />
+					</view>
+					<view class="icon-wrapper">
+						<uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐐规寮�濮�:</view>
+					<view class="right">
+						<uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
+							<input :value="hform.HBeginDate" />
+						</uni-datetime-picker>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐐规缁撴潫:</view>
+					<view class="right">
+						<uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HEndDate">
+							<input :value="hform.HEndDate" />
+						</uni-datetime-picker>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏁伴噺:</view>
+					<view class="right">
+						<input type="number" v-model="hform.HQty" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏈�缁堢粨璁�:</view>
+					<view class="right none-border">
+						<radio-group @change="radioChange" class="radio_Container">
+							<label>
+								<view>
+									<radio value="OK" :checked="hform.HLastResult == 'OK'" />
+									<text>OK</text>
+								</view>
+							</label>
+							</label>
+							<view>
+								<radio value="NG" :checked="hform.HLastResult == 'NG'" />
+								<text>NG</text>
+							</view>
+							</label>
+						</radio-group>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">寮傚父鎯呭喌璁板綍:</view>
+					<view class="right">
+						<input v-model="hform.HErrNote" placeholder="璇疯緭鍏ュ紓甯告儏鍐佃褰�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">閲嶅ぇ瀹夊叏闅愭偅璁板綍:</view>
+					<view class="right">
+						<input v-model="hform.HBigSafeNote" placeholder="璇疯緭鍏ラ噸澶у畨鍏ㄩ殣鎮h褰�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐐规鏁版嵁:</view>
+					<view class="right">
+						<input v-model="hform.HDotCheckNote" placeholder="璇疯緭鍏ョ偣妫�鏁版嵁" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐢熶骇鐝:</view>
+					<zxz-uni-data-select class="right" :localdata="HShiftsList" dataKey="鐝鍚嶇О" dataValue="HItemID"
+						v-model="hform.HShiftsID">
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HBillNo" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鏃ユ湡:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">閮ㄩ棬:</view>
+					<zxz-uni-data-select class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О" dataValue="HItemID"
+						v-model="hform.HDeptID">
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title">澶囨敞:</view>
+					<view class="right">
+						<input v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">妯″叿鍚嶇О:</view>
+					<view class="righton">
+						<input v-model="hform.HBarName" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">妯″叿瑙勬牸:</view>
+					<view class="righton">
+						<input v-model="hform.HBarSpec" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">妯″叿鍨嬪彿:</view>
+					<view class="righton">
+						<input v-model="hform.HBarModel" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐐规璁″垝:</view>
+					<view class="righton">
+						<input v-model="hform.HPlanNo" disabled />
+					</view>
+				</view>
+			</view>
+		</template>
+		<!-- 鏄庣粏淇℃伅 -->
+		<template v-if="tabs == 1">
+			<view class="form">
+				<view class="form-item">
+					<view class="left">
+						妯″叿鐐规瑙勭▼
+					</view>
+					<view class="right">
+						<input type="text" :value="hform.HMouldDotCheckRuleNo" />
+					</view>
+					<view class="icon-wrapper">
+						<uni-icons type="search" size="20" @click="toCheckFile"></uni-icons>
+					</view>
+				</view>
+			</view>
+			<view class="list" v-for="(item,index) in HCheckFileList" :key="index">
+				<uni-card style="margin: 10px;">
+					<view class="card-detail">
+						<view class="detail">
+							<text>搴忓彿锛�</text>{{index+1}}
+						</view>
+						<view class="detail">
+							<text>缁撴灉锛�</text>
+							<checkbox-group style="display: inline-block;"
+								@change="checkBoxChangeHandler(index, $event)">
+								<checkbox value="enabled" :checked="item.HDotCheckResult" />
+							</checkbox-group>
+						</view>
+						<view class="detail" v-if="false">
+							<text>鐐规椤圭洰ID锛�</text>{{item.HDotCheckItemID}}
+						</view>
+						<view class="detail">
+							<text>鐐规椤圭洰锛�</text>{{item.HDotCheckItem}}
+						</view>
+						<view class="detail" v-if="false">
+							<text>鐐规椤圭洰鍒嗙被ID锛�</text>{{item.HDotCheckItemClassID}}
+						</view>
+						<view class="detail">
+							<text>鐐规椤圭洰鍒嗙被锛�</text>{{item.HDotCheckItemClassName}}
+						</view>
+						<view class="detail" v-if="false">
+							<text>鐐规鏂规硶ID锛�</text>{{item.HDotCheckItemMethodID}}
+						</view>
+						<view class="detail">
+							<text>鐐规鏂规硶锛�</text>{{item.HDotCheckItemMethodName}}
+						</view>
+						<view class="detail">
+							<text>鐐规閮ㄤ綅锛�</text>{{item.HDotCheckPart}}
+						</view>
+						<view class="detail">
+							<text>鍏蜂綋瑕佹眰锛�</text>{{item.HClaim}}
+						</view>
+						<view class="detail" v-if="false">
+							<text>璐熻矗浜篒D锛�</text>{{item.HManagerID}}
+						</view>
+						<view class="detail">
+							<text>璐熻矗浜哄悕绉帮細</text>{{item.HManagerName}}
+						</view>
+						<view class="detail">
+							<text>澶囨敞锛�</text>{{item.HRemark}}
+						</view>
+						<view class="detail" v-if="false">
+							<text>婧愬崟ID锛�</text>{{item.HSourceInterID}}
+						</view>
+						<view class="detail" v-if="false">
+							<text>婧愬崟瀛怚D锛�</text>{{item.HSourceEntryID}}
+						</view>
+						<view class="detail" v-if="false">
+							<text>婧愬崟鍙凤細</text>{{item.HSourceBillNo}}
+						</view>
+
+					</view>
+				</uni-card>
+			</view>
+			<view class="over" v-if="HCheckFileList.length == 0">鏆傛棤鏁版嵁</view>
+		</template>
+		<!-- 鍏朵粬淇℃伅 -->
+		<template v-if="tabs == 2">
+			<view class="form" :style="{height: containerHeight + 'px', overflow: 'auto'}">
+				<view class="form-item">
+					<view class="title">鍒涘缓浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HMaker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒涘缓鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HMakeDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDater" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDateDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HChecker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳鏃堕棿:</view>
+					<view class="righton">
+						<input v-model="hform.HCheckDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteMan" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteDate" />
+					</view>
+				</view>
+			</view>
+
+		</template>
+		<!-- 闄勪欢淇℃伅 -->
+		<template v-if="tabs == 3">
+			<view class="card-item-wrapper">
+				<view class="attachment-btns">
+					<button type="primary" size="mini" @tap="fileUpload">閫夋嫨鏂囦欢</button>
+					<view style="flex: 1;"></view>
+				</view>
+				<view v-for="(item, index) in attachmentInfo" :key="index">
+					<uni-card :title="item['fileName']" :thumbnail="item.filePath">
+						<view class="card-detail">
+							<view class="detail">
+								<text>澶у皬锛�</text>{{item["size"]}}
+							</view>
+							<view class="detail">
+								<text>鐘舵�侊細</text>{{item["status"]}}
+							</view>
+							<view class="detail operation" v-if="item['status']!='涓婁紶鎴愬姛'">
+								<text>鎿嶄綔锛�</text>
+								<button class="btn-a" size="mini" @tap.stop="uploadFile(index)">涓婁紶</button>
+								<button class="btn-b" size="mini" @tap.stop="delFile(index)">鍒犻櫎</button>
+							</view>
+						</view>
+					</uni-card>
+				</view>
+			</view>
+		</template>
+		<!-- 鎿嶄綔鎸夐挳 -->
+		<view class="buttons" id="buttons">
+			<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			<view style="flex: 1;"></view>
+			<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+			<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+		</view>
+		<xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
+	</view>
+</template>
+
+<script>
+	import dayjs from "dayjs";
+	import {
+		CommonUtils
+	} from "@/utils/common";
+	import {
+		MpaasScan
+	} from "@/utils/mpaasScan.js"
+	import "@/pages/MJGL/style/MJBillStyle.scss"
+	import {
+		getUserInfo
+	} from "../../../utils/auth";
+	import {
+		TrackOpTypes
+	} from "vue";
+	export default {
+		name: 'Sc_MouldDotCheckBill',
+		data() {
+			return {
+				tabs: 0,
+				HMainSourceBillType: "",
+				btnTop: 0,
+				tabsBottom: 0,
+				HModName: "Sc_MouldDotCheckBill",
+				HBillType: '3821',
+				operationType: 1,
+				uploadOptions: {},
+
+				HDeptList: [],
+				HShiftsList: [],
+				HCheckFileList: [],
+				attachmentInfo: [],
+
+				hform: {
+					HBarCode: "",
+					HBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+					HEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+					HQty: 0,
+					HErrNote: "",
+					HBigSafeNote: "",
+					HDotCheckNote: "",
+					HShiftsName: "",
+					HShiftsID: 0,
+					HBillNo: "",
+					HInterID: 0,
+					HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+					HDeptName: "",
+					HDeptID: 0,
+					HRemark: "",
+					HBarName: "",
+					HMouldID: 0,
+					HBarSpec: "",
+					HBarModel: "",
+					HPlanNo: "",
+					HPlanInterID: 0,
+					HPlanEntryID: 0,
+					HMouldDotCheckRuleID: 0,
+					HMouldDotCheckRuleNo: "",
+					HMaker: getUserInfo()['Czymc'],
+					HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
+					HUpDater: "",
+					HUpDateDate: "",
+					HChecker: "",
+					HCheckDate: "",
+					HDeleteMan: "",
+					HDeleteDate: "",
+					lngBillKey: 0,
+					lngBillSubKey: 0,
+					HLastResult: "OK"
+				}
+			};
+		},
+		computed: {
+			containerHeight: {
+				get() {
+					return this.btnTop - this.tabsBottom - 5
+				}
+			}
+		},
+		methods: {
+			goBack() {
+				uni.navigateBack()
+			},
+			checkBoxChangeHandler(index, e) {
+				let cr = e.detail.value
+				if (cr.length == 0) {
+					this.HCheckFileList[index]["HDotCheckResult"] = false
+				} else {
+					this.HCheckFileList[index]["HDotCheckResult"] = true
+				}
+			},
+			uploadFile(index) {
+				console.log('filePath: ', this.attachmentInfo[index].filePath);
+				// 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
+				uni.uploadFile({
+					url: CommonUtils.getServerUrl() + "/Sc_MouldDotCheckBill/UploadFile",
+					filePath: this.attachmentInfo[index].filePath,
+					name: 'file',
+					formData: {
+						HBillNo: this.hform.HBillNo,
+						HRemark: "",
+						HUserName: getUserInfo()["Czymc"]
+					},
+					success: (uploadRes) => {
+						CommonUtils.showTips({
+							message: "涓婁紶鎴愬姛"
+						})
+						this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
+					},
+					fail: (err) => {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: `涓婁紶澶辫触: ${err}`
+						})
+					}
+				})
+			},
+			delFile(index) {
+				console.log('attachmentInfo: ', this.attachmentInfo[index]);
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+					success: (res) => {
+						if (res.confirm) {
+							this.attachmentInfo.splice(index, 1)
+						}
+					},
+				})
+
+			},
+			handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
+				console.log('file: ', res);
+				let fileInfo = res.data[0]
+				this.attachmentInfo.push({
+					fileName: fileInfo.name,
+					size: fileInfo.size,
+					status: '绛夊緟涓婁紶',
+					filePath: fileInfo.tempFilePath
+				})
+			},
+			// 涓婁紶鏂囦欢
+			fileUpload() {
+				this.$refs.XeUpload.upload('file', {});
+			},
+			//鑾峰彇鐝鏁版嵁
+			async getShiftList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Web/GetGy_ShiftsList_Json',
+						data: {
+							Shifts: "",
+						}
+					})
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HShiftsList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			async getHDeptList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Gy_Department/list',
+						data: {
+							sWhere: "",
+							user: uni.getStorageSync('HUserName'),
+							Organization: uni.getStorageSync('Organization')
+						}
+					})
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HDeptList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			toScanCode() {
+				MpaasScan.scanCode(cb => {
+					this.hfrom.HBarCode = cb
+					this.GetMessageByBarCode(cb)
+				})
+			},
+			async GetMessageByBarCode(HBarCode) {
+				try {
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/QJ_PDA_MouldDotCheckBill/txtHBarCode_KeyDown",
+						data: {
+							HBarCode: HBarCode
+						},
+					})
+					if (!res) {
+						return
+					}
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+
+					console.log('data: ', data);
+					this.hform.HMouldID = data[0].HInterID
+					this.hform.HBarName = data[0].HName
+					this.hform.HBarSpec = data[0].HModel
+					this.hform.HBarModel = data[0].HModel2
+					this.hform.HQty = 1
+					// 鑾峰彇妫�楠岃绋�
+					this.GetItemByMouldFile()
+				} catch (err) {
+
+				}
+			},
+			async GetItemByMouldFile() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Web/GetItemByMouldFile",
+						data: {
+							"MouldProjectID": this.hform.HMouldID,
+							"Type": "DJ",
+							"HDate": this.hform.HBeginDate
+						}
+					})
+
+					let {
+						data,
+						Message,
+						count
+					} = res.data
+					if (count == 1) {
+						this.hform.HMouldDotCheckRuleID = data[0].HMouldDotCheckRuleID
+						this.hform.HMouldDotCheckRuleNo = data[0].HMouldDotCheckRuleNo
+						this.hform.HPlanNo = data[0].鍗曟嵁鍙�
+						this.hform.HPlanInterID = (data[0].hmainid == null ? 0 : data[0].hmainid) == "" ? 0 : data[0].hmainid
+						this.hform.HPlanEntryID = (data[0].HEntryID == null ? 0 : data[0].HEntryID) == "" ? 0 : data[0].HEntryID
+
+						this.HCheckFileList = Array.from(data).map(item => {
+							return {
+								"HDotCheckItemID": item.鐐规椤圭洰ID,
+								"HDotCheckItem": item.鐐规椤圭洰鍚嶇О,
+								"HDotCheckPart": item.鐐规閮ㄤ綅,
+								"HClaim": item.鍏蜂綋瑕佹眰,
+								"HManagerID": item.璐熻矗浜篒D,
+								"HManagerName": item.璐熻矗浜哄悕绉�,
+								"HSourceInterID": item.hmainid == null ? 0 : item.hmainid,
+								"HSourceEntryID": item.HEntryID == null ? 0 : item.HEntryID,
+								"HSourceBillNo": item.鍗曟嵁鍙�,
+								"HDotCheckItemClassID": item.鐐规椤圭洰鍒嗙被id || 0,
+								"HDotCheckItemClassName": item.鐐规椤圭洰鍒嗙被 || "",
+								"HDotCheckItemMethodID": item.鐐规鏂规硶id || 0,
+								"HDotCheckItemMethodName": item.鐐规鏂规硶 || "",
+								"HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
+							}
+						})
+
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${Message}`
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
+					})
+				}
+			},
+			toCheckFile() {
+				// 鍒ゆ柇鏄惁宸叉壂鎻忔ā鍏�
+				if (!this.hform.HMouldID || this.hform.HMouldID == 0) {
+					uni.showToast({
+						title: '璇峰厛鎵弿妯″叿浜岀淮鐮佸甫鍑烘ā鍏蜂俊鎭�',
+						icon: 'none'
+					});
+					return;
+				}
+
+				// 鎵撳紑鐐规瑙勭▼閫夋嫨椤甸潰
+				uni.navigateTo({
+					url: '/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckRuleBillList?mouldId=' + this.hform
+						.HMouldID,
+					success: (res) => {
+						// 閫氳繃浜嬩欢閫氶亾鐩戝惉杩斿洖鐨勬暟鎹�
+						res.eventChannel.on('selectedPlanData', (data) => {
+							console.log('鎺ユ敹鍒伴�夋嫨鐨勬暟鎹�:', data);
+							// 璧嬪�煎瓧娈�
+							this.hform.HMouldDotCheckRuleNo = data.HMouldDotCheckRuleNo; // 鍗曟嵁鍙�
+							this.hform.HMouldDotCheckRuleID = data.HInterID; // hmainid
+
+							// 璋冪敤鑾峰彇鐐规椤圭洰鐨勬柟娉�
+							this.get_DocCheckItem2();
+						});
+
+						res.eventChannel.on('closePage', () => {
+							console.log('鍏抽棴閫夋嫨椤甸潰');
+						});
+					}
+				});
+			},
+
+			// 鑾峰彇鐐规瑙勫垯椤圭洰
+			async get_DocCheckItem2() {
+				try {
+					// 楠岃瘉鏄惁宸查�夋嫨鐐规瑙勭▼
+					if (!this.hform.HMouldDotCheckRuleID || this.hform.HMouldDotCheckRuleID == 0) {
+						uni.showToast({
+							title: '璇峰厛閫夋嫨鐐规瑙勭▼',
+							icon: 'none'
+						});
+						return;
+					}
+
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Web/GetDotCheckRuleItemByDotCheckRuleID/Mould',
+						data: {
+							"HDotCheckRuleInterID": this.hform.HMouldDotCheckRuleID
+						}
+					});
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data;
+
+					if (count == 1) {
+						if (data && data.length > 0) {
+							this.HCheckFileList = Array.from(data).map(item => {
+								return {
+									"HDotCheckItemID": item.HDotCheckItemID || 0,
+									"HDotCheckCode": item.鐐规椤圭洰浠g爜 || "",
+									"HDotCheckItem": item.鐐规椤圭洰 || "",
+									"HDotCheckPart": item.鐐规閮ㄤ綅 || "",
+									"HClaim": item.鍏蜂綋瑕佹眰 || "",
+									"HManagerID": item.璐熻矗浜篒D || 0,
+									"HManagerCode": item.璐熻矗浜轰唬鐮� || "",
+									"HManagerName": item.璐熻矗浜哄悕绉� || "",
+									"HSourceInterID": (item.鐐规璁″垝ID == null ? 0 : item.鐐规璁″垝ID) || 0,
+									"HSourceEntryID": (item.鐐规璁″垝瀛怚D == null ? 0 : item.鐐规璁″垝瀛怚D) || 0,
+									"HSourceBillNo": (item.鐐规璁″垝鍗� == null ? '' : item.鐐规璁″垝鍗�) || '',
+									"HDotCheckItemClassID": (item.HDotCheckItemClassID == null ? 0 : item.HDotCheckItemClassID) || 0,
+									"HDotCheckItemClassName": (item.鐐规椤圭洰鍒嗙被鍚嶇О == null ? '' : item.鐐规椤圭洰鍒嗙被鍚嶇О) ||'',
+									"HDotCheckItemMethodID": (item.鐐规鏂规硶id == null ? 0 : item.鐐规鏂规硶id) || 0,
+									"HDotCheckItemMethodName": (item.鐐规鏂规硶 == null ? '' : item.鐐规鏂规硶) || '',
+									"HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
+								};
+							});
+						} else {
+							this.HCheckFileList = [];
+							uni.showToast({
+								title: '璇ョ偣妫�瑙勭▼鏆傛棤鐐规椤圭洰璁板綍',
+								icon: 'none'
+							});
+						}
+					} else {
+						this.HCheckFileList = [];
+						uni.showToast({
+							title: Message || '鑾峰彇鐐规椤圭洰澶辫触',
+							icon: 'none'
+						});
+					}
+				} catch (err) {
+					this.HCheckFileList = [];
+					uni.showToast({
+						title: `鑾峰彇鐐规椤圭洰澶辫触: ${err}`,
+						icon: 'none'
+					});
+				}
+			},
+			radioChange(e) {
+				console.log('radioChange:', e.detail.value);
+				this.hform.HLastResult = e.detail.value;
+			},
+			getEditData(hmainid) {
+				// 涓昏〃鏁版嵁
+				uni.request({
+					url: CommonUtils.getServerUrl() + '/Sc_MouldDotCheckBill/Sc_MouldDotCheckBillListCheckDetai',
+					data: {
+						HID: hmainid
+					},
+					success: (res) => {
+						console.log('缂栬緫鎺ュ彛杩斿洖鏁版嵁:', res.data);
+						if (res.data.code == 1) {
+							var data = res.data.data.h_v_Sc_MouldDotCheckBillMain_Edit[0];
+							this.hform = {
+								HInterID: hmainid,
+								HBillNo: data.鍗曟嵁鍙�,
+								HDate: data.鏃ユ湡.substr(0, 10),
+								HMouldID: data.HMouldID || 0,
+								HBarCode: data.妯″叿鏉$爜 || "",
+								HBarName: data.浜у搧妯″叿 || "",
+								HBarSpec: data.妯″叿瑙勬牸 || "",
+								HBarModel: data.妯″叿鍨嬪彿 || "",
+								HPlanNo: data.鐐规璁″垝缂栧彿 || "",
+								HPlanInterID: data.HPlanInterID || 0,
+								HPlanEntryID: data.HPlanEntryID || 0,
+								HBeginDate: data.鐐规寮�濮嬫棩鏈� ? data.鐐规寮�濮嬫棩鏈�.substr(0, 10) : dayjs(new Date())
+									.format("YYYY-MM-DD HH:mm:ss"),
+								HEndDate: data.鐐规缁撴潫鏃ユ湡 ? data.鐐规缁撴潫鏃ユ湡.substr(0, 10) : dayjs(new Date())
+									.format("YYYY-MM-DD HH:mm:ss"),
+								HShiftsID: data.HShiftsID || 0,
+								HShiftsName: data.鐝鍚嶇О || "",
+								HLastResult: data.鏈�缁堢粨璁� === '鍚堟牸' ? 'OK' : (data.鏈�缁堢粨璁� === '涓嶅悎鏍�' ? 'NG' :
+									'OK'),
+								HMouldDotCheckRuleID: data.HMouldDotCheckRuleID || 0,
+								HMouldDotCheckRuleNo: data.鍣ㄥ叿鐐规瑙勭▼鍗曟嵁鍙� || "",
+								HErrNote: data.寮傚父鎯呭喌璁板綍 || "",
+								HBigSafeNote: data.閲嶅ぇ瀹夊叏闅愭偅璁板綍 || "",
+								HDotCheckNote: data.鐐规鏁版嵁 || "",
+								HRemark: data.澶囨敞 || "",
+								HDeptID: data.HDeptID || 0,
+								HDeptName: data.閮ㄩ棬鍚嶇О || "",
+								HQty: data.鏁伴噺 || 1,
+
+								HMaker: data.鍒跺崟浜� || getUserInfo()['Czymc'],
+								HMakeDate: data.鍒跺崟鏃ユ湡 ? data.鍒跺崟鏃ユ湡.substr(0, 10) : dayjs(new Date()).format(
+									"YYYY-MM-DD"),
+								HUpDater: data.淇敼浜� || "",
+								HUpDateDate: data.淇敼鏃ユ湡 ? data.淇敼鏃ユ湡.substr(0, 10) : "",
+								HChecker: data.瀹℃牳浜� || "",
+								HCheckDate: data.瀹℃牳鏃ユ湡 ? data.瀹℃牳鏃ユ湡.substr(0, 10) : "",
+								HDeleteMan: data.浣滃簾浜� || "",
+								HDeleteDate: data.浣滃簾鏃ユ湡 ? data.浣滃簾鏃ユ湡.substr(0, 10) : "",
+								lngBillKey: 0,
+								lngBillSubKey: 0,
+								HInnerBillNo: data.鍐呴儴鍗曟嵁鍙� || "",
+								HExplanation: data.鎽樿 || ""
+							};
+
+							// 鑾峰彇閮ㄩ棬鍒楄〃骞惰缃儴闂�
+							if (data.HDeptID) {
+								this.$nextTick(() => {
+									this.hform.HDeptID = data.HDeptID;
+								});
+							}
+
+							// 鑾峰彇鐝鍒楄〃骞惰缃彮娆�
+							if (data.HShiftsID) {
+								this.$nextTick(() => {
+									this.hform.HShiftsID = data.HShiftsID;
+								});
+							}
+						} else {
+							uni.showToast({
+								title: res.data.Message || '鑾峰彇鏁版嵁澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log('涓昏〃璇锋眰澶辫触:', res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+					complete: () => {
+						// 鑾峰彇瀛愯〃鏁版嵁
+						this.getSubEditData(hmainid);
+					}
+				});
+			},
+
+			// 鑾峰彇瀛愯〃鏁版嵁
+			getSubEditData(hmainid) {
+				uni.request({
+					url: CommonUtils.getServerUrl() + '/Sc_MouldDotCheckBill/Sc_MouldDotCheckBillListProjectDetai',
+					data: {
+						sqlWhere: 'and HInterID=' + hmainid
+					},
+					success: (res) => {
+						console.log('瀛愯〃鏁版嵁:', res.data);
+						if (res.data.count == 1) {
+							this.HCheckFileList = res.data.list[0].map(item => {
+								const isChecked = item.鐐规缁撴灉 === '鍚堟牸' ? true : false;
+								return {
+									"HDotCheckItemID": item.鐐规椤圭洰ID || 0,
+									"HDotCheckItem": item.鐐规椤圭洰 || "",
+									"HDotCheckPart": item.鐐规閮ㄤ綅 || "",
+									"HClaim": item.鍏蜂綋瑕佹眰 || "",
+									"HManagerID": item.璐熻矗浜篒D || 0,
+									"HManagerName": item.璐熻矗浜哄悕绉� || "",
+									"HSourceInterID": item.hmainid || 0,
+									"HSourceEntryID": item.HEntryID || 0,
+									"HSourceBillNo": item.鍗曟嵁鍙� || "",
+									"HDotCheckItemClassID": item.HDotCheckItemClassID || 0,
+									"HDotCheckItemClassName": item.鐐规椤圭洰鍒嗙被鍚嶇О || "",
+									"HDotCheckItemMethodID": item.HDotCheckItemMethodID || 0,
+									"HDotCheckItemMethodName": item.鐐规鏂规硶鍚嶇О  || "",
+									"HDotCheckResult": isChecked,
+									"HRemark":item.瀛愬娉�2|| ""
+								};
+							});							
+						} else {
+							console.log('瀛愯〃鏁版嵁涓虹┖鎴栬幏鍙栧け璐�:', res.data.Message);
+							this.HCheckFileList = [];
+						}
+					},
+					fail: (res) => {
+						console.log('瀛愯〃璇锋眰澶辫触:', res);
+						this.HCheckFileList = [];
+					}
+				});
+			},
+			async getMaxNum() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Web/GetMAXNum",
+						data: {
+							"HBillType": this.HBillType
+						}
+					})
+
+					let {
+						count,
+						data,
+						Message
+					} = res.data
+					console.log('data: ', data);
+					this.hform.HInterID = 0
+					this.hform.HBillNo = data[0]["HBillNo"]
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+					})
+				}
+			},
+			async submit() {
+				try {
+					let oMain = JSON.stringify(this.hform);
+					let sSubStr = JSON.stringify(this.HCheckFileList);
+					let sMainSub = oMain + ';' + sSubStr + ';' + uni.getStorageSync('HUserName');
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Sc_MouldDotCheckBill/SaveGetMouldDotCheckBillListAPP",
+						data: {
+							"msg": sMainSub
+						},
+						method: "POST"
+					})
+
+					if (!res) {
+						return
+					}
+
+					let {
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						uni.showModal({
+							title: '鎻愮ず',
+							content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+							success: (res) => {
+								if (res.confirm) {
+									console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+									uni.redirectTo({
+										url: '/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill?operationType=1'
+									})
+								} else if (res.cancel) {
+									console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+									setTimeout(() => {
+										uni.navigateBack();
+									}, 50)
+								}
+							}
+						});
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+						})
+					}
+
+
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鎻愪氦鍗曟嵁澶辫触: " + err
+					})
+				}
+			}
+		},
+		onLoad(e) {
+			console.log('e: ', e);
+			this.getHDeptList()
+			this.getShiftList()
+			if (!e.operationType) {
+				this.operationType = 1
+			} else {
+				this.operationType = e.operationType
+			}
+
+			if (this.operationType == 1) {
+				// 鏂板
+				this.getMaxNum()
+			} else if (this.operationType == 2) {
+				// 澶嶅埗
+			} else if (this.operationType == 3) {
+				// 缂栬緫
+				this.getEditData(e.hmainid)
+			} else if (this.operationType == 4) {
+				// 娴忚
+
+			}
+		},
+		onReady() {
+			const query = uni.createSelectorQuery().in(this)
+			query.select("#buttons")
+				.boundingClientRect()
+				.select("#tabs")
+				.boundingClientRect()
+				.exec(res => {
+					this.btnTop = Math.floor(res[0].top)
+					this.tabsBottom = Math.ceil(res[1].bottom)
+				})
+		}
+	}
+</script>
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList.vue b/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBillList.vue
similarity index 96%
rename from pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList.vue
rename to pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBillList.vue
index ab17144..f0b875c 100644
--- a/pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList.vue
+++ b/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBillList.vue
@@ -126,7 +126,6 @@
 					</view>
 
 					<view class="op" v-if="operations == index">
-						<button class="op1" size="mini" plain @tap.stop="toSon(item)">瀛愯〃淇℃伅</button>
 						<button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
 						<button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
 						<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
@@ -319,14 +318,14 @@
 			// 鏂板妯″叿鐐规璁板綍鍗�
 			onAddClickHandler() {
 				uni.navigateTo({
-					url: "/pages/MJGL/mujudianjianjiludan/form"
+					url: "/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill?operationType=1"
 				})
 			},
 			//缂栬緫鐐规璁板綍鍗�
 			edit(item) {
 				console.log(item)
 				uni.navigateTo({
-					url: '/pages/MJGL/mujudianjianjiludan/form?hmainid=' + item.hmainid
+					url: '/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill?operationType=3&hmainid=' + item.hmainid
 				})
 			},
 			//鍒犻櫎鐐规璁板綍鍗�
@@ -372,13 +371,6 @@
 							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
 						}
 					}
-				});
-			},
-			//瀛愯〃鏌ョ湅
-			toSon(item) {
-				uni.navigateTo({
-					url: '/pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList_son?HInterID=' + item.hmainid + '&浜у搧妯″叿浠g爜=' + item
-						.浜у搧妯″叿浠g爜 + '&浜у搧妯″叿=' + item.浜у搧妯″叿,
 				});
 			}
 		},
diff --git a/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckRuleBillList.vue b/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckRuleBillList.vue
new file mode 100644
index 0000000..e3644da
--- /dev/null
+++ b/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckRuleBillList.vue
@@ -0,0 +1,516 @@
+<template>
+	<view class="content">
+		<!-- 琛ㄥ崟鍖哄煙 -->
+		<view class="form-container">
+			<view class="form">
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="right">
+						<input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="right">
+						<input v-model="hform.HCreateBy" placeholder="璇疯緭鍏ュ埗鍗曚汉" />
+					</view>
+				</view>
+				<view class="form-item" v-show="false">
+					<view class="title">寮�濮嬫椂闂�:</view>
+					<view class="right">
+						<picker mode="date" :value="hform.BenginHCreateDate" @change="BenginHCreateDateChange">
+							<input name="BenginHCreateDate" disabled :value="hform.BenginHCreateDate"
+								placeholder="璇烽�夋嫨" />
+						</picker>
+					</view>
+				</view>
+				<view class="form-item" v-show="false">
+					<view class="title">缁撴潫鏃堕棿:</view>
+					<view class="right">
+						<picker mode="date" :value="hform.EndHCreateDate" @change="EndHCreateDateChange">
+							<input name="EndHCreateDate" disabled :value="hform.EndHCreateDate" placeholder="璇烽�夋嫨" />
+						</picker>
+					</view>
+				</view>
+			</view>
+
+			<!-- 鎸夐挳鍖哄煙 -->
+			<view class="buttons-container">
+				<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+				<view class="buttons">
+					<button class="op5" size="mini" type="default" @tap="clear">閲嶇疆</button>
+					<button class="op3" size="mini" type="default" @tap="search">鏌ヨ</button>
+					<button class="op4" size="mini" type="default" @tap="close">鍏抽棴</button>
+				</view>
+			</view>
+		</view>
+
+		<!-- 鍒楄〃鍖哄煙 -->
+		<scroll-view class="list-container" scroll-y="true" :style="{height: listHeight + 'px'}">
+			<view class="list" v-for="(item,index) in listData" :key="index">
+				<uni-card :title="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.hmainid" v-show="false">
+							<text>hmainid锛�</text>{{item.hmainid}}
+						</view>
+						<view class="detail" v-if="item.hsubid" v-show="false">>
+							<text>hsubid锛�</text>{{item.hsubid}}
+						</view>
+						<view class="detail" v-if="item.HInterID" v-show="false">
+							<text>HInterID锛�</text>{{item.HInterID}}
+						</view>
+					</view>
+					<view class="card-detail" v-if="showDetail == index">
+						<view class="detail" v-if="item.鍒跺崟浜�">
+							<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+						</view>
+						<view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+							<text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
+						</view>
+						<view class="detail" v-if="item.瀹℃牳浜�">
+							<text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
+						</view>
+						<view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+							<text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
+						</view>
+						<view class="detail" v-if="item.淇敼浜�">
+							<text>淇敼浜猴細</text>{{item.淇敼浜簘}
+						</view>
+						<view class="detail" v-if="item.淇敼鏃ユ湡">
+							<text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
+						</view>
+						<view class="detail" v-if="item.鍏抽棴浜�">
+							<text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
+						</view>
+						<view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+							<text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
+						</view>
+					</view>
+
+					<view class="more" v-if="showDetail == index">
+						<view class="part" style="border-right: 1px solid #eee;">
+							<uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+						</view>
+						<view class="part" @tap.stop="choose(item)">
+							<uni-icons type="checkmarkempty" style="color: #888;margin-right: 10rpx;"
+								size="14"></uni-icons>閫夊彇璇ユ暟鎹�
+						</view>
+					</view>
+					<view class="more" v-if="showDetail != index">
+						<view class="part" style="border-right: 1px solid #eee;">
+							<uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+						</view>
+						<view class="part" @tap.stop="choose(item)">
+							<uni-icons type="checkmarkempty" style="color: #888;margin-right: 10rpx;"
+								size="14"></uni-icons>閫夊彇璇ユ暟鎹�
+						</view>
+					</view>
+				</uni-card>
+			</view>
+
+			<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+			<view class="over" v-if="listData.length != 0">宸插埌搴�</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
+	export default {
+		data() {
+			return {
+				bottomBtnTop: 0,
+				listTableTop: 0,
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				// 鏂板瀛楁
+				mouldId: 0,
+				hform: {
+					HBillNo: '',
+					HCreateBy: '',
+					BenginHCreateDate: '',
+					EndHCreateDate: '',
+				},
+				sWhere: '',
+				listData: [],
+				showDetail: -1,
+				listHeight: 0, // 鍔ㄦ�佽绠楀垪琛ㄩ珮搴�
+				safeAreaInsets: {} // 瀹夊叏鍖哄煙淇℃伅
+			}
+		},
+		created() {
+			this.getList()
+			console.log(this.userInfo, uni.getStorageSync('HUserName'))
+
+			// 鑾峰彇瀹夊叏鍖哄煙淇℃伅
+			try {
+				const systemInfo = uni.getSystemInfoSync();
+				this.safeAreaInsets = systemInfo.safeAreaInsets || {
+					top: 0,
+					bottom: 0
+				};
+			} catch (e) {
+				console.error('鑾峰彇瀹夊叏鍖哄煙澶辫触:', e);
+				this.safeAreaInsets = {
+					top: 0,
+					bottom: 0
+				};
+			}
+		},
+		mounted() {
+			// 鍔ㄦ�佽绠楀垪琛ㄩ珮搴�
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.calculateListHeight();
+				}, 100);
+			});
+		},
+		onReady() {
+			this.calculateListHeight();
+		},
+		onResize() {
+			this.calculateListHeight();
+		},
+		methods: {
+			// 璁$畻鍒楄〃鍖哄煙鐨勯珮搴�
+			calculateListHeight() {
+				const query = uni.createSelectorQuery().in(this);
+				query.select('.form-container').boundingClientRect(data => {
+					if (data) {
+						const systemInfo = uni.getSystemInfoSync();
+						const windowHeight = systemInfo.windowHeight;
+						const formHeight = data.height;
+						// 璁$畻鍓╀綑鍙敤楂樺害锛屽噺鍘昏〃鍗曞尯鍩熺殑楂樺害
+						this.listHeight = windowHeight - formHeight - (this.safeAreaInsets.bottom || 0);
+					}
+				}).exec();
+			},
+			getList() {
+				// console.log(this.sWhere)
+				uni.showLoading({
+					title: '鍔犺浇涓�...'
+				})
+				uni.request({
+					url: this.serverUrl + '/Sc_MouldDotCheckRuleBill/Sc_MouldDotCheckRuleListPDA',
+					data: {
+						sWhere: this.sWhere,
+						user: uni.getStorageSync('HUserName')
+					},
+					success: (res) => {
+						console.log(1, res);
+						if (res.data.count == 1) {
+							this.listData = res.data.data
+							uni.hideLoading()
+						} else {
+							uni.hideLoading()
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.hideLoading()
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨鍗曟嵁鏃ユ湡
+			BenginHCreateDateChange(e) {
+				console.log(e.detail.value)
+				this.hform.BenginHCreateDate = e.detail.value
+			},
+			//閫夋嫨鍗曟嵁鏃ユ湡
+			EndHCreateDateChange(e) {
+				console.log(e.detail.value)
+				this.hform.EndHCreateDate = e.detail.value
+			},
+			search() {
+				this.sWhere = ''
+				if (this.mouldId && this.mouldId != 0) {
+					this.sWhere += " and HInterID = " + this.mouldId;
+				}
+				if (this.hform.HBillNo) {
+					this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+				}
+				if (this.hform.HCreateBy) {
+					this.sWhere += " and 鍒跺崟浜� like '%" + this.hform.HCreateBy + "%'";
+				}
+				if (this.hform.BenginHCreateDate) {
+					this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
+				}
+				if (this.hform.EndHCreateDate) {
+					this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
+				}
+
+				this.getList()
+			},
+			clear() {
+				this.sWhere = ''
+				this.showDetail = -1,
+					this.hform = {
+						HBillNo: '',
+						HCreateBy: '',
+						BenginHCreateDate: '',
+						EndHCreateDate: '',
+					},
+					this.search()
+			},
+			choose(item) {
+				var data = {
+					//鐐规瑙勭▼鍗曟嵁鍙�
+					HMouldDotCheckRuleNo: item.鍗曟嵁鍙�,  
+					//妯″叿妗fid
+					HMouldID: item.HInterID,  
+					//鐐规瑙勭▼id
+					HMouldDotCheckRuleID: item.hmainid,  
+				}
+
+				// 淇敼杩欓噷锛氫娇鐢ㄤ簨浠堕�氶亾杩斿洖鏁版嵁缁欑埗椤甸潰
+				const eventChannel = this.getOpenerEventChannel();
+				eventChannel.emit('selectedPlanData', data);
+
+				// 鍏抽棴褰撳墠椤甸潰
+				uni.navigateBack();
+			},
+
+			close() {
+				// 鍏抽棴褰撳墠椤甸潰
+				uni.navigateBack();
+			},
+		},
+		onLoad(options) {
+			// 鎺ユ敹浼犻�掔殑鍙傛暟
+			if (options.mouldId) {
+				this.mouldId = options.mouldId;
+			}
+			// 鏍规嵁妯″叿ID鑷姩鏌ヨ鐩稿叧鐐规瑙勭▼
+			this.search();
+			// 鑾峰彇浜嬩欢閫氶亾锛岀敤浜庨〉闈㈤棿閫氫俊
+			if (this.getOpenerEventChannel) {
+				const eventChannel = this.getOpenerEventChannel();
+
+				// 鐩戝惉椤甸潰鍏抽棴浜嬩欢锛堝鏋滈渶瑕佷粠鐖堕〉闈㈠叧闂綋鍓嶉〉闈級
+				eventChannel.on('closePage', () => {
+					uni.navigateBack();
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		width: 100%;
+		height: 100vh;
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+	}
+
+	// 琛ㄥ崟瀹瑰櫒锛屽寘鍚煡璇㈡潯浠跺拰鎸夐挳
+	.form-container {
+		flex-shrink: 0;
+		background-color: #fff;
+		z-index: 10;
+	}
+
+	.form {
+		width: 100%;
+		padding: 20rpx 30rpx;
+		box-sizing: border-box;
+	}
+
+	.form-item {
+		display: flex;
+		align-items: center;
+		font-size: 28rpx;
+		padding: 12rpx 0;
+		margin-bottom: 10rpx;
+
+		.title {
+			width: 180rpx;
+			flex-shrink: 0;
+
+			text {
+				color: red;
+				font-weight: bold;
+			}
+		}
+
+		.right {
+			flex: 1;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+		}
+
+		input {
+			width: 100%;
+			padding: 16rpx 20rpx;
+			font-size: 30rpx;
+			box-sizing: border-box;
+		}
+	}
+
+	// 鎸夐挳瀹瑰櫒
+	.buttons-container {
+		width: 100%;
+		background-color: #fff;
+	}
+
+	.buttons {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		padding: 20rpx 0;
+
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+			color: #fff;
+			margin: 0 15rpx;
+		}
+	}
+
+	// 鍒楄〃瀹瑰櫒锛屼娇鐢ㄦ粴鍔ㄨ鍥�
+	.list-container {
+		flex: 1;
+		width: 100%;
+		-webkit-overflow-scrolling: touch;
+	}
+
+	.list {
+		width: 100%;
+
+		.card-detail {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			line-height: 120%;
+
+			.detail {
+				font-size: 26rpx;
+				margin-bottom: 12rpx;
+				color: #555;
+				margin-right: 20rpx;
+
+				text {
+					color: #999;
+					font-size: 26rpx;
+				}
+			}
+		}
+
+		.more {
+			color: #888;
+			font-size: 24rpx;
+			display: flex;
+			border-top: 1px solid #eee;
+			padding-top: 20rpx;
+
+			.part {
+				width: 50%;
+				text-align: center;
+			}
+		}
+
+		.op {
+			display: flex;
+			justify-content: space-around;
+			margin-top: 20rpx;
+
+			button {
+				padding: 0;
+				width: 130rpx;
+				font-size: 25rpx;
+			}
+		}
+	}
+
+	.over {
+		text-align: center;
+		padding: 40rpx 0;
+		color: #999;
+		font-size: 28rpx;
+	}
+
+	.op1 {
+		border: 1px solid #41a863;
+		background-color: #41a863;
+	}
+
+	.op2 {
+		border: 1px solid #d98d00;
+		background-color: #d98d00;
+	}
+
+	.op3 {
+		border: 1px solid #3a78ff;
+		background-color: #3a78ff;
+	}
+
+	.op4 {
+		border: 1px solid #da0000;
+		background-color: #da0000;
+	}
+
+	.op5 {
+		border: 1px solid #888;
+		background-color: #888;
+	}
+
+	/* 閫傞厤涓嶅悓灞忓箷灏哄 */
+	@media screen and (max-width: 360px) {
+		.form {
+			padding: 20rpx 20rpx;
+		}
+
+		.form-item {
+			font-size: 26rpx;
+			padding: 10rpx 0;
+
+			.title {
+				width: 160rpx;
+			}
+		}
+
+		.buttons {
+			button {
+				width: 160rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				font-size: 26rpx;
+				margin: 0 10rpx;
+			}
+		}
+	}
+
+	/* 纭繚鍦╥OS涓婅緭鍏ユ涓嶄細琚敭鐩橀伄鎸� */
+	.form-item input,
+	.form-item .right {
+		max-height: 100rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujudianjianjiludan/form.vue b/pages/MJGL/mujudianjianjiludan/form.vue
deleted file mode 100644
index 075017e..0000000
--- a/pages/MJGL/mujudianjianjiludan/form.vue
+++ /dev/null
@@ -1,749 +0,0 @@
-<template>
-	<view>
-		<view class="form">
-			<view class="form-item">
-				<view class="title">鍗曟嵁鍙�:</view>
-				<view class="righton">
-					<input name="HBillNo" v-model="hform.HBillNo" disabled placeholder="璇疯緭鍏ュ崟鎹彿" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鏃ユ湡:</view>
-				<view class="righton">
-					<input name="HDate" disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鍐呴儴鍗曟嵁鍙�:</view>
-				<view class="right">
-					<input name="HInnerBillNo" v-model="hform.HInnerBillNo" placeholder="璇疯緭鍏ュ唴閮ㄥ崟鎹彿" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">妯″叿缂栫爜:</view>
-				<view class="righton">
-					<input name="HMouldNumber" disabled v-model="hform.HMouldNumber" placeholder="璇疯緭鍏ユā鍏风紪鐮�" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title"><text>*</text>妯″叿:</view>
-				<view class="right" style="width: 380rpx;">
-					<input name="HMouldName" v-model="hform.HMouldName" @blur="getHBarCodeData(hform.HMouldName)"
-						placeholder="璇锋壂鎻忔ā鍏锋潯鐮�" />
-				</view>
-				<uni-icons type="scan"
-					style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;font-weight: 500;"
-					size="20" @click="toScanCode"></uni-icons>
-			</view>
-			<view class="form-item">
-				<view class="title"><text>*</text>鐝:</view>
-				<view class="right">
-					<uni-combox :candidates="arrayHShifts" placeholder="璇烽�夋嫨鐝" v-model="hform.HShiftsName"
-						@input="HShiftsChange"></uni-combox>
-				</view>
-			</view>
-
-			<view class="tab_area"></view>
-
-			<view class="form-item">
-				<view class="title">鐐规寮�濮�:</view>
-				<view class="right">
-					<picker mode="date" v-model="hform.HBeginDate" @change="HBeginDateChange">
-						<view class="picker-overlay"></view>
-						<input name="HBeginDate" disabled v-model="hform.HBeginDate" placeholder="璇烽�夋嫨鐐规寮�濮嬫棩鏈�" />
-					</picker>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鐐规缁撴潫:</view>
-				<view class="right">
-					<picker mode="date" v-model="hform.HEndDate" @change="HEndDateChange">
-						<view class="picker-overlay"></view>
-						<input name="HEndDate" disabled v-model="hform.HEndDate" placeholder="璇烽�夋嫨鐐规缁撴潫鏃ユ湡" />
-					</picker>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鐐规璁″垝缂栧彿:</view>
-				<view class="right" style="width: 380rpx;" @tap="showPlan=true">
-					<input name="HPlanName" disabled v-model="hform.HPlanName" placeholder="璇烽�夋嫨鐐规璁″垝缂栧彿" />
-				</view>
-				<uni-icons type="list"
-					style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;font-weight: 500;"
-					size="20" @click="showPlan=true"></uni-icons>
-			</view>
-			<view class="form-item">
-				<view class="title"><text>*</text>妯″叿鐐规瑙勭▼:</view>
-				<view class="right">
-					<uni-combox :candidates="arrayHMouldMaintainRuleInterNo" placeholder="璇烽�夋嫨妯″叿鐐规瑙勭▼"
-						v-model="hform.HMouldDotCheckRuleNo" @input="HMouldMaintainRuleInterNoChange"></uni-combox>
-				</view>
-			</view>
-
-			<view class="form-item">
-				<view class="title"><text>*</text>缁撴灉鍒ゅ畾:</view>
-				<view class="right" style="display: flex; align-items: center; padding: 0 20rpx; border: none;">
-					<view style="display: flex; align-items: center;">
-						<checkbox-group @change="onLastResultChange">
-							<checkbox :value="'true'" :checked="hform.HLastResult"></checkbox>
-						</checkbox-group>
-						<text style="margin-left: 10rpx;">鍚堟牸</text>
-
-					</view>
-				</view>
-			</view>
-			
-			<view class="tab_area"></view>
-			
-			<view class="form-item" style="align-items: flex-start;">
-				<view class="title">寮傚父鎯呭喌璁板綍:</view>
-				<view class="right" style="min-height: 100rpx;">
-					<textarea name="HErrNote" v-model="hform.HErrNote" auto-height maxlength="-1"
-						placeholder="璇疯緭鍏ュ紓甯告儏鍐佃褰�"></textarea>
-				</view>
-			</view>
-			
-			<view class="tab_area"></view>
-			
-			<view class="form-item" style="align-items: flex-start;">
-				<view class="title">閲嶅ぇ瀹夊叏闅愭偅璁板綍:</view>
-				<view class="right" style="min-height: 100rpx;">
-					<textarea name="HBigSafeNote" v-model="hform.HBigSafeNote" auto-height maxlength="-1"
-						placeholder="璇疯緭鍏ラ噸澶у畨鍏ㄩ殣鎮h褰�"></textarea>
-				</view>
-			</view>
-			
-			<view class="tab_area"></view>
-			
-			<view class="form-item" style="align-items: flex-start;">
-				<view class="title">鎽樿:</view>
-				<view class="right" style="min-height: 100rpx;">
-					<textarea name="HExplanation" v-model="hform.HExplanation" auto-height maxlength="-1"
-						placeholder="璇疯緭鍏ユ憳瑕�"></textarea>
-				</view>
-			</view>
-			
-			<view class="tab_area"></view>
-			
-			<view class="form-item" style="align-items: flex-start;">
-				<view class="title">澶囨敞:</view>
-				<view class="right" style="min-height: 100rpx;">
-					<textarea name="HRemark" v-model="hform.HRemark" auto-height maxlength="-1"
-						placeholder="璇疯緭鍏ュ娉�"></textarea>
-				</view>
-			</view>
-
-			<view class="tab_area"></view>
-
-			<view v-if="showmore">
-				<view class="form-item">
-					<view class="title">鍒跺崟浜�:</view>
-					<view class="righton">
-						<input v-model="hform.HMaker" disabled />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鍒跺崟鏃ユ湡:</view>
-					<view class="righton">
-						<input v-if="hform.HMakeDate" v-model="hform.HMakeDate.substr(0,10)" disabled />
-						<input v-else v-model="hform.HMakeDate" disabled />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">淇敼浜�:</view>
-					<view class="righton">
-						<input v-model="hform.HUpDater" disabled />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">淇敼鏃ユ湡:</view>
-					<view class="righton">
-						<input v-if="hform.HUpDateDate" v-model="hform.HUpDateDate.substr(0,10)" disabled />
-						<input v-else v-model="hform.HUpDateDate" disabled />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">瀹℃牳浜�:</view>
-					<view class="righton">
-						<input v-model="hform.HChecker" disabled />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">瀹℃牳鏃ユ湡:</view>
-					<view class="righton">
-						<input v-if="hform.HCheckDate" v-model="hform.HCheckDate.substr(0,10)" disabled />
-						<input v-else v-model="hform.HCheckDate" disabled />
-					</view>
-				</view>
-			</view>
-			<view class="other">
-				<view v-if="!showmore" @tap="showmore = true">
-					灞曞紑鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
-				</view>
-				<view v-if="showmore" @tap="showmore = false">
-					鎶樺彔鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="tip"><text>*</text>娉�: 璇风偣鍑讳笅鏂圭豢鑹叉柊澧炴寜閽坊鍔犵偣妫�椤逛俊鎭紙蹇呭~锛�</view>
-			</view>
-
-			<view class="bottom-btn">
-				<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-				<button class="btn-b" size="mini" @tap="showMask = true">鏂板</button>
-				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
-			</view>
-		</view>
-
-		<plan @planData="getPlanData" @close="closeMask" v-if="showPlan"></plan>
-		<formDetail :form1List='form1List' @hformList='hformList' v-if="showMask"></formDetail>
-	</view>
-</template>
-<script>
-	import getDateTime from '@/utils/getdateTime.js';
-	import plan from './plan.vue';
-	import formDetail from './formDetail.vue';
-	import {
-		getUserInfo
-	} from '../../../utils/auth'
-	export default {
-		components: {
-			plan,
-			formDetail
-		},
-		data() {
-			return {
-				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-				arrayHMouldName: [],
-				showPlan: false,
-				showmore: false,
-				arrayHMouldMaintainRuleInterNo: [], //瑙勭▼
-				HMouldMaintainRuleInterNoList: [],
-				arrayHShifts: [], //鐝
-				HShiftsList: [],
-				hform: {
-					HInterID: 0,
-					HBillNo: '',
-					HDate: getDateTime.dateTimeStr('y-m-d'),
-					HInnerBillNo: '',
-					HMouldID: '',
-					HMouldName: '',
-					HMouldNumber: '',
-					HShiftsID: '0',
-					HShiftsName: '',
-
-					HLastResult: 'true',
-					HPlanNo: '',
-					HPlanInterID: '0',
-					HMainSourceInterID: '0',
-					HMainSourceEntryID: '0',
-					HMainSourceBillNo: '',
-					HBeginDate: '',
-					HEndDate: '',
-					HMouldDotCheckRuleID: '0',
-					HMouldDotCheckRuleNo: '',
-					HBigSafeNote:'',
-					HErrNote:'',
-					HExplanation: '',
-					HRemark: '',
-
-					HMaker: getUserInfo().Czymc,
-					HMakeDate: '',
-					HUpDater: '',
-					HUpDateDate: '',
-					HChecker: '',
-					HCheckDate: '',
-					HCloseMan: '',
-					HCloseDate: '',
-					HDeleteMan: '',
-					HDeleteDate: '',
-				},
-
-				showMask: false,
-				form1List: [],
-			}
-		},
-		onLoad(e) {
-			this.getHShiftsList()
-			this.getHMouldMaintainRuleInterList()
-			if (e.hmainid) {
-				this.getEditData(e.hmainid)
-			} else {
-				this.getNewData()
-			}
-
-		},
-		methods: {
-			//鐩戝惉澶嶉�夋
-			onLastResultChange(e) {
-				// 閫氳繃 value 鍒ゆ柇鐘舵��
-				this.hform.HLastResult = e.detail.value.includes('true');
-			},
-			//鎵爜
-			toScanCode() {
-				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
-				mpaasScanModule.mpaasScan({
-					'hideAlbum': true,
-					'timeoutInterval': '10', //瓒呮椂鏃堕棿
-					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
-				}, (ret) => {
-					console.log(ret.resp_result)
-					this.hform.HMouldName = ret.resp_result
-					this.getHBarCodeData(ret.resp_result)
-				})
-			},
-			getHBarCodeData(HBarCode) {
-				uni.request({
-					url: this.serverUrl + '/QJ_PDA_MouldDotCheckBill/txtHBarCode_KeyDown',
-					data: {
-						HBarCode: this.hform.HMouldName
-					},
-					success: (res) => {
-						console.log(res.data);
-						if (res.data.count == 1) {
-							var data = res.data.data[0]
-							this.hform.HMouldID = data.HInterID
-							this.hform.HMouldName = data.HName
-							this.hform.HMouldNumber = data.HMouldNo
-						}
-						uni.showToast({
-							title: res.data.Message,
-							icon: 'none'
-						})
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//鐐规寮�濮嬮�夋嫨
-			HBeginDateChange(e) {
-				console.log(e.detail.value)
-				this.hform.HBeginDate = e.detail.value
-			},
-			//鐐规缁撴潫閫夋嫨
-			HEndDateChange(e) {
-				console.log(e.detail.value)
-				this.hform.HEndDate = e.detail.value
-			},
-			//鐝
-			getHShiftsList() {
-				uni.request({
-					url: this.serverUrl + '/Web/GetGy_ShiftsList_Json',
-					data: {
-						Shifts: ''
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HShiftsList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHShifts[i] = res.data.data[i].鐝鍚嶇О
-							}
-							this.$forceUpdate();
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨鐝
-			HShiftsChange(e) {
-				for (var i = 0; i < this.HShiftsList.length; i++) {
-					if (this.HShiftsList[i].鐝鍚嶇О == e) {
-						this.hform.HShiftsID = this.HShiftsList[i].HItemID
-					}
-				}
-			},
-			//閫夋嫨鐐规璁″垝缂栧彿
-			getPlanData(e) {
-				console.log(e)
-				this.hform.HPlanNo = e.HPlanName
-				this.hform.HPlanName = e.HPlanName
-				this.hform.HPlanInterID = e.HInterID
-				this.hform.HMainSourceInterID = e.HInterID
-				this.hform.HMainSourceBillNo = e.HPlanName
-				this.showPlan = false
-				
-			},
-			closeMask(e) {
-				this.showPlan = false
-			},
-			//鑾峰彇妯″叿鐐规瑙勭▼鍒楄〃鏁版嵁
-			getHMouldMaintainRuleInterList() {
-				uni.request({
-					url: this.serverUrl + '/Sc_MouldDotCheckRuleBill/Sc_MouldDotCheckRuleList',
-					data: {
-						sWhere: '',
-						user: uni.getStorageSync('HUserName')
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HMouldMaintainRuleInterNoList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHMouldMaintainRuleInterNo[i] = res.data.data[i].鍗曟嵁鍙�
-							}
-							this.$forceUpdate();
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨妯″叿鐐规瑙勭▼
-			HMouldMaintainRuleInterNoChange(e) {
-				for (var i = 0; i < this.HMouldMaintainRuleInterNoList.length; i++) {
-					if (this.HMouldMaintainRuleInterNoList[i].鍗曟嵁鍙� == e) {
-						this.hform.HMouldDotCheckRuleID = this.HMouldMaintainRuleInterNoList[i].hmainid
-						this.hform.HMouldDotCheckRuleNo = this.HMouldMaintainRuleInterNoList[i].鍗曟嵁鍙�
-						//瀛愯〃
-						uni.request({
-							url: this.serverUrl +
-								'/Sc_MouldMaintainRuleBill/GetMouldRuleSubList-Detail',
-							data: {
-								HInterID: this.hform.HMouldDotCheckRuleID,
-								HBillType: '3821'
-							},
-							success: (res) => {
-								if (res.data.count == 1) {
-									this.form1List = res.data.list[0];
-									console.log(2, res.data.list[0]);
-								} else {
-									uni.showToast({
-										title: res.data.Message,
-										icon: 'none'
-									})
-								}
-							},
-							fail: (res) => {
-								console.log(res);
-								uni.showToast({
-									title: '鎺ュ彛璇锋眰澶辫触',
-									icon: 'none'
-								})
-							},
-						});
-					}
-				}
-			},
-
-			hformList(e) {
-				console.log(e)
-				this.form1List = e
-				this.showMask = false
-			},
-
-			//缂栬緫
-			getEditData(hmainid) {
-				//涓昏〃
-				uni.request({
-					url: this.serverUrl + '/Sc_MouldDotCheckBill/Sc_MouldDotCheckBillListCheckDetai',
-					data: {
-						HID: hmainid
-					},
-					success: (res) => {
-						console.log(1, res.data.data.h_v_Sc_MouldDotCheckBillMain_Edit);
-						if (res.data.code == 1) {
-							var data = res.data.data.h_v_Sc_MouldDotCheckBillMain_Edit[0]
-							this.hform = {
-								HInterID: hmainid,
-								HBillNo: data.鍗曟嵁鍙�,
-								HDate: data.鏃ユ湡.substr(0, 10),
-								HInnerBillNo: data.鍐呴儴鍗曟嵁鍙�,
-								HMouldID: data.HMouldID,
-								HMouldNumber: data.浜у搧妯″叿浠g爜,
-								HMouldName: data.浜у搧妯″叿,
-								HPlanNo: data.鐐规璁″垝缂栧彿,
-								HPlanName: data.鐐规璁″垝缂栧彿,
-								HPlanInterID: data.HPlanInterID,
-								HBeginDate: data.鐐规寮�濮嬫棩鏈�.substr(0, 10),
-								HEndDate: data.鐐规缁撴潫鏃ユ湡.substr(0, 10),
-								HShiftsID: data.HShiftsID ,
-								HShiftsName: data.鐝鍚嶇О,
-								HLastResult: data.鏈�缁堢粨璁� === '鍚堟牸',
-								HMouldDotCheckRuleID: data.HMouldDotCheckRuleID,
-								HMouldDotCheckRuleNo: data.鍣ㄥ叿鐐规瑙勭▼鍗曟嵁鍙�,
-								HErrNote: data.寮傚父鎯呭喌璁板綍,
-								HBigSafeNote: data.閲嶅ぇ瀹夊叏闅愭偅璁板綍,
-								HExplanation: data.鎽樿,
-								HRemark: data.澶囨敞,
-
-								HMaker: data.鍒跺崟浜�,
-								HMakeDate: data.鍒跺崟鏃ユ湡,
-								HUpDater: data.淇敼浜�,
-								HUpDateDate: data.淇敼鏃ユ湡,
-								HChecker: data.瀹℃牳浜�,
-								HCheckDate: data.瀹℃牳鏃ユ湡,
-								HDeleteMan: data.浣滃簾浜�,
-								HDeleteDate: data.浣滃簾鏃ユ湡,
-							}
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-				//瀛愯〃
-				uni.request({
-					url: this.serverUrl + '/Sc_MouldDotCheckBill/Sc_MouldDotCheckBillListProjectDetai',
-					data: {
-						sqlWhere: 'and HInterID=' + hmainid
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.form1List = res.data.list[0];
-							console.log(2, res.data.list[0]);
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//鏂板
-			getNewData() {
-				uni.request({
-					url: this.serverUrl + '/Web/GetMAXNum',
-					data: {
-						HBillType: '3821'
-					},
-					success: (res) => {
-						console.log(res.data)
-						if (res.data.count == 1) {
-							this.hform.HInterID = 0
-							this.hform.HBillNo = res.data.data[0].HBillNo
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-
-			submit() {
-				if (!this.hform.HDate) {
-					uni.showToast({
-						title: '璇烽�夋嫨鏃ユ湡',
-						icon: 'none'
-					})
-				} else if (!this.hform.HMouldID) {
-					uni.showToast({
-						title: '璇烽�夋嫨妯″叿',
-						icon: 'none'
-					})
-				} else if (!this.hform.HBeginDate) {
-					uni.showToast({
-						title: '璇烽�夋嫨鐐规寮�濮嬫棩鏈�',
-						icon: 'none'
-					})
-				} else if (!this.hform.HEndDate) {
-					uni.showToast({
-						title: '璇烽�夋嫨鐐规缁撴潫鏃ユ湡',
-						icon: 'none'
-					})
-				} else if (!this.hform.HMouldDotCheckRuleID) {
-					uni.showToast({
-						title: '璇烽�夋嫨妯″叿鐐规瑙勭▼',
-						icon: 'none'
-					})
-				} else if (this.form1List.length == 0) {
-					uni.showToast({
-						title: '璇锋柊澧炵偣妫�椤逛俊鎭紝鐐规椤逛笉鍙负绌�',
-						icon: 'none'
-					})
-				} else {
-					uni.showLoading({
-						title: '璇风◢鍊�'
-					})
-					var sMainStr = JSON.stringify(this.hform);
-					var sSubStr = JSON.stringify(this.form1List);
-					var sMainSub = sMainStr + ';' + sSubStr + ";" + uni.getStorageSync('HUserName');
-					console.log(sMainSub);
-					uni.request({
-						url: this.serverUrl + '/Sc_MouldDotCheckBill/SaveGetMouldDotCheckBillList',
-						method: 'POST',
-						dataType: "json",
-						data: {
-							msg: sMainSub
-						},
-						success: (res) => {
-							console.log(1, res);
-							uni.hideLoading()
-							if (res.data.count == 1) {
-
-							}
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						},
-						fail: (res) => {
-							console.log(res);
-							uni.showToast({
-								title: '鎺ュ彛璇锋眰澶辫触',
-								icon: 'none'
-							})
-						},
-					});
-				}
-			},
-			goBack() {
-				uni.navigateBack()
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.form {
-		width: 668rpx;
-		margin: 20rpx auto;
-		padding-bottom: 240rpx;
-	}
-
-	.tab_area {
-		width: 100%;
-		height: 50rpx;
-	}
-
-	.form-item {
-		display: flex;
-		align-items: center;
-		font-size: 30rpx;
-		padding: 6rpx 0;
-
-		.title {
-			width: 208rpx;
-		}
-
-		.right {
-			width: 450rpx;
-			border-radius: 22rpx;
-			border: 1px solid #acacac;
-		}
-
-		.righton {
-			width: 450rpx;
-			border-radius: 22rpx;
-			border: 1px solid #e4e4e4;
-			background-color: #e4e4e4;
-		}
-
-		text {
-			color: red;
-			font-weight: bold;
-		}
-
-		input {
-			width: 100%;
-			padding: 8rpx 20rpx;
-			font-size: 30rpx;
-		}
-
-		textarea {
-			width: 98%;
-			padding: 8rpx 20rpx;
-			font-size: 30rpx;
-		}
-
-		.tip {
-			color: #da9100;
-			margin-top: 20rpx;
-		}
-	}
-
-	.other {
-		margin-top: 8rpx;
-		text-align: center;
-		font-size: 28rpx;
-		padding: 4rpx 18rpx;
-		color: #1890FF;
-	}
-
-	.bottom-btn {
-		width: 100%;
-		// height: 120rpx;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		background-color: #fff;
-		box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
-		padding: 30rpx 40rpx 40rpx 40rpx;
-
-		button {
-			border-radius: 50rpx;
-			width: 180rpx;
-			height: 66rpx;
-			line-height: 66rpx;
-			font-size: 28rpx;
-		}
-
-		.btn-a {
-			background-color: #3A78FF;
-			color: #fff;
-		}
-
-		.btn-b {
-			background-color: #41a863;
-			color: #fff;
-			margin-left: 30rpx;
-		}
-
-		.btn-c {
-			background-color: #acacac;
-			color: #fff;
-			position: absolute;
-			right: 120rpx;
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujudianjianjiludan/formDetail.vue b/pages/MJGL/mujudianjianjiludan/formDetail.vue
deleted file mode 100644
index 57ca5a0..0000000
--- a/pages/MJGL/mujudianjianjiludan/formDetail.vue
+++ /dev/null
@@ -1,463 +0,0 @@
-<template>
-	<view class="content">
-		<view class="mains" v-if="num==1">
-			<!-- 鐐规椤逛俊鎭儴鍒嗕繚鎸佷笉鍙� -->
-			<view class="title">鐐规椤逛俊鎭�</view>
-			<view class="table">
-				<uni-collapse accordion>
-					<uni-collapse-item v-for="(item,index) in hformList" :key="index">
-						<template v-slot:title>
-							<view class="table-line">
-								<view class="line">
-									<view class="font">
-										<text>鐐规椤圭洰锛�</text>{{item.HDotCheckItem}}
-									</view>
-									<view>
-										<text>鐐规閮ㄤ綅锛�</text>{{item.HDotCheckPart}}
-									</view>
-								</view>
-								<view class="line">
-									<text>璐熻矗浜猴細</text>{{item.HManagerName}}
-								</view>
-							</view>
-						</template>
-						<view class="table-detail">
-							<view class="detail">
-								<text>鍏蜂綋瑕佹眰锛�</text>{{item.HClaim?item.HClaim:'鏆傛棤鍏蜂綋瑕佹眰'}}
-							</view>
-							<view class="detail">
-								<text>鏄惁鍚堟牸锛�</text>{{ item.HDotCheckResult ? '鍚堟牸' : '涓嶅悎鏍�' }}
-							</view>
-							<view class="detail" v-if="item.HRemark">
-								<text>澶囨敞锛�</text>{{item.HRemark}}
-							</view>
-							<view class="btns">
-								<button class="btnd" size="mini" @tap="edit(index)">缂栬緫</button>
-								<button class="btne" size="mini" @tap="del(index)">鍒犻櫎</button>
-							</view>
-						</view>
-					</uni-collapse-item>
-				</uni-collapse>
-			</view>
-			<view class="foot">
-				<button class="btna" size="mini" @tap="creat">鏂板</button>
-				<button class="btnb" size="mini" @tap="over">纭</button>
-			</view>
-		</view>
-
-		<view class="mains" v-if="num == 2">
-			<view class="title">鐐规椤圭紪杈�</view>
-			<view class="form">
-				<view class="form-item">
-					<view class="item-title">鐐规椤圭洰:</view>
-					<view class="item-right">
-						<uni-combox :candidates="arrayHDotCheckItem" placeholder="璇烽�夋嫨鐐规椤圭洰" v-model="hform.HDotCheckItem"
-							@input="HDotCheckItemInput"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="item-title">鐐规閮ㄤ綅:</view>
-					<view class="item-right">
-						<input v-model="hform.HDotCheckPart" placeholder="璇疯緭鍏ョ偣妫�閮ㄤ綅" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="item-title">璐熻矗浜�:</view>
-					<view class="item-right">
-						<uni-combox :candidates="arrayHManagerName" placeholder="璇烽�夋嫨璐熻矗浜�" v-model="hform.HManagerName"
-							@input="HManagerNameInput"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item" style="align-items: flex-start;">
-					<view class="item-title">鍏蜂綋瑕佹眰:</view>
-					<view class="item-right" style="min-height: 150rpx;">
-						<textarea v-model="hform.HClaim" auto-height maxlength="-1" placeholder="璇疯緭鍏ュ叿浣撹姹�"></textarea>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="item-title">缁撴灉:</view>
-					<view class="right" style="display: flex; align-items: center; padding: 0 20rpx; border: none;">
-						<view style="display: flex; align-items: center;">
-							<checkbox-group @change="onResultChange">
-							  <checkbox :value="'true'" :checked="hform.HDotCheckResult"></checkbox>
-							</checkbox-group>
-							<text style="margin-left: 10rpx;">鍚堟牸</text>
-						</view>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="item-title">澶囨敞:</view>
-					<view class="item-right">
-						<input v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
-					</view>
-				</view>
-			</view>
-			<view class="foot">
-				<button class="btnc" size="mini" @tap="back">杩斿洖</button>
-				<button class="btnb" size="mini" @tap="add">纭</button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-				num: 1,
-				editIndex: -1,
-
-				HDotCheckItemList: [],
-				arrayHDotCheckItem: [],
-
-				HManagerNameList: [],
-				arrayHManagerName: [],
-
-				hformList: [],
-				hform: {},
-			}
-		},
-		props: {
-			form1List: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-		},
-		created() {
-			this.getHDotCheckItemList()
-			this.getHManagerNameList()
-			this.hformList = this.form1List
-		},
-		methods: {
-			// 鏂板锛氬鐞嗗閫夋鍙樺寲浜嬩欢
-			onResultChange(e) {
-				this.hform.HDotCheckResult = e.detail.value.includes('true');
-			},
-
-			//鐐规椤圭洰
-			getHDotCheckItemList() {
-				uni.request({
-					url: this.serverUrl + '/PublicPageMethod/MaintainList',
-					data: {
-						sWhere: "where HStopFlag=0 and HEndFlag=1"
-					},
-					success: (res) => {
-						console.log(1, res.data.data);
-						if (res.data.count == 1) {
-							this.HDotCheckItemList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHDotCheckItem[i] = res.data.data[i].HName
-							}
-							this.$forceUpdate();
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			HDotCheckItemInput(e) {
-				console.log(e)
-				for (var i = 0; i < this.HDotCheckItemList.length; i++) {
-					if (this.HDotCheckItemList[i].HName == e) {
-						this.hform.HDotCheckItemID = this.HDotCheckItemList[i].HItemID
-						this.hform.HDotCheckItemNumber = this.HDotCheckItemList[i].HNumber
-						this.hform.HDotCheckItem = this.HDotCheckItemList[i].HName
-					}
-				}
-			},
-
-			//璐熻矗浜�
-			getHManagerNameList() {
-				uni.request({
-					url: this.serverUrl + '/PublicPageMethod/UserList',
-					data: {
-						sWhere: ''
-					},
-					success: (res) => {
-						console.log(2, res.data.data);
-						if (res.data.count == 1) {
-							this.HManagerNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHManagerName[i] = res.data.data[i].HName
-							}
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			HManagerNameInput(e) {
-				console.log(e)
-				for (var i = 0; i < this.HManagerNameList.length; i++) {
-					if (this.HManagerNameList[i].HName == e) {
-						this.hform.HManagerID = this.HManagerNameList[i].HItemID
-						this.hform.HManagerNumber = this.HManagerNameList[i].HNumber
-						this.hform.HManagerName = this.HManagerNameList[i].HName
-					}
-				}
-			},
-
-			creat() {
-				this.hform = {
-						HDotCheckItemID: '',
-						HDotCheckItemNumber: '',
-						HDotCheckItem: '',
-						HDotCheckPart: '',
-						HClaim: '',
-						HManagerID: '',
-						HManagerNumber: '',
-						HManagerName: '',
-						HDotCheckResult: true, // 榛樿璁句负true锛屽嵆榛樿鍕鹃��
-						HRemark: '',
-					},
-					this.num = 2
-			},
-			back() {
-				this.hformList[this.editIndex] = uni.getStorageSync('hform')
-				uni.removeStorageSync('hform')
-				this.editIndex = -1
-				this.num = 1
-			},
-			edit(index) {
-				this.hform = this.hformList[index]
-				uni.setStorageSync('hform', this.hformList[index]);
-				this.editIndex = index
-				this.num = 2
-			},
-			del(index) {
-				this.hformList.splice(index, 1);
-			},
-			add() {
-				if (!this.hform.HDotCheckItemID) {
-					uni.showToast({
-						title: '璇烽�夋嫨鐐规椤圭洰淇℃伅',
-						icon: 'none'
-					})
-				} else if (!this.hform.HDotCheckPart) {
-					uni.showToast({
-						title: '璇疯緭鍏ョ偣妫�閮ㄤ綅淇℃伅',
-						icon: 'none'
-					})
-				} else if (!this.hform.HManagerID) {
-					uni.showToast({
-						title: '璇烽�夋嫨璐熻矗浜�',
-						icon: 'none'
-					})
-				} else {
-					uni.showModal({
-						title: '鎻愮ず',
-						content: '鏄惁纭鎻愪氦鐐规椤圭洰鍐呭锛屾槸鐨勮瘽灏嗘坊鍔犲埌鐐规椤逛俊鎭腑銆�',
-						success: (res) => {
-							if (res.confirm) {
-								if (this.editIndex > -1) {
-									this.hformList.splice(this.editIndex, 1);
-									this.editIndex = -1
-
-									uni.showToast({
-										title: '淇敼瀹屾垚',
-										icon: 'none'
-									})
-								}
-								this.num = 1
-								this.hformList.unshift(this.hform)
-							}
-						}
-					});
-				}
-			},
-
-			over() {
-				this.$emit('hformList', this.hformList)
-			},
-		}
-	}
-</script>
-
-<!-- 鏍峰紡閮ㄥ垎淇濇寔涓嶅彉 -->
-<style lang="scss" scoped>
-	.content {
-		width: 100%;
-		height: 100%;
-		position: fixed;
-		z-index: 999;
-		top: 0;
-		left: 0;
-		background-color: rgba(0, 0, 0, 0.5);
-	}
-
-	.mains {
-		width: 88%;
-		height: 88%;
-		background-color: #f5f5f5;
-		margin: 12% auto;
-		border-radius: 14rpx;
-
-		.title {
-			width: 100%;
-			height: 6%;
-			background-color: #fff;
-			border-bottom: 1px solid #acacac;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			border-radius: 14rpx 14rpx 0 0;
-		}
-
-		.foot {
-			padding: 0 40rpx;
-			height: 8%;
-			background-color: #fff;
-			border-top: 1px solid #eee;
-			display: flex;
-			align-items: center;
-			border-radius: 0 0 14rpx 14rpx;
-
-			button {
-				width: 180rpx;
-			}
-		}
-
-		.table {
-			width: 100%;
-			height: 86%;
-			overflow: hidden;
-			overflow-y: auto;
-
-			.table-line {
-				padding: 18rpx 10rpx 18rpx 20rpx;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-
-				.line {
-					font-size: 30rpx;
-					color: #555;
-
-					text {
-						color: #999;
-						font-size: 27rpx;
-					}
-
-					.font {
-						color: #333;
-						line-height: 150%;
-					}
-				}
-			}
-
-			.table-detail {
-				font-size: 30rpx;
-				color: #555;
-				padding: 0 10rpx 24rpx 20rpx;
-
-				text {
-					color: #999;
-					font-size: 27rpx;
-				}
-
-				.detail {}
-
-				.btns {
-					text-align: right;
-					margin-top: 14rpx;
-
-					button {
-						width: 150rpx;
-						margin-right: 30rpx;
-					}
-				}
-			}
-		}
-
-		.form {
-			height: 82%;
-			padding: 4%;
-			overflow: hidden;
-			overflow-y: auto;
-
-			.form-item {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				font-size: 30rpx;
-				padding: 10rpx 0;
-
-				.item-title {
-					width: 140rpx;
-
-					text {
-						color: red;
-						font-weight: bold;
-					}
-				}
-
-				.item-right {
-					width: 450rpx;
-					border-radius: 22rpx;
-					border: 1px solid #acacac;
-					background-color: #fff;
-				}
-
-				input {
-					width: 100%;
-					padding: 8rpx 20rpx;
-					font-size: 30rpx;
-				}
-
-				textarea {
-					width: 98%;
-					padding: 8rpx 20rpx;
-					font-size: 30rpx;
-				}
-			}
-		}
-	}
-
-	.btna {
-		background-color: #41a863;
-		color: #fff;
-	}
-
-	.btnb {
-		background-color: #3A78FF;
-		color: #fff;
-	}
-
-	.btnc {
-		background-color: #acacac;
-		color: #fff;
-	}
-
-	.btnd {
-		background-color: #d98d00;
-		color: #fff;
-	}
-
-	.btne {
-		background-color: #da0000;
-		color: #fff;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujudianjianjiludan/plan.vue b/pages/MJGL/mujudianjianjiludan/plan.vue
deleted file mode 100644
index ea70ba8..0000000
--- a/pages/MJGL/mujudianjianjiludan/plan.vue
+++ /dev/null
@@ -1,351 +0,0 @@
-<template>
-	<view class="content">
-		<view class="form">
-			<view class="form-item">
-				<view class="title">鍗曟嵁鍙�:</view>
-				<view class="right">
-					<input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鍒跺崟浜�:</view>
-				<view class="right">
-					<input v-model="hform.HCreateBy" placeholder="璇疯緭鍏ュ埗鍗曚汉" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">寮�濮嬫椂闂�:</view>
-				<view class="right">
-					<picker mode="date" :value="hform.BenginHCreateDate" @change="BenginHCreateDateChange">
-						<input name="BenginHCreateDate" disabled :value="hform.BenginHCreateDate" placeholder="璇烽�夋嫨" />
-					</picker>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">缁撴潫鏃堕棿:</view>
-				<view class="right">
-					<picker mode="date" :value="hform.EndHCreateDate" @change="EndHCreateDateChange">
-						<input name="EndHCreateDate" disabled :value="hform.EndHCreateDate" placeholder="璇烽�夋嫨" />
-					</picker>
-				</view>
-			</view>
-			
-			<view class="buttons">
-				<button class="op5" size="mini" type="default" @tap="clear">閲嶇疆</button>
-				<button class="op3" size="mini" type="default" @tap="search">鏌ヨ</button>
-				<button class="op4" size="mini" type="default" @tap="close">鍏抽棴</button>
-			</view>
-		</view>
-		
-		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
-		
-		<view class="list" v-for="(item,index) in listData" :key="index">
-			<uni-card :title="item.浜у搧妯″叿" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
-				<view class="card-detail">
-					<view class="detail" v-if="item.浜у搧妯″叿浠g爜">
-						<text>浜у搧妯″叿浠g爜锛�</text>{{item.浜у搧妯″叿浠g爜}}
-					</view>
-					<view class="detail" v-if="item.鍐呴儴鍗曟嵁鍙�">
-						<text>鍐呴儴鍗曟嵁鍙凤細</text>{{item.鍐呴儴鍗曟嵁鍙穧}
-					</view>
-					<view class="detail" v-if="item.寮�濮嬫棩鏈�">
-						<text>寮�濮嬫棩鏈燂細</text>{{item.寮�濮嬫棩鏈�.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.缁撴潫鏃ユ湡">
-						<text>缁撴潫鏃ユ湡锛�</text>{{item.缁撴潫鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.淇濆吇鍛ㄦ湡">
-						<text>淇濆吇鍛ㄦ湡(鍗曚綅)锛�</text>{{item.淇濆吇鍛ㄦ湡}}({{item.鍛ㄦ湡鍗曚綅}})
-					</view>
-					<view class="detail" v-if="item.澶囨敞">
-						<text>澶囨敞锛�</text>{{item.澶囨敞}}
-					</view>
-				</view>
-				<view class="card-detail" v-if="showDetail == index">
-					<view class="detail" v-if="item.鍒跺崟浜�">
-						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
-					</view>
-					<view class="detail" v-if="item.鍒跺崟鏃ユ湡">
-						<text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.瀹℃牳浜�">
-						<text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
-					</view>
-					<view class="detail" v-if="item.瀹℃牳鏃ユ湡">
-						<text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.淇敼浜�">
-						<text>淇敼浜猴細</text>{{item.淇敼浜簘}
-					</view>
-					<view class="detail" v-if="item.淇敼鏃ユ湡">
-						<text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.鍏抽棴浜�">
-						<text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
-					</view>
-					<view class="detail" v-if="item.鍏抽棴鏃ユ湡">
-						<text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
-					</view>
-				</view>
-				
-				<view class="more" v-if="showDetail == index">
-					<view class="part" style="border-right: 1px solid #eee;">
-						<uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
-					</view>
-					<view class="part" @tap.stop="choose(item)">
-						<uni-icons type="checkmarkempty" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>閫夊彇璇ユ暟鎹�
-					</view>
-				</view>
-				<view class="more" v-if="showDetail != index">
-					<view class="part" style="border-right: 1px solid #eee;">
-						<uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
-					</view>
-					<view class="part" @tap.stop="choose(item)">
-						<uni-icons type="checkmarkempty" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>閫夊彇璇ユ暟鎹�
-					</view>
-				</view>
-			</uni-card>
-		</view>
-		
-		<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
-		<view class="over" v-if="listData.length != 0">宸插埌搴�</view>
-	</view>
-</template>
-
-<script>
-	import { getUserInfo } from "@/utils/auth.js";
-	export default {
-	    data() {
-	        return {
-				userInfo:getUserInfo(),
-				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
-				hform:{
-					HBillNo:'',
-					HCreateBy:'',
-					BenginHCreateDate:'',
-					EndHCreateDate:'',
-				},
-				sWhere:'',
-				listData:[],
-				showDetail:-1,
-	        }
-	    },
-		created() {
-			this.getList()
-			console.log(this.userInfo,uni.getStorageSync('HUserName'))
-		},
-	    methods: {
-			getList(){
-				// console.log(this.sWhere)
-				uni.showLoading({
-					title:'鍔犺浇涓�...'
-				})
-				uni.request({
-				    url: this.serverUrl + '/Sc_MouldDotCheckPlanBill/GetMouldDotCheckPlanBillList',
-					data:{ 
-						sWhere: this.sWhere,
-						user: uni.getStorageSync('HUserName')
-					},
-				    success: (res) => {
-				        console.log(1,res);
-						if(res.data.count == 1){
-							this.listData = res.data.data
-							uni.hideLoading()
-						}else{
-							uni.hideLoading()
-							uni.showToast({
-								title:res.data.Message,
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.hideLoading()
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨鍗曟嵁鏃ユ湡
-			BenginHCreateDateChange(e){
-				console.log(e.detail.value)
-				this.hform.BenginHCreateDate = e.detail.value
-			},
-			//閫夋嫨鍗曟嵁鏃ユ湡
-			EndHCreateDateChange(e){
-				console.log(e.detail.value)
-				this.hform.EndHCreateDate = e.detail.value
-			},
-			search(){
-				this.sWhere = ''
-				
-				console.log(this.hform)
-				if (this.hform.HBillNo) {
-				    this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
-				}
-				if (this.hform.HCreateBy) {
-				    this.sWhere += " and 鍒跺崟浜� like '%" + this.hform.HCreateBy + "%'";
-				}
-				if (this.hform.BenginHCreateDate) {
-				    this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
-				}
-				if (this.hform.EndHCreateDate) {
-				    this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
-				}
-				
-				this.getList()
-			},
-			clear(){
-				this.sWhere = ''
-				this.showDetail = -1,
-				this.hform = {
-					HBillNo:'',
-					HCreateBy:'',
-					BenginHCreateDate:'',
-					EndHCreateDate:'',
-				}
-				this.getList()
-			},
-			choose(item){
-				console.log(item)
-				var data = {
-					HPlanName:item.鍗曟嵁鍙�,
-					HPlanNo:item.hmainid,
-					HInterID:item.hmainid,
-				}
-				this.$emit('planData', data)
-			},
-			close(){
-				this.$emit('close',true)
-			},
-	    }
-	}
-</script>
-
-<style lang="scss" scoped>
-	.content{
-		width: 100%;
-		height: 100%;
-		background-color: #fff;
-		overflow: hidden;
-		overflow-y: auto;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 99;
-	}
-	.form{
-		width: 640rpx;
-		margin: 20rpx auto;
-	}
-    .form-item{
-		display: flex;
-		align-items: center;
-		font-size: 28rpx;
-		padding: 6rpx 0;
-		.title{
-			width: 180rpx;
-			text{
-				color: red;
-				font-weight: bold;
-			}
-		}
-		.right{
-			width: 450rpx;
-			border-radius: 22rpx;
-			border: 1px solid #acacac;
-		}
-		.righton{
-			width: 450rpx;
-			border-radius: 22rpx;
-			border: 1px solid #e4e4e4;
-			background-color: #e4e4e4;
-		}
-		input{
-			width: 100%;
-			padding: 8rpx 20rpx;
-			font-size: 30rpx;
-		}
-	}
-	.buttons{
-		width: 100%;
-		display: flex;
-		justify-content: center;
-		margin-top: 20rpx;
-		button{
-			border-radius: 50rpx;
-			width: 180rpx;
-			height: 66rpx;
-			line-height: 66rpx;
-			font-size: 28rpx;
-			color: #fff;
-		}
-	}
-	
-	.list{
-		width: 100%;
-		.card-detail{
-			width: 100%;
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-			line-height: 120%;
-			.detail{
-				// width: 50%;
-				font-size: 26rpx;
-				margin-bottom: 12rpx;
-				color: #555;
-				margin-right: 20rpx;
-				text{
-					color: #999;
-					font-size: 26rpx;
-				}
-			}
-		}
-		.more{
-			color: #888;
-			font-size: 24rpx;
-			display: flex;
-			border-top: 1px solid #eee;
-			padding-top: 20rpx;
-			.part{
-				width: 50%;
-				text-align: center;
-			}
-		}
-		.op{
-			display: flex;
-			justify-content: space-around;
-			margin-top: 20rpx;
-			button{
-				padding: 0;
-				width: 130rpx;
-				font-size: 25rpx;
-			}
-		}
-	}
-
-	.op1{
-		border: 1px solid #41a863;
-		background-color: #41a863;
-	}
-	.op2{
-		border: 1px solid #d98d00;
-		background-color: #d98d00;
-	}
-	.op3{
-		border: 1px solid #3a78ff;
-		background-color: #3a78ff;
-	}
-	.op4{
-		border: 1px solid #da0000;
-		background-color: #da0000;
-	}
-	.op5{
-		border: 1px solid #888;
-		background-color: #888;
-	}
-</style>
diff --git a/pages/MJGL/style/MJBillStyle.scss b/pages/MJGL/style/MJBillStyle.scss
index 53775e9..21ebdbb 100644
--- a/pages/MJGL/style/MJBillStyle.scss
+++ b/pages/MJGL/style/MJBillStyle.scss
@@ -86,7 +86,13 @@
         }
     }
     
-
+    .required::after{
+          content: "*";
+          color: red;
+          margin-left: 4px; 
+          font-weight: bold;
+    }
+    
     .right {
         // width: 450rpx;
         flex: 1;
@@ -119,6 +125,7 @@
 
     textarea {
         width: 98%;
+        height: 6em;
         padding: 8rpx 20rpx;
         font-size: 30rpx;
     }
@@ -261,4 +268,43 @@
         justify-content: flex-start;
         gap: 6rpx;
 
+    }
+    
+    .card-buttons {
+        padding: 8rpx;
+        display: flex;
+        flex-direction: row;
+        gap: 20rpx;
+        justify-content: center;
+        align-items: flex-start;
+        
+        button {
+            border-radius: 10rpx;
+            width: 180rpx;
+            height: 66rpx;
+            line-height: 66rpx;
+            font-size: 28rpx;
+        }
+        .btn-a {
+            background-color: #3a78ff;
+            color: #fff;
+        }
+        .btn-b {
+            background-color: #41a863;
+            color: #fff;
+        }
+        .btn-c {
+            background-color: #acacac;
+            color: #fff;
+            // position: absolute;
+            // right: 120rpx;
+        }
+        .btn-d {
+            background-color: #ff8901;
+            color: #fff;
+        }
+        
+        .placeholder {
+            flex: 1
+        }
     }
\ No newline at end of file
diff --git a/pages/MJGL/style/MJListStyle.scss b/pages/MJGL/style/MJListStyle.scss
index e69de29..f27e690 100644
--- a/pages/MJGL/style/MJListStyle.scss
+++ b/pages/MJGL/style/MJListStyle.scss
@@ -0,0 +1,193 @@
+	.form {
+		padding: 20rpx;
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+	}
+    
+    .other {
+    	margin-top: 8rpx;
+    	text-align: center;
+    	font-size: 28rpx;
+    	padding: 4rpx 18rpx;
+    	color: #1890FF;
+    }
+
+	.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;
+				color: #555;
+                padding-bottom: 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;
+			}
+		}
+        
+        .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;
+            }
+        }
+	}
+    
+    .pagination-zone {
+        position: fixed;
+        bottom: 0;
+        box-sizing: border-box;
+        background-color: #fff;
+        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+        padding: 20rpx 40rpx 20rpx 40rpx;
+        display: flex;
+        flex-direction: column;
+        gap: 20rpx;
+        justify-content: space-between;
+        width: 100%;
+    }
\ No newline at end of file
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue
new file mode 100644
index 0000000..5b4afdd
--- /dev/null
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue
@@ -0,0 +1,1043 @@
+<template>
+	<view>
+		<!-- 椤电鍖哄煙 -->
+		<view class="tabs" id="tabs">
+			<view class="tabs">
+				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鍏朵粬淇℃伅</view>
+				<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍒跺崟淇℃伅</view>
+			</view>
+		</view>
+		<!-- 鍩烘湰淇℃伅 -->
+		<template v-if="tabs == 0">
+			<view class="form" :style="{height: containerHeight + 'px',overflow: 'auto' }">
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input name="HBillNo" disabled v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HDate" disabled v-model="hform.HDate" placeholder="璇烽�夋嫨" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">涓婚:</view>
+					<view class="right">
+						<input name="HContext" v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
+					</view>
+				</view>
+				<view class="form-item" style="align-items: flex-start;">
+					<view class="title"><text>*</text>璇︾粏鍐呭:</view>
+					<view class="right" style="min-height: 150rpx;">
+						<textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1"
+							placeholder="璇疯緭鍏ヨ缁嗗唴瀹�"></textarea>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">寮傚父绫诲瀷:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="璇烽�夋嫨"
+							v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍙戦�侀儴闂�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+							@input="HDeptNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍙戦�佷汉:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鍙戦�佷汉" v-model="hform.HSendMan"
+							@input="HSendManChange"></uni-combox>
+					</view>
+				</view>
+
+				<view class="form-item">
+					<view class="title"><text>*</text>鎺ユ敹浜�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎺ユ敹浜�" v-model="hform.HReceiveMan"
+							@input="HReceiveManChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">澶勭悊浜�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨澶勭悊浜�" v-model="hform.HHandleEmpName"
+							@input="HHandleEmpNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">璐d换浜�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨璐d换浜�" v-model="hform.HBadProcManName"
+							@input="HBadProcManNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">闂鏉ユ簮:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHForm" placeholder="璇烽�夋嫨闂鏉ユ簮" v-model="hform.HForm"
+							@input="HFormChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐢熶骇璧勬簮:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨" v-model="hform.HSourceName"
+							@input="HSourceNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">杞﹂棿:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHCenterName" placeholder="璇烽�夋嫨" v-model="hform.HCenterName"
+							@input="HCenterNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浜у搧缂栫爜:</view>
+					<view class="right">
+						<input name="HMaterNumber" v-model="hform.HMaterNumber" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浜у搧鍚嶇О:</view>
+					<view class="right">
+						<input name="HMaterName" v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瑙勬牸鍨嬪彿:</view>
+					<view class="right">
+						<input name="HMaterModel" v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">娑夊強鏁伴噺:</view>
+					<view class="right">
+						<input name="HQty" type="number" v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐢熶骇鐝:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHShiftsName" placeholder="璇烽�夋嫨" v-model="hform.HShiftsName"
+							@input="HShiftsNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">褰卞搷闈㈢▼搴�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEffect" placeholder="璇烽�夋嫨褰卞搷闈㈢▼搴�" v-model="hform.HErrLev"
+							@input="HEffectChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">澶囨敞:</view>
+					<view class="right" style="min-height: 150rpx;">
+						<input name="HRemark"  v-model="hform.HRemark" placeholder="" />
+					</view>
+				</view>
+			</view>
+		</template>
+		<!-- 鍏朵粬淇℃伅 -->
+		<template v-if="tabs == 1">
+			<view class="form">
+				<view class="form-item">
+					<view class="title">鎺ユ敹閮ㄩ棬:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HRecDeptName"
+							@input="HRecDeptChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鎶勯�佷汉:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎶勯�佷汉" v-model="hform.HCopyMan"
+							@input="HCopyManChange" multiple></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">QE璐d换浜�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨QE璐d换浜�" v-model="hform.HQEManName"
+							@input="HQEManNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">绱ф�ョ▼搴�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHLevel" placeholder="璇烽�夋嫨绱ф�ョ▼搴�" v-model="hform.HLevel"
+							@input="HLevelChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍙戦�佺被鍨�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHSendType" placeholder="璇烽�夋嫨鍙戦�佺被鍨�" v-model="hform.HSendType"
+							@input="HSendTypeChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍌績娆℃暟:</view>
+					<view class="right">
+						<input name="HHasten" type="number" v-model="hform.HHasten" placeholder="璇疯緭鍏ュ偓淇冩鏁�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍙樺寲鐐�:</view>
+					<view class="right">
+						<input name="HChangeNote" v-model="hform.HChangeNote" placeholder="璇疯緭鍏ュ彉鍖栫偣" />
+					</view>
+				</view>
+
+				<view class="form-item">
+					<view class="title">鍗曟嵁绫诲瀷:</view>
+					<view class="righton">
+						<input name="HBillTypeName" disabled v-model="hform.HBillTypeName" placeholder="璇疯緭鍏ュ崟鎹被鍨�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙风爜:</view>
+					<view class="righton">
+						<input name="HPlanBillNo" disabled v-model="hform.HPlanBillNo" placeholder="璇疯緭鍏ュ崟鎹彿鐮�" />
+					</view>
+				</view>
+			</view>
+		</template>
+		<!-- 鍒跺崟淇℃伅 -->
+		<template v-if="tabs == 2">
+			<view class="form">
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HMaker" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HMakeDate" disabled v-model="hform.HMakeDate" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDater" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HUpDateDate" disabled v-model="hform.HUpDateDate" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HChecker" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HCheckDate" disabled v-model="hform.HCheckDate" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteMan" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HDeleteDate" disabled v-model="hform.HDeleteDate" placeholder="" />
+					</view>
+				</view>
+			</view>
+		</template>
+		<view class="buttons" id="buttons">
+			<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			<view style="flex: 1;"></view>
+			<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+			<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+		</view>
+	</view>
+</template>
+<script>
+	import dayjs from "dayjs";
+	import {CommonUtils} from "@/utils/common";
+	import getDateTime from '@/utils/getdateTime.js';
+	import {getUserInfo} from "../../../../utils/auth";
+	import "@/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss"
+	export default {
+		data() {
+			return {
+				tabs: 0,
+				tabsBottom: 0,
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				OperationType: 1,
+				refSav: "",
+
+				arrayHLevel: ['鏅��', '绱ф��'],
+				arrayHForm: ['浜�', '鏈�', '鏂�', '娉�', '鐜�', '娴�'],
+				arrayHEffect: ['鍋滅嚎', '鎵归噺涓嶈壇', '鍋跺彂涓嶈壇', '鏃犳硶鍒ゆ柇'],
+				arrayHSendType: ['鍏叡', '涓汉'],
+
+				// 浜哄憳鐩稿叧鏁扮粍
+				arrayHEmpName: [], // 鎺ユ敹浜� 鍙戦�佷汉 澶勭悊浜� 璐d换浜� 鎶勯�佷汉 QE璐d换浜�
+				HEmpNameList: [],
+
+
+				// 鍏朵粬鏁扮粍
+				arrayHDeptName: [], // 鎺ユ敹銆佸彂閫侀儴闂�
+				HDeptNameList: [],
+				arrayHErrMsgBackTypeName: [], // 寮傚父鍙嶉绫诲瀷
+				HErrMsgBackTypeNameList: [],
+				arrayHSourceName: [], //鐢熶骇璧勬簮
+				HSourceNameList: [],
+				arrayHCenterName: [], //宸ヤ綔涓績
+				HCenterNameList: [],
+				arrayHShiftsName: [], //鐢熶骇鐝
+				HShiftsNameList: [],
+
+				isEdit: false,
+
+				hform: {
+					HBillNo: '',
+					HInterID: '',
+					HDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+					HContext: '',
+					HDescription: '',
+					HRemark: '',
+
+					HErrMsgBackTypeName: '',
+					HErrMsgBackTypeID: '0',
+					HDeptName: getUserInfo().HDeptName,
+					HDeptID: getUserInfo().HDeptID,
+					HSendMan: getUserInfo().Czymc,
+					HReceiveMan: '',
+					HHandleEmpName: '',
+					HHandleEmpID: '0',
+					HCopyMan: '',
+					HBadProcManName: '',
+					HBadProcMan: '0',
+					HQEManName: '',
+					HQEMan: '0',
+					HRecDeptName: getUserInfo().HDeptName,
+					HRecDeptID: getUserInfo().HDeptID,
+
+					HLevel: '鏅��',
+					HBillTypeName: '',
+					HPlanBillNo: '',
+					HMaterNumber: '',
+					HMaterName: '',
+					HMaterModel: '',
+
+					// 鏂版坊鍔犵殑瀛楁
+					HHasten: 0, // 鍌績娆℃暟
+					HChangeNote: '', // 鍙樺寲鐐�
+					HShiftsName: '', // 鐢熶骇鐝
+					HShiftsID: '0', // 鐢熶骇鐝ID
+					HErrLev: '', // 褰卞搷闈㈢▼搴�
+					HForm: '浜�', // 闂鏉ユ簮
+					HSendType: '鍏叡', // 鍙戦�佺被鍨�
+					HReTransmitMan: '', // 杞彂鑷�
+					HSourceName: '', // 鐢熶骇璧勬簮
+					HSourceID: '0', // 鐢熶骇璧勬簮ID
+					HCenterName: '', // 杞﹂棿
+					HCenterID: '0', // 杞﹂棿ID
+					HQty: 0, // 鏁伴噺
+					HDeleteMan: '', // 浣滃簾浜�
+					HDeleteDate: '', // 浣滃簾鏃ユ湡
+
+					HMainSourceBillNo: '',
+					HMainSourceInterID: '0',
+					HMainSourceEntryID: '0',
+					HMainSourceBillType: '',
+
+					HMaker: getUserInfo().Czymc,
+					HMakeDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+					HUpDater: '',
+					HUpDateDate: '',
+					HChecker: '',
+					HCheckDate: '',
+				}
+			}
+		},
+		onLoad(e) {
+			this.getListData()
+			if (!e.OperationType) {
+				this.OperationType = 1
+			} else {
+				this.OperationType = e.OperationType
+			}
+
+			if (this.OperationType == 1) {
+				// 鏂板
+				this.getMaxNum()
+			} else if (this.OperationType == 2) {
+				// 鏈夋簮鍗�
+				this.getMaxNum()
+			} else if (this.OperationType == 3) {
+				// 缂栬緫
+				this.getEditData(e.hmainid)
+			} else if (this.OperationType == 4) {
+				// 娴忚
+			}
+		},
+		computed: {
+			containerHeight: {
+				get() {
+					return this.btnTop - this.tabsBottom - 5
+				}
+			}
+		},
+		onReady() {
+			const query = uni.createSelectorQuery().in(this)
+			query.select("#buttons")
+				.boundingClientRect()
+				.select("#tabs")
+				.boundingClientRect()
+				.exec(res => {
+					this.btnTop = Math.floor(res[0].top)
+					this.tabsBottom = Math.ceil(res[1].bottom)
+				})
+		},
+		methods: {
+			//閫夋嫨鍙戦�侀儴闂� 
+			HDeptNameChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HDeptID = this.HDeptNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨鎺ユ敹閮ㄩ棬
+			HRecDeptNameChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HRecDeptID = this.HDeptNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨寮傚父鍙嶉绫诲瀷
+			HErrMsgBackTypeNameChange(e) {
+				for (var i = 0; i < this.HErrMsgBackTypeNameList.length; i++) {
+					if (this.HErrMsgBackTypeNameList[i].寮傚父鍙嶉绫诲瀷鍚嶇О == e) {
+						this.hform.HErrMsgBackTypeName = this.HErrMsgBackTypeNameList[i].寮傚父鍙嶉绫诲瀷鍚嶇О;
+						this.hform.HErrMsgBackTypeID = this.HErrMsgBackTypeNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨鍙戦�佷汉
+			HSendManChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+
+					}
+				}
+			},
+			//閫夋嫨鎺ユ敹浜�
+			HReceiveManChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+
+					}
+				}
+			},
+			//閫夋嫨澶勭悊浜�
+			HHandleEmpNameChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HHandleEmpID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			//閫夋嫨鎶勯�佷汉
+			HCopyManChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+
+					}
+				}
+			},
+			//閫夋嫨鎶勯�佷汉
+			HBadProcManNameChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HBadProcMan = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			//閫夋嫨QE璐d换浜� 
+			HQEManNameChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HQEMan = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			//閫夋嫨鐢熶骇璧勬簮 
+			HSourceNameChange(e) {
+				for (var i = 0; i < this.HSourceNameList.length; i++) {
+					if (this.HSourceNameList[i].鐢熶骇璧勬簮 == e) {
+						this.hform.HSourceName = this.HSourceNameList[i].鐢熶骇璧勬簮;
+						this.hform.HSourceID = this.HSourceNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨杞﹂棿 
+			HCenterNameChange(e) {
+				for (var i = 0; i < this.HCenterNameList.length; i++) {
+					if (this.HCenterNameList[i].宸ヤ綔涓績 == e) {
+						this.hform.HCenterName = this.HCenterNameList[i].宸ヤ綔涓績;
+						this.hform.HCenterID = this.HCenterNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨鐢熶骇鐝 
+			HShiftsNameChange(e) {
+				for (var i = 0; i < this.HShiftsNameList.length; i++) {
+					if (this.HShiftsNameList[i].鐝鍚嶇О == e) {
+						this.hform.HShiftsName = this.HShiftsNameList[i].鐝鍚嶇О;
+						this.hform.HShiftsID = this.HShiftsNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+			// 闈欐�佷笅鎷夋閫夋嫨鏂规硶
+			HLevelChange(e) {
+				this.hform.HLevel = e;
+			},
+			HFormChange(e) {
+				this.hform.HForm = e;
+			},
+			HEffectChange(e) {
+				this.hform.HErrLev = e;
+			},
+			HSendTypeChange(e) {
+				this.hform.HSendType = e;
+			},
+			//鏂板鎸夐挳浜嬩欢
+			addNew() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛岀‘瀹氳鏂板鍚楋紵',
+					success: (res) => {
+						if (res.confirm) {
+							uni.redirectTo({
+								url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill?operationType=1'
+							})
+							// 閲嶆柊鑾峰彇鏈�澶у崟鎹彿
+							this.getMaxNum();
+							// 鍒囨崲鍒板熀鏈俊鎭〉绛�
+							this.tabs = 0;
+						}
+					}
+				});
+			},
+			// 鑾峰彇鎵�鏈夊垪琛ㄦ暟鎹�
+			async getListData() {
+				// 鑾峰彇閮ㄩ棬鍒楄〃
+				await this.getDepartmentList();
+				// 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
+				await this.getHErrMesTypeList();
+				// 鑾峰彇浜哄憳鍒楄〃锛堟帴鏀朵汉銆佸鐞嗕汉銆佹妱閫佷汉銆佽矗浠讳汉銆丵E璐d换浜猴級
+				await this.getPersonList();
+				// 鑾峰彇鐢熶骇璧勬簮鍒楄〃
+				await this.getSourceList();
+				// 鑾峰彇杞﹂棿鍒楄〃
+				await this.getCenterList();
+				// 鑾峰彇鐢熶骇鐝鍒楄〃
+				await this.getShiftsList();
+			},
+
+			// 鑾峰彇閮ㄩ棬鍒楄〃
+			getDepartmentList() {
+				return new Promise((resolve, reject) => {
+					uni.request({
+						url: this.serverUrl + '/Gy_Department/list',
+						data: {
+							sWhere: "",
+							user: uni.getStorageSync('HUserName'),
+							Organization: uni.getStorageSync('Organization')
+						},
+						success: (res) => {
+							if (res.data.count == 1) {
+								this.HDeptNameList = res.data.data
+								for (var i = 0; i < res.data.data.length; i++) {
+									this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+								}
+								this.$forceUpdate();
+								resolve();
+							} else {
+								uni.showToast({
+									title: '鑾峰彇閮ㄩ棬淇℃伅澶辫触',
+									icon: 'none'
+								})
+								reject();
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鑾峰彇閮ㄩ棬淇℃伅澶辫触',
+								icon: 'none'
+							})
+							reject();
+						},
+					});
+				});
+			},
+
+			// 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
+			getHErrMesTypeList() {
+				return new Promise((resolve, reject) => {
+					uni.request({
+						url: this.serverUrl + '/Web/GetGy_ErrMsgBackTypeList_Json',
+						data: {
+							ErrMsg: "",
+						},
+						success: (res) => {
+							if (res.data.count == 1) {
+								this.HErrMsgBackTypeNameList = res.data.data
+								for (var i = 0; i < res.data.data.length; i++) {
+									this.arrayHErrMsgBackTypeName[i] = res.data.data[i].寮傚父鍙嶉绫诲瀷鍚嶇О
+								}
+								this.$forceUpdate();
+								resolve();
+							} else {
+								uni.showToast({
+									title: '鑾峰彇寮傚父鍙嶉绫诲瀷淇℃伅澶辫触',
+									icon: 'none'
+								})
+								reject();
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鑾峰彇寮傚父鍙嶉绫诲瀷淇℃伅澶辫触',
+								icon: 'none'
+							})
+							reject();
+						},
+					});
+				});
+			},
+
+			// 鑾峰彇浜哄憳鍒楄〃锛堥�氱敤鏂规硶锛�
+			getPersonList() {
+				return new Promise((resolve, reject) => {
+					uni.request({
+						url: this.serverUrl + '/Web/GetEmployeeList_Json',
+						data: {
+							Employee: '',
+							HGroupID: 0
+						},
+						success: (res) => {
+							if (res.data.count == 1) {
+								this.HEmpNameList = res.data.data
+								for (var i = 0; i < res.data.data.length; i++) {
+									this.arrayHEmpName[i] = res.data.data[i].HName
+								}
+								this.$forceUpdate();
+								resolve(); // 鎴愬姛鏃秗esolve
+							} else {
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+								reject(res.data.Message); // 澶辫触鏃秗eject
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+							reject(res); // 澶辫触鏃秗eject
+						},
+					});
+				});
+			},
+
+			// 鑾峰彇鐢熶骇璧勬簮鍒楄〃
+			getSourceList() {
+				return new Promise((resolve, reject) => {
+					uni.request({
+						url: this.serverUrl + '/api/newBill/getSourceList',
+						data: {
+							sWhere: ""
+						},
+						success: (res) => {
+							if (res.data.code == 1) {
+								this.HSourceNameList = res.data.data.Gy_Source
+								for (var i = 0; i < res.data.data.Gy_Source.length; i++) {
+									this.arrayHSourceName[i] = res.data.data.Gy_Source[i].鐢熶骇璧勬簮
+								}
+								this.$forceUpdate();
+								resolve();
+							} else {
+								uni.showToast({
+									title: '鑾峰彇鐢熶骇璧勬簮鍒楄〃澶辫触',
+									icon: 'none'
+								})
+								reject();
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鑾峰彇鐢熶骇璧勬簮鍒楄〃澶辫触',
+								icon: 'none'
+							})
+							reject();
+						},
+					});
+				});
+			},
+
+			// 鑾峰彇宸ヤ綔涓績鍒楄〃
+			getCenterList() {
+				return new Promise((resolve, reject) => {
+					uni.request({
+						url: this.serverUrl + '/api/newBill/getWorkCenterList',
+						data: {
+							sWhere: ""
+						},
+						success: (res) => {
+							if (res.data.code == 1) {
+								this.HCenterNameList = res.data.data.Gy_WorkCenter
+								for (var i = 0; i < res.data.data.Gy_WorkCenter.length; i++) {
+									this.arrayHCenterName[i] = res.data.data.Gy_WorkCenter[i].宸ヤ綔涓績
+								}
+								this.$forceUpdate();
+								resolve();
+							} else {
+								uni.showToast({
+									title: '鑾峰彇杞﹂棿鍒楄〃澶辫触',
+									icon: 'none'
+								})
+								reject();
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鑾峰彇杞﹂棿鍒楄〃澶辫触',
+								icon: 'none'
+							})
+							reject();
+						},
+					});
+				});
+			},
+
+			// 鑾峰彇鐢熶骇鐝鍒楄〃
+			getShiftsList() {
+				return new Promise((resolve, reject) => {
+					uni.request({
+						url: this.serverUrl + '/Web/GetGy_ShiftsList_Json',
+						data: {
+							Shifts: ""
+						},
+						success: (res) => {
+							if (res.data.count == 1) {
+								this.HShiftsNameList = res.data.data
+								for (var i = 0; i < res.data.data.length; i++) {
+									this.arrayHShiftsName[i] = res.data.data[i].鐝鍚嶇О
+								}
+								this.$forceUpdate();
+								resolve();
+							} else {
+								uni.showToast({
+									title: '鑾峰彇鐢熶骇鐝鍒楄〃澶辫触',
+									icon: 'none'
+								})
+								reject();
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鑾峰彇鐢熶骇鐝鍒楄〃澶辫触',
+								icon: 'none'
+							})
+							reject();
+						},
+					});
+				});
+			},
+			//鏂板
+			getMaxNum() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetMAXNum',
+					data: {
+						HBillType: '4502'
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.hform.HInterID = res.data.data[0].HInterID
+							this.hform.HBillNo = res.data.data[0].HBillNo
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			
+			getEditData(HInterID) {
+			    uni.showLoading({
+			        title: '鍔犺浇涓�'
+			    });
+			    uni.request({
+			        url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_TransFerBillListCheckDetaiL_APP',
+			        data: {
+			            "HID": HInterID
+			        },
+			        success: (res) => {
+			            uni.hideLoading();
+			            console.log('缂栬緫鏁版嵁:', res);
+			            if (res.data.code == 1) {
+			                const data = res.data.data.OA_ErrMsgBackBillMain[0];
+			                
+			                // 鏄犲皠瀛楁鍒� Vue 涓殑 hform
+			                this.hform = {
+			                    ...this.hform, // 淇濈暀鍘熸湁鐨勯粯璁ゅ��
+			                    HInterID: data.HInterID,
+			                    HEntryID: data.HEntryID || '',
+			                    HBillNo: data.HBillNo || '',
+			                    HDate: data.HDate ? data.HDate.substr(0, 10) : dayjs(new Date()).format("YYYY-MM-DD"),
+			                    HErrMsgBackTypeName: data.HErrMsgBackTypeName || '',
+			                    HErrMsgBackTypeID: data.HErrMsgBackTypeID || '0',
+			                    HContext: data.HContext || '',
+			                    HSendMan: data.HSendMan || '',
+			                    HDeptID: data.HDeptID || '0',
+			                    HDeptName: data.HDeptName || '',
+			                    HRecDeptID: data.HRecDeptID || '0',
+			                    HRecDeptName: data.HRecDeptName || '',
+			                    HCenterID: data.HCenterID || '0',
+			                    HCenterName: data.HCenterName || '',
+			                    HReceiveMan: data.HReceiveMan || '',
+			                    HCopyMan: data.HCopyMan || '',
+			                    HMainSourceInterID: data.HSourceInterID || '0',
+			                    HMainSourceEntryID: data.HSourceEntryID || '0',
+			                    HMainSourceBillNo: data.HSourceBillNo || '',
+			                    HMainSourceBillType: data.HSourceBillType || '',
+			                    HHasten: data.HHasten || 0,
+			                    HMaterNumber: data.HMaterNumber || '',
+			                    HMaterName: data.HMaterName || '',
+			                    HHandleEmpID: data.HHandleEmpID || '0',
+			                    HHandleEmpName: data.HHandleEmpName || '',
+			                    HMaterModel: data.HMaterModel || '',
+			                    HQty: data.HQty || 0,
+			                    HForm: data.HForm || '浜�',
+			                    HChangeNote: data.HChangeNote || '',
+			                    HNote: data.HNote || '',
+			                    HBadProcMan: data.HBadProcMan || '0',
+			                    HBadProcManName: data.HBadProcManName || '',
+			                    HQEMan: data.HQEMan || '0',
+			                    HQEManName: data.HQEManName || '',
+			                    HSourceID: data.HSourceID || '0',
+			                    HSourceName: data.HSourceName || '',
+			                    HShiftsID: data.HShiftsID || '0',
+			                    HShiftsName: data.HShiftsName || '',
+			                    HDescription: data.HDescription || '',
+			                    HRemark: data.HRemark || '',
+			                    HLevel: data.HLevel || '鏅��',
+			                    HSendType: data.HSendType || '鍏叡',
+								HErrLev: data.HErrLev || '',
+								HMaker: data.HMaker || userInfo.Czymc || '',
+								HMakeDate: data.HMakeDate ? data.HMakeDate.substr(0, 10) : dayjs(new Date()).format("YYYY-MM-DD"),
+								HUpDater: uni.getStorageSync('HUserName') || userInfo.Czymc || '',
+								HUpDateDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+								HChecker: data.HChecker || '',
+								HCheckDate: data.HCheckDate ? data.HCheckDate.substr(0, 10) : '',
+								HCloseMan: data.HCloseMan || '',
+								HCloseDate: data.HCloseDate ? data.HCloseDate.substr(0, 10) : '',
+								HDeleteMan: data.HDeleteMan || '',
+								HDeleteDate: data.HDeleteDate ? data.HDeleteDate.substr(0, 10) : '',
+			                };
+			                
+			                // 璁剧疆鍒跺崟浜轰俊鎭紙濡傛灉涓虹┖鍒欎娇鐢ㄥ綋鍓嶇敤鎴凤級
+			                if (!this.hform.HMaker) {
+			                    this.hform.HMaker = getUserInfo().Czymc;
+			                }
+			                
+			                // 璁剧疆淇敼浜轰俊鎭�
+			                if (!this.hform.HUpDater) {
+			                    this.hform.HUpDater = uni.getStorageSync('HUserName') || '';
+			                }
+			                
+			                // 璁剧疆鍏朵粬瀛楁锛堝鏋滈渶瑕佸湪鐣岄潰涓婃樉绀猴級
+			                if (this.hform.HMainSourceBillNo) {
+			                    this.hform.HPlanBillNo = this.hform.HMainSourceBillNo;
+			                    this.hform.HBillTypeName = this.hform.HMainSourceBillType;
+			                }
+			                
+			                this.isEdit = true;
+			            } else {
+			                uni.showToast({
+			                    title: res.data.msg || '鑾峰彇缂栬緫鏁版嵁澶辫触',
+			                    icon: 'none'
+			                });
+			            }
+			        },
+			        fail: (res) => {
+			            uni.hideLoading();
+			            console.log('缂栬緫鏁版嵁璇锋眰澶辫触:', res);
+			            uni.showToast({
+			                title: '鎺ュ彛璇锋眰澶辫触',
+			                icon: 'none'
+			            });
+			        }
+			    });
+			},
+
+			submit() {
+				if (!this.hform.HReceiveMan) {
+					uni.showToast({
+						title: '璇烽�夋嫨鎺ユ敹浜�',
+						icon: 'none'
+					})
+				} else {
+					uni.showLoading({
+						title: '璇风◢鍊�'
+					})
+					if (this.OperationType == 1 || this.OperationType == 2 || this.OperationType == 4) {
+						this.refSav = "Add";
+					}
+					//鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+					if (this.OperationType == 3) {
+						this.refSav = "Update";
+						this.hform.HUpdater = getUserInfo().Czymc;
+						this.hform.HUpdaterDate = dayjs(new Date()).format("YYYY-MM-DD");
+					}
+					var sMainStr = JSON.stringify(this.hform);
+					var sMainSub = sMainStr + ';' + uni.getStorageSync('HUserName') + ';' + this.refSav
+					uni.request({
+						url: this.serverUrl + '/Sc_MESTransFerWorkBill/SaveGetMESTransFerWorkFrom_APP',
+						method: 'POST',
+						dataType: "json",
+						data: {
+							"msg": sMainSub
+						},
+						success: (res) => {
+							console.log(1, res);
+							uni.hideLoading()
+							if (res.data.count == 1) {
+								if (res.data.Verify == "Y") { //鑷姩瀹℃牳
+									this.SaveVerify(res.data.HInterID) //瀹℃牳
+								} else {
+									uni.showModal({
+										title: '鎻愮ず',
+										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+										success: (res) => {
+											if (res.confirm) {
+												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+												uni.redirectTo({
+													url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill?operationType=1'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 50)
+											}
+										}
+									});
+								}
+							}
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					});
+				}
+			},
+
+			SaveVerify(HInterID) {
+				var datas = {
+					HInterID: HInterID,
+					IsAudit: 0,
+					CurUserName: getUserInfo().Czymc
+				}
+				uni.request({
+					url: this.serverUrl + '/Sc_MESTransFerWorkBill/AuditTransFerReportList',
+					method: 'GET',
+					dataType: "json",
+					async: true,
+					data: datas,
+					success: (res) => {
+						uni.showModal({
+							title: '鎻愮ず',
+							content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+							success: (res) => {
+								if (res.confirm) {
+									console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+									uni.redirectTo({
+										url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill?operationType=1'
+									})
+								} else if (res.cancel) {
+									console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+									setTimeout(() => {
+										uni.navigateBack();
+									}, 50)
+								}
+							}
+						});
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			goBack() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBillList.vue
similarity index 87%
copy from pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue
copy to pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBillList.vue
index 19b1b9a..cf0fd54 100644
--- a/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBillList.vue
@@ -49,27 +49,40 @@
 		</view>
 		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
 		<scroll-view id="pageContent" scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
-			<view v-for="(item,index) in listData" :key="index">
-				<uni-card :title="item.浜у搧妯″叿" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+			<view class="list" v-for="(item,index) in listData" :key="index">
+				<uni-card :title="item.鍗曟嵁鐘舵��" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
 					@tap="showDetail = showDetail==index?-1:index">
 					<view class="card-detail">
-						<view class="detail" v-if="item.浜у搧妯″叿缂栫爜">
-							<text>浜у搧妯″叿缂栫爜锛�</text>{{item.浜у搧妯″叿缂栫爜}}
+						<view class="detail" v-if="item.浜у搧鍚嶇О">
+							<text>浜у搧鍚嶇О锛�</text>{{item.浜у搧鍚嶇О}}
 						</view>
-						<view class="detail" v-if="item.淇濆吇璁″垝缂栧彿">
-							<text>淇濆吇璁″垝缂栧彿锛�</text>{{item.淇濆吇璁″垝缂栧彿}}
+						<view class="detail" v-if="item.涓婚">
+							<text>涓婚锛�</text>{{item.涓婚}}
 						</view>
-						<view class="detail" v-if="item.淇濆吇瑙勭▼缂栧彿">
-							<text>淇濆吇瑙勭▼缂栧彿锛�</text>{{item.淇濆吇瑙勭▼缂栧彿}}
+						<view class="detail" v-if="item.寮傚父绫诲瀷">
+							<text>寮傚父绫诲瀷锛�</text>{{item.寮傚父绫诲瀷}}
 						</view>
-						<view class="detail" v-if="item.淇濆吇寮�濮嬫棩鏈�">
-							<text>淇濆吇寮�濮嬫棩鏈燂細</text>{{item.淇濆吇寮�濮嬫棩鏈�.substr(0,10)}}
+						<view class="detail" v-if="item.鍙戦�侀儴闂�">
+							<text>鍙戦�侀儴闂細</text>{{item.鍙戦�侀儴闂▆}
 						</view>
-						<view class="detail" v-if="item.淇濆吇缁撴潫鏃ユ湡">
-							<text>淇濆吇缁撴潫鏃ユ湡锛�</text>{{item.淇濆吇缁撴潫鏃ユ湡.substr(0,10)}}
+						<view class="detail" v-if="item.鍙戦�佷汉">
+							<text>鍙戦�佷汉锛�</text>{{item.鍙戦�佷汉}}
 						</view>
-						<view class="detail" v-if="item.鏈�缁堢粨璁�">
-							<text>鏈�缁堢粨璁猴細</text>{{item.鏈�缁堢粨璁簘}
+						<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="card-detail" v-if="showDetail == index">
@@ -126,7 +139,6 @@
 					</view>
 
 					<view class="op" v-if="operations == index">
-						<button class="op1" size="mini" plain @tap.stop="toSon(item)">瀛愯〃淇℃伅</button>
 						<button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
 						<button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
 						<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
@@ -150,7 +162,7 @@
 	} from '@/utils/common.js'
 	import {
 		getUserInfo
-	} from '../../../utils/auth'
+	} from '../../../../utils/auth'
 	export default {
 		data() {
 			return {
@@ -292,7 +304,7 @@
 			},
 			get_DisplayPage(sWhere) {
 				CommonUtils.doRequest2({
-					url: '/Sc_MouldMaintainBill/GetMouldMaintainBillListPage',
+					url: '/Sc_MESTransFerWorkBill/Get_TransFerBillListPage',
 					data: {
 						"sWhere": sWhere,
 						"user": getUserInfo()["Czymc"],
@@ -316,17 +328,19 @@
 				this.onSearchClickHandler()
 				this.goTop()
 			},
-			// 鏂板妯″叿淇濆吇璁板綍鍗�
+			// 鏂板寮傚父鍙嶉鍗�
 			onAddClickHandler() {
 				uni.navigateTo({
-					url: "/pages/MJGL/mujubaoyangjiludan/form"
+					url: "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill?OperationType=1"
 				})
 			},
 			//缂栬緫淇濆吇璁板綍鍗�
 			edit(item) {
 				console.log(item)
 				uni.navigateTo({
-					url: '/pages/MJGL/mujubaoyangjiludan/form?hmainid=' + item.hmainid
+					url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill?OperationType=3&hmainid=' +
+						item
+						.HInterID
 				})
 			},
 			//鍒犻櫎淇濆吇璁板綍鍗�
@@ -338,9 +352,10 @@
 						if (res.confirm) {
 							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
 							CommonUtils.doRequest2({
-								url: '/Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill',
+								url: '/Sc_MESTransFerWorkBill/Get_DeleteTransFerBill',
 								data: {
-									HInterID: item['hmainid'],
+									HInterID: item['HInterID'],
+									HEntryID: item['HEntryID'],
 									user: getUserInfo()['Czymc']
 								},
 								resFunction: (res) => {
@@ -372,13 +387,6 @@
 							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
 						}
 					}
-				});
-			},
-			//瀛愯〃鏌ョ湅
-			toSon(item) {
-				uni.navigateTo({
-					url: '/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList_son?HInterID=' + item.hmainid + '&浜у搧妯″叿=' + item
-						.浜у搧妯″叿 + '&浜у搧妯″叿浠g爜=' + item.浜у搧妯″叿浠g爜,
 				});
 			}
 		},
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue
new file mode 100644
index 0000000..977fc23
--- /dev/null
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue
@@ -0,0 +1,1023 @@
+<template>
+	<view>
+		<!-- 椤电鍖哄煙 -->
+		<view class="tabs" id="tabs">
+			<view class="tabs">
+				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鍏朵粬淇℃伅</view>
+				<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍒跺崟淇℃伅</view>
+			</view>
+		</view>
+		<!-- 鍩烘湰淇℃伅 -->
+		<template v-if="tabs == 0">
+			<view class="form" :style="{height: containerHeight + 'px',overflow: 'auto' }">
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input name="HBillNo" disabled v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HDate" disabled v-model="hform.HDate" placeholder="璇烽�夋嫨" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">楠屾敹鍐呭:</view>
+					<view class="right">
+						<input name="HCheckNote" v-model="hform.HCheckNote" placeholder="璇疯緭鍏ラ獙鏀跺唴瀹�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">楠屾敹缁撴灉:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHCheckResult" placeholder="璇烽�夋嫨楠屾敹缁撴灉" v-model="hform.HCheckResult"
+							@input="HCheckResultChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">楠屾敹鏃堕棿:</view>
+					<view class="righton">
+						<input name="HHCheckDate" disabled v-model="hform.HHCheckDate" placeholder="璇烽�夋嫨" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">涓婚:</view>
+					<view class="right">
+						<input name="HContext" v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
+					</view>
+				</view>
+				<view class="form-item" style="align-items: flex-start;">
+					<view class="title"><text>*</text>璇︾粏鍐呭:</view>
+					<view class="right" style="min-height: 150rpx;">
+						<textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1"
+							placeholder="璇疯緭鍏ヨ缁嗗唴瀹�"></textarea>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">寮傚父绫诲瀷:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="璇烽�夋嫨"
+							v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍙戦�侀儴闂�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+							@input="HDeptNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍙戦�佷汉:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鍙戦�佷汉" v-model="hform.HSendMan"
+							@input="HSendManChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title"><text>*</text>鎺ユ敹浜�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎺ユ敹浜�" v-model="hform.HReceiveMan"
+							@input="HReceiveManChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title"><text>*</text>楠屾敹浜�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹浜�" v-model="hform.HCheckEmpName"
+							@input="HCheckEmpManChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐩稿叧璁惧:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEquipName" placeholder="璇烽�夋嫨璁惧" v-model="hform.HEquipName"
+							@input="HEquipNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐩稿叧妯″叿:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHMouldName" placeholder="璇烽�夋嫨妯″叿" v-model="hform.HMouldName"
+							@input="HMouldIDNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浜у搧鍚嶇О:</view>
+					<view class="right">
+						<input name="HMaterName" v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瑙勬牸鍨嬪彿:</view>
+					<view class="right">
+						<input name="HMaterModel" v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">澶囨敞:</view>
+					<view class="right" style="min-height: 150rpx;">
+						<input name="HRemark" v-model="hform.HRemark" placeholder="" />
+					</view>
+				</view>
+			</view>
+		</template>
+		<!-- 鍏朵粬淇℃伅 -->
+		<template v-if="tabs == 1">
+			<view class="form">
+				<view class="form-item">
+					<view class="title">鎺ユ敹閮ㄩ棬:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HReceiveName"
+							@input="HRecceiveChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鎶勯�佷汉:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎶勯�佷汉" v-model="hform.HCopyMan"
+							@input="HCopyManChange" multiple></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">绱ф�ョ▼搴�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHLevel" placeholder="璇烽�夋嫨绱ф�ョ▼搴�" v-model="hform.HLevel"
+							@input="HLevelChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁绫诲瀷:</view>
+					<view class="righton">
+						<input name="HBillTypeName" disabled v-model="hform.HBillTypeName" placeholder="璇疯緭鍏ュ崟鎹被鍨�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙风爜:</view>
+					<view class="righton">
+						<input name="HPlanBillNo" disabled v-model="hform.HPlanBillNo" placeholder="璇疯緭鍏ュ崟鎹彿鐮�" />
+					</view>
+				</view>
+			</view>
+		</template>
+		<!-- 鍒跺崟淇℃伅 -->
+		<template v-if="tabs == 2">
+			<view class="form">
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HMaker" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HMakeDate" disabled v-model="hform.HMakeDate" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDater" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HUpDateDate" disabled v-model="hform.HUpDateDate" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HChecker" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HCheckDate" disabled v-model="hform.HCheckDate" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteMan" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HDeleteDate" disabled v-model="hform.HDeleteDate" placeholder="" />
+					</view>
+				</view>
+			</view>
+		</template>
+		<view class="buttons" id="buttons">
+			<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			<view style="flex: 1;"></view>
+			<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+			<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+		</view>
+	</view>
+</template>
+<script>
+	import dayjs from "dayjs";
+	import {
+		CommonUtils
+	} from "@/utils/common";
+	import getDateTime from '@/utils/getdateTime.js';
+	import {
+		getUserInfo
+	} from "../../../../utils/auth";
+	import "@/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss"
+	export default {
+		data() {
+			return {
+				tabs: 0,
+				tabsBottom: 0,
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				OperationType: 1,
+				refSav: "",
+
+				arrayHLevel: ['鏅��', '绱ф��'],
+				arrayHCheckResult: ['瀹屾垚', '鏈畬鎴�'],
+
+				// 浜哄憳鐩稿叧鏁扮粍
+				arrayHEmpName: [], // 鎺ユ敹浜� 鍙戦�佷汉 楠屾敹浜� 璐d换浜� 鎶勯�佷汉 QE璐d换浜�
+				HEmpNameList: [],
+
+
+				// 鍏朵粬鏁扮粍
+				arrayHDeptName: [], // 鎺ユ敹銆佸彂閫侀儴闂�
+				HDeptNameList: [],
+				arrayHErrMsgBackTypeName: [], // 寮傚父鍙嶉绫诲瀷
+				HErrMsgBackTypeNameList: [],
+				arrayHEquipName: [], //璁惧
+				HEquipNameList: [],
+				arrayHMouldName: [], //妯″叿
+				HMouldNameList: [],
+
+				isEdit: false,
+
+				hform: {
+					HBillNo: '',
+					HInterID: '',
+					HDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+					HHCheckDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+					HCheckNote: '',
+					HContext: '',
+					HDescription: '',
+					HRemark: '',
+
+					HErrMsgBackTypeName: '',
+					HErrMsgBackTypeID: '0',
+					HDeptName: getUserInfo().HDeptName,
+					HDeptID: getUserInfo().HDeptID,
+					HReceiveName: getUserInfo().HDeptName,
+					HReceiveID: getUserInfo().HDeptID,
+
+					HSendMan: getUserInfo().Czymc, //鍙戦�佷汉
+					HReceiveMan: getUserInfo().HEmpName, //鎺ユ敹浜�
+					HCheckEmpName: getUserInfo().HEmpName, //楠屾敹浜�
+					HCheckEmpID: getUserInfo().HEmpID,
+					HCopyMan: '', //鎶勯�佷汉
+
+					HCheckResult: '瀹屾垚',
+					HLevel: '鏅��',
+					HBillTypeName: '',
+					HPlanBillNo: '',
+					HMaterNumber: '',
+					HMaterName: '',
+					HMaterModel: '',
+
+					// 鏂版坊鍔犵殑瀛楁
+
+
+					HEquipName: '', // 璁惧
+					HEquipID: '0', // 璁惧ID
+					HMouldName: '', // 妯″叿
+					HMouldID: '0', // 妯″叿ID
+
+					HMainSourceBillNo: '',
+					HMainSourceInterID: '0',
+					HMainSourceEntryID: '0',
+					HMainSourceBillType: '',
+
+					HErrMsgBackBillNo: '',
+					HErrMsgBackInterID: '0',
+					HErrMsgBackEntryID: '0',
+
+					HMaker: getUserInfo().Czymc,
+					HMakeDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+					HUpDater: '',
+					HUpDateDate: '',
+					HChecker: '',
+					HCheckDate: '',
+					HDeleteMan: '', // 浣滃簾浜�
+					HDeleteDate: '', // 浣滃簾鏃ユ湡
+				}
+			}
+		},
+		onLoad(e) {
+			this.getListData()
+			if (!e.OperationType) {
+				this.OperationType = 1
+			} else {
+				this.OperationType = e.OperationType
+			}
+
+			// 鏂板锛氳幏鍙栬矾鐢卞弬鏁�
+			this.linterid = e.linterid || ''
+			this.HEntryID = e.HEntryID || '0'
+			this.HSouceBillType = e.HSouceBillType || ''
+
+			if (this.OperationType == 1) {
+				// 鏂板
+				this.getMaxNum()
+			} else if (this.OperationType == 2) {
+				// 鏈夋簮鍗�
+				this.getMaxNum()
+				// 鑾峰彇婧愬崟鏁版嵁骞惰祴鍊�
+				this.getSourceData(this.linterid, this.HEntryID, this.HSouceBillType)
+			} else if (this.OperationType == 3) {
+				// 缂栬緫
+				this.getEditData(e.hmainid)
+			} else if (this.OperationType == 4) {
+				// 娴忚
+			}
+		},
+		computed: {
+			containerHeight: {
+				get() {
+					return this.btnTop - this.tabsBottom - 5
+				}
+			}
+		},
+		onReady() {
+			const query = uni.createSelectorQuery().in(this)
+			query.select("#buttons")
+				.boundingClientRect()
+				.select("#tabs")
+				.boundingClientRect()
+				.exec(res => {
+					this.btnTop = Math.floor(res[0].top)
+					this.tabsBottom = Math.ceil(res[1].bottom)
+				})
+		},
+		methods: {
+			//閫夋嫨鍙戦�侀儴闂� 
+			HDeptNameChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HDeptID = this.HDeptNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨鎺ユ敹閮ㄩ棬
+			HRecceiveChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HReceiveID = this.HDeptNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨寮傚父鍙嶉绫诲瀷
+			HErrMsgBackTypeNameChange(e) {
+				for (var i = 0; i < this.HErrMsgBackTypeNameList.length; i++) {
+					if (this.HErrMsgBackTypeNameList[i].寮傚父鍙嶉绫诲瀷鍚嶇О == e) {
+						this.hform.HErrMsgBackTypeName = this.HErrMsgBackTypeNameList[i].寮傚父鍙嶉绫诲瀷鍚嶇О;
+						this.hform.HErrMsgBackTypeID = this.HErrMsgBackTypeNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨鍙戦�佷汉
+			HSendManChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+
+					}
+				}
+			},
+			//閫夋嫨鎺ユ敹浜�
+			HReceiveManChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+
+					}
+				}
+			},
+			//閫夋嫨楠屾敹浜�
+			HCheckEmpChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HCheckEmpID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			//閫夋嫨鎶勯�佷汉
+			HCopyManChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+
+					}
+				}
+			},
+			//閫夋嫨璁惧 
+			HEquipNameChange(e) {
+				for (var i = 0; i < this.HEquipNameList.length; i++) {
+					if (this.HEquipNameList[i].HName == e) {
+						this.hform.HEquipName = this.HEquipNameList[i].HName;
+						this.hform.HEquipID = this.HEquipNameList[i].HInterID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨妯″叿 
+			HMouldIDNameChange(e) {
+				for (var i = 0; i < this.HMouldNameList.length; i++) {
+					if (this.HMouldNameList[i].HName == e) {
+						this.hform.HMouldName = this.HMouldNameList[i].HName;
+						this.hform.HMouldID = this.HMouldNameList[i].HInterID;
+						break;
+					}
+				}
+			},
+			// 闈欐�佷笅鎷夋閫夋嫨鏂规硶
+			HLevelChange(e) {
+				this.hform.HLevel = e;
+			},
+			//鏂板鎸夐挳浜嬩欢
+			addNew() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛岀‘瀹氳鏂板鍚楋紵',
+					success: (res) => {
+						if (res.confirm) {
+							uni.redirectTo({
+								url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill?operationType=1'
+							})
+							// 閲嶆柊鑾峰彇鏈�澶у崟鎹彿
+							this.getMaxNum();
+							// 鍒囨崲鍒板熀鏈俊鎭〉绛�
+							this.tabs = 0;
+						}
+					}
+				});
+			},
+			// 鑾峰彇鎵�鏈夊垪琛ㄦ暟鎹�
+			getListData() {
+				// 鑾峰彇閮ㄩ棬鍒楄〃
+				this.getDepartmentList();
+				// 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
+				this.getHErrMesTypeList();
+				// 鑾峰彇浜哄憳鍒楄〃锛堟帴鏀朵汉銆侀獙鏀朵汉銆佹妱閫佷汉銆佽矗浠讳汉銆丵E璐d换浜猴級
+				this.getPersonList();
+				// 鑾峰彇璁惧鍒楄〃
+				this.getEquipList();
+				// 鑾峰彇妯″叿鍒楄〃
+				this.getModList();
+			},
+
+			// 鑾峰彇閮ㄩ棬鍒楄〃
+			getDepartmentList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Department/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HDeptNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: res.data.Message,
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			// 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
+			getHErrMesTypeList() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetGy_ErrMsgBackTypeList_Json',
+					data: {
+						ErrMsg: "",
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HErrMsgBackTypeNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHErrMsgBackTypeName[i] = res.data.data[i].寮傚父鍙嶉绫诲瀷鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '鑾峰彇寮傚父鍙嶉绫诲瀷淇℃伅澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鑾峰彇寮傚父鍙嶉绫诲瀷淇℃伅澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			// 鑾峰彇浜哄憳鍒楄〃锛堥�氱敤鏂规硶锛�
+			getPersonList() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetEmployeeList_Json',
+					data: {
+						Employee: '',
+						HGroupID: 0
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HEmpNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHEmpName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			// 鑾峰彇璁惧鍒楄〃
+			getEquipList() {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/GetEquipList_Json',
+					data: {
+						Equip: "",
+						HCenterID: 0 //uni.getStorageSync("HWorkCenterID")
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HEquipNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHEquipName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: res.data.Message,
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			// 鑾峰彇妯″叿鍒楄〃
+			getModList() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetGy_MouldFileMainList_Json',
+					data: {
+						MouldFileMain: ""
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HMouldNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHMouldName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: res.data.Message,
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			//鏂板
+			getMaxNum() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetMAXNum',
+					data: {
+						HBillType: '4532'
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.hform.HInterID = res.data.data[0].HInterID
+							this.hform.HBillNo = res.data.data[0].HBillNo
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			// 鑾峰彇婧愬崟鏁版嵁骞惰祴鍊�
+			getSourceData(HInterID, HEntryID, HSouceBillType) {
+				let num = 1
+				if (HSouceBillType == '4502') {
+					num = 1; //寮傚父鍙嶉鍗�
+				} else if (HSouceBillType == '4529') {
+					num = 2; //寮傚父鍙嶉鎺ユ敹鍗�
+				} else if (HSouceBillType == '4531') {
+					num = 3; //寮傚父鍙嶉澶勭悊鍗�
+				}
+
+				uni.request({
+					url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_OA_ErrMsgBackList',
+					method: 'GET',
+					data: {
+						"HInterID": HInterID,
+						"HEntryID": HEntryID,
+						"user": uni.getStorageSync('HUserName'),
+						"num": num
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							const LoadData = res.data.data[0]
+
+							if (num == 1) {
+								// 寮傚父鍙嶉鍗�
+								this.hform.HDeptID = LoadData.HDeptID
+								this.hform.HDeptName = LoadData.鍙戦�侀儴闂�
+								this.hform.HReceiveID = LoadData.HRecDeptID
+								this.hform.HReceiveName = LoadData.鎺ユ敹閮ㄩ棬
+								this.hform.HErrMsgBackTypeID = LoadData.HErrMsgBackTypeID
+								this.hform.HErrMsgBackTypeName = LoadData.寮傚父绫诲瀷鍚嶇О
+								this.hform.HSendMan = LoadData.鍙戦�佷汉
+								this.hform.HReceiveMan = LoadData.鎸囨淳澶勭悊浜�
+								this.hform.HCopyMan = LoadData.鎶勯��
+								this.hform.HLevel = LoadData.绱ф�ョ▼搴�
+								this.hform.HContext = LoadData.涓婚
+								this.hform.HDescription = LoadData.璇︾粏鍐呭
+								this.hform.HMaterName = LoadData.鐗╂枡鍚嶇О
+								this.hform.HMaterModel = LoadData.瑙勬牸鍨嬪彿
+								this.hform.HEquipID = LoadData.璁惧id
+								this.hform.HEquipName = LoadData.璁惧鍚嶇О
+								this.hform.HMouldID = LoadData.妯″叿id
+								this.hform.HMouldName = LoadData.妯″叿鍚嶇О
+								this.hform.HBillTypeName = HSouceBillType
+								this.hform.HPlanBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceInterID = LoadData.HInterID
+								this.hform.HMainSourceEntryID = LoadData.HEntryID
+								this.hform.HMainSourceBillType = HSouceBillType
+								this.hform.HErrMsgBackBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HErrMsgBackInterID = LoadData.HInterID
+								this.hform.HErrMsgBackEntryID = LoadData.HEntryID
+								
+							} else if (num == 2) {
+								// 寮傚父鍙嶉鎺ユ敹鍗�
+								this.hform.HDeptID = LoadData.HDeptID
+								this.hform.HDeptName = LoadData.鍙戦�侀儴闂�
+								this.hform.HReceiveID = LoadData.HReceiveID == undefined ? 0 : LoadData
+									.HReceiveID
+								this.hform.HReceiveName = LoadData.鎺ユ敹閮ㄩ棬
+								this.hform.HErrMsgBackTypeID = LoadData.HErrMsgBackTypeID
+								this.hform.HErrMsgBackTypeName = LoadData.寮傚父绫诲瀷鍚嶇О
+								this.hform.HSendMan = LoadData.鍙戦�佷汉
+								this.hform.HReceiveMan = LoadData.鎺ユ敹浜�
+								this.hform.HCopyMan = LoadData.鎶勯�佷汉
+								this.hform.HLevel = LoadData.绱ф�ョ▼搴�
+								this.hform.HContext = LoadData.涓婚
+								this.hform.HDescription = LoadData.璇︾粏鍐呭
+								this.hform.HMaterName = LoadData.浜у搧鍚嶇О
+								this.hform.HMaterModel = LoadData.瑙勬牸鍨嬪彿
+								this.hform.HBillTypeName = HSouceBillType
+								this.hform.HPlanBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HEquipID = LoadData.HEquipID
+								this.hform.HEquipName = LoadData.璁惧鍚嶇О
+								this.hform.HMouldID = LoadData.HMouldID
+								this.hform.HMouldName = LoadData.妯℃不鍏峰悕绉�
+								this.hform.HMainSourceBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceInterID = LoadData.hmainid
+								this.hform.HMainSourceEntryID = LoadData.HEntryID == undefined ? "0" : LoadData
+									.HEntryID
+								this.hform.HMainSourceBillType = HSouceBillType
+							
+							}else if (num == 2) {
+								// 寮傚父鍙嶉鍗�
+								this.hform.HDeptID = LoadData.HDeptID
+								this.hform.HDeptName = LoadData.鍙戦�侀儴闂�
+								this.hform.HReceiveID = LoadData.HRecDeptID
+								this.hform.HReceiveName = LoadData.鎺ユ敹閮ㄩ棬
+								this.hform.HErrMsgBackTypeID = LoadData.HErrMsgBackTypeID
+								this.hform.HErrMsgBackTypeName = LoadData.寮傚父绫诲瀷鍚嶇О
+								this.hform.HSendMan = LoadData.鍙戦�佷汉
+								this.hform.HReceiveMan = LoadData.鎸囨淳澶勭悊浜�
+								this.hform.HCopyMan = LoadData.鎶勯��
+								this.hform.HLevel = LoadData.绱ф�ョ▼搴�
+								this.hform.HContext = LoadData.涓婚
+								this.hform.HDescription = LoadData.璇︾粏鍐呭
+								this.hform.HMaterName = LoadData.鐗╂枡鍚嶇О
+								this.hform.HMaterModel = LoadData.瑙勬牸鍨嬪彿
+								this.hform.HEquipID = LoadData.璁惧id
+								this.hform.HEquipName = LoadData.璁惧鍚嶇О
+								this.hform.HMouldID = LoadData.妯″叿id
+								this.hform.HMouldName = LoadData.妯″叿鍚嶇О
+								this.hform.HBillTypeName = HSouceBillType
+								this.hform.HPlanBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceInterID = LoadData.hmainid
+								this.hform.HMainSourceEntryID = LoadData.HEntryID
+								this.hform.HMainSourceBillType = HSouceBillType
+								this.hform.HErrMsgBackBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HErrMsgBackInterID = LoadData.hmainid
+								this.hform.HErrMsgBackEntryID = LoadData.HEntryID
+								
+							}
+
+							// 寮哄埗鏇存柊瑙嗗浘
+							this.$forceUpdate()
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: res.data.msg,
+							icon: 'none'
+						})
+					},
+				})
+			},
+			//缂栬緫
+			getEditData(HInterID) {
+				uni.showLoading({
+					title: '鍔犺浇涓�'
+				});
+				uni.request({
+					url: this.serverUrl + '/Sc_MESTransFerWorkBill/Edit_OA_ErrMsgBackCheckBill',
+					data: {
+						"HID": HInterID
+					},
+					success: (res) => {
+						uni.hideLoading();
+						console.log('缂栬緫鏁版嵁:', res);
+						if (res.data.code == 1) {
+							const data = res.data.data[0]; // 娉ㄦ剰杩欓噷鏀逛负data[0]
+							this.hform = {
+								...this.hform, // 淇濈暀鍘熸湁鐨勯粯璁ゅ��
+								HInterID: data["hmainid"] || '',
+								HEntryID: data["HEntryID"] || '',
+								HBillNo: data["鍗曟嵁鍙�"] || '',
+								HDate: data["鏃ユ湡"] ? dayjs(data["鏃ユ湡"]).format("YYYY-MM-DD") : dayjs(
+									new Date()).format("YYYY-MM-DD"),
+
+								HErrMsgBackTypeID: data["HErrMsgBackTypeID"] || '0',
+								HErrMsgBackTypeName: data["寮傚父绫诲瀷"] || '',
+								HContext: data["涓婚"] || '',
+								HDescription: data["鍐呭"] || '',
+
+								HDeptID: data["HDeptID"] || '0',
+								HDeptName: data["鍙戦�侀儴闂�"] || '',
+								HReceiveID: data["HReceiveID"] || '0', // 鏂板瀛楁
+								HReceiveName: data["鎺ユ敹閮ㄩ棬"] || '',
+
+								HSendMan: data["鍙戦�佷汉"] || '',
+								HReceiveMan: data["鎺ユ敹浜�"] || '',
+								HCopyMan: data["鎶勯�佷汉"] || '',
+
+								HBillTypeName: data["鍗曟嵁绫诲瀷"] || '',
+								HPlanBillNo: data["鍗曟嵁鍙风爜"] || '',
+								HMaterName: data["浜у搧鍚嶇О"] || '',
+								HMaterModel: data["瑙勬牸鍨嬪彿"] || '',
+
+								HEquipID: data["HEquipID"] || '0',
+								HEquipName: data["璁惧鍚嶇О"] || '',
+
+								HMouldID: data["HMouldID"] || '0',
+								HMouldName: data["妯℃不鍏峰悕绉�"] || '',
+
+								HCheckEmpID: data["HCheckEmpID"] || '0',
+								HCheckEmp: data["楠屾敹浜�"] || '',
+								HCheckNote: data["楠屾敹鍐呭"] || '',
+								HCheckResult: data["楠屾敹缁撴灉"] || '',
+								HHCheckDate: data["楠屾敹鏃堕棿"] ? dayjs(data["楠屾敹鏃堕棿"]).format(
+									"YYYY-MM-DD HH:mm:ss") : dayjs(new Date()).format("YYYY-MM-DD"),
+
+
+								HMainSourceInterID: data["婧愬崟ID"] || '0',
+								HMainSourceEntryID: data["婧愬崟瀛怚D"] || '0',
+								HMainSourceBillNo: data["婧愬崟鍗曞彿"] || '',
+								HMainSourceBillType: data["婧愬崟绫诲瀷"] || '',
+
+								HErrMsgBackBillNo: data["寮傚父鍙嶉鍗曞彿"] || '',
+								HErrMsgBackInterID: data["寮傚父鍙嶉鍗曚富鍐呯爜"] || '0',
+								HErrMsgBackEntryID: data["寮傚父鍙嶉鍗曞瓙鍐呯爜"] || '0',
+
+								HRemark: data["琛ㄥご澶囨敞"] || '',
+								HMaker: data["鍒跺崟浜�"] || this.userInfo.Czymc || '',
+								HMakeDate: data["鍒跺崟鏃ユ湡"] ? dayjs(data["鍒跺崟鏃ユ湡"]).format("YYYY-MM-DD") : dayjs(
+									new Date()).format("YYYY-MM-DD"),
+
+								HUpDater: data["淇敼浜�"] || this.userInfo.Czymc || '',
+								HUpDateDate: data["淇敼鏃ユ湡"] ? dayjs(data["淇敼鏃ユ湡"]).format("YYYY-MM-DD") :
+									dayjs(new Date()).format("YYYY-MM-DD"),
+
+								HChecker: data["瀹℃牳浜�"] || '',
+								HCheckDate: data["瀹℃牳鏃ユ湡"] ? dayjs(data["瀹℃牳鏃ユ湡"]).format("YYYY-MM-DD") : '',
+
+								HDeleteMan: data["浣滃簾浜�"] || '',
+								HDeleteDate: data["浣滃簾鏃ユ湡"] ? dayjs(data["浣滃簾鏃ユ湡"]).format("YYYY-MM-DD") : '',
+
+								HLevel: data["绱ф�ョ▼搴�"] || '鏅��'
+							};
+
+							this.isEdit = true;
+						} else {
+							uni.showToast({
+								title: res.data.msg || '鑾峰彇缂栬緫鏁版嵁澶辫触',
+								icon: 'none'
+							});
+						}
+					},
+					fail: (res) => {
+						uni.hideLoading();
+						console.log('缂栬緫鏁版嵁璇锋眰澶辫触:', res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						});
+					}
+				});
+			},
+			//淇濆瓨
+			submit() {
+				if (!this.hform.HReceiveMan) {
+					uni.showToast({
+						title: '璇烽�夋嫨鎺ユ敹浜�',
+						icon: 'none'
+					})
+				} else {
+					uni.showLoading({
+						title: '璇风◢鍊�'
+					})
+					if (this.OperationType == 1 || this.OperationType == 2 || this.OperationType == 4) {
+						this.refSav = "Add";
+					}
+					//鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+					if (this.OperationType == 3) {
+						this.refSav = "Update";
+						this.hform.HUpdater = getUserInfo().Czymc;
+						this.hform.HUpdaterDate = dayjs(new Date()).format("YYYY-MM-DD");
+					}
+					var sMainStr = JSON.stringify(this.hform);
+					var sMainSub = sMainStr + ';' + this.refSav + ';' + uni.getStorageSync('HUserName')
+					uni.request({
+						url: this.serverUrl + '/Sc_MESTransFerWorkBill/SaveOA_ErrMsgBackCheckBill_APP',
+						method: 'POST',
+						dataType: "json",
+						data: {
+							"msg": sMainSub
+						},
+						success: (res) => {
+							console.log(1, res);
+							uni.hideLoading()
+							if (res.data.count == 1) {
+								if (res.data.Verify == "Y") { //鑷姩瀹℃牳
+									this.SaveVerify(res.data.HInterID) //瀹℃牳
+								} else {
+									uni.showModal({
+										title: '鎻愮ず',
+										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+										success: (res) => {
+											if (res.confirm) {
+												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+												uni.redirectTo({
+													url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill?operationType=1'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 50)
+											}
+										}
+									});
+								}
+							}
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					});
+				}
+			},
+
+			SaveVerify(HInterID) {
+				var datas = {
+					HInterID: HInterID,
+					IsAudit: 0,
+					CurUserName: getUserInfo().Czymc
+				}
+				uni.request({
+					url: this.serverUrl + '/Sc_MESTransFerWorkBill/AuditOA_ErrMsgBackCheckBill',
+					method: 'GET',
+					dataType: "json",
+					async: true,
+					data: datas,
+					success: (res) => {
+						uni.showModal({
+							title: '鎻愮ず',
+							content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+							success: (res) => {
+								if (res.confirm) {
+									console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+									uni.redirectTo({
+										url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill?operationType=1'
+									})
+								} else if (res.cancel) {
+									console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+									setTimeout(() => {
+										uni.navigateBack();
+									}, 50)
+								}
+							}
+						});
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			goBack() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBillList.vue
similarity index 85%
copy from pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue
copy to pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBillList.vue
index 19b1b9a..b54c5f0 100644
--- a/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBillList.vue
@@ -49,27 +49,48 @@
 		</view>
 		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
 		<scroll-view id="pageContent" scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
-			<view v-for="(item,index) in listData" :key="index">
-				<uni-card :title="item.浜у搧妯″叿" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+			<view class="list" v-for="(item,index) in listData" :key="index">
+				<uni-card :title="item.鍗曟嵁鐘舵��" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
 					@tap="showDetail = showDetail==index?-1:index">
 					<view class="card-detail">
-						<view class="detail" v-if="item.浜у搧妯″叿缂栫爜">
-							<text>浜у搧妯″叿缂栫爜锛�</text>{{item.浜у搧妯″叿缂栫爜}}
+						<view class="detail" v-if="item.浜у搧鍚嶇О">
+							<text>浜у搧鍚嶇О锛�</text>{{item.浜у搧鍚嶇О}}
 						</view>
-						<view class="detail" v-if="item.淇濆吇璁″垝缂栧彿">
-							<text>淇濆吇璁″垝缂栧彿锛�</text>{{item.淇濆吇璁″垝缂栧彿}}
+						<view class="detail" v-if="item.涓婚">
+							<text>涓婚锛�</text>{{item.涓婚}}
 						</view>
-						<view class="detail" v-if="item.淇濆吇瑙勭▼缂栧彿">
-							<text>淇濆吇瑙勭▼缂栧彿锛�</text>{{item.淇濆吇瑙勭▼缂栧彿}}
+						<view class="detail" v-if="item.鍐呭">
+							<text>鍐呭锛�</text>{{item.鍐呭}}
 						</view>
-						<view class="detail" v-if="item.淇濆吇寮�濮嬫棩鏈�">
-							<text>淇濆吇寮�濮嬫棩鏈燂細</text>{{item.淇濆吇寮�濮嬫棩鏈�.substr(0,10)}}
+						<view class="detail" v-if="item.寮傚父绫诲瀷">
+							<text>寮傚父绫诲瀷锛�</text>{{item.寮傚父绫诲瀷}}
 						</view>
-						<view class="detail" v-if="item.淇濆吇缁撴潫鏃ユ湡">
-							<text>淇濆吇缁撴潫鏃ユ湡锛�</text>{{item.淇濆吇缁撴潫鏃ユ湡.substr(0,10)}}
+						<view class="detail" v-if="item.鍙戦�侀儴闂�">
+							<text>鍙戦�侀儴闂細</text>{{item.鍙戦�侀儴闂▆}
 						</view>
-						<view class="detail" v-if="item.鏈�缁堢粨璁�">
-							<text>鏈�缁堢粨璁猴細</text>{{item.鏈�缁堢粨璁簘}
+						<view class="detail" v-if="item.鎺ユ敹閮ㄩ棬">
+							<text>鎺ユ敹閮ㄩ棬锛�</text>{{item.鎺ユ敹閮ㄩ棬}}
+						</view>
+						<view class="detail" v-if="item.鍙戦�佷汉">
+							<text>鍙戦�佷汉锛�</text>{{item.鍙戦�佷汉}}
+						</view>
+						<view class="detail" v-if="item.鎺ユ敹浜�">
+							<text>鎺ユ敹浜猴細</text>{{item.鎺ユ敹浜簘}
+						</view>
+						<view class="detail" v-if="item.楠屾敹浜�">
+							<text>楠屾敹浜猴細</text>{{item.楠屾敹浜簘}
+						</view>
+						<view class="detail" v-if="item.鎶勯�佷汉">
+							<text>鎶勯�佷汉锛�</text>{{item.鎶勯�佷汉}}
+						</view>
+						<view class="detail" v-if="item.楠屾敹鍐呭">
+							<text>楠屾敹鍐呭锛�</text>{{item.楠屾敹鍐呭}}
+						</view>
+						<view class="detail" v-if="item.楠屾敹缁撴灉">
+							<text>楠屾敹缁撴灉锛�</text>{{item.楠屾敹缁撴灉}}
+						</view>
+						<view class="detail" v-if="item.寮傚父鍙嶉鍗曞彿">
+							<text>寮傚父鍙嶉鍗曞彿锛�</text>{{item.寮傚父鍙嶉鍗曞彿}}
 						</view>
 					</view>
 					<view class="card-detail" v-if="showDetail == index">
@@ -126,7 +147,6 @@
 					</view>
 
 					<view class="op" v-if="operations == index">
-						<button class="op1" size="mini" plain @tap.stop="toSon(item)">瀛愯〃淇℃伅</button>
 						<button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
 						<button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
 						<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
@@ -150,7 +170,7 @@
 	} from '@/utils/common.js'
 	import {
 		getUserInfo
-	} from '../../../utils/auth'
+	} from '../../../../utils/auth'
 	export default {
 		data() {
 			return {
@@ -292,7 +312,7 @@
 			},
 			get_DisplayPage(sWhere) {
 				CommonUtils.doRequest2({
-					url: '/Sc_MouldMaintainBill/GetMouldMaintainBillListPage',
+					url: '/Sc_MESTransFerWorkBill/Get_OA_ErrMsgBackCheckBillListPage',
 					data: {
 						"sWhere": sWhere,
 						"user": getUserInfo()["Czymc"],
@@ -316,20 +336,20 @@
 				this.onSearchClickHandler()
 				this.goTop()
 			},
-			// 鏂板妯″叿淇濆吇璁板綍鍗�
+			// 鏂板寮傚父鍙嶉鍗�
 			onAddClickHandler() {
 				uni.navigateTo({
-					url: "/pages/MJGL/mujubaoyangjiludan/form"
+					url: "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill?OperationType=1"
 				})
 			},
-			//缂栬緫淇濆吇璁板綍鍗�
+			//缂栬緫寮傚父鍙嶉绛惧埌鍗�
 			edit(item) {
 				console.log(item)
 				uni.navigateTo({
-					url: '/pages/MJGL/mujubaoyangjiludan/form?hmainid=' + item.hmainid
+					url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill?OperationType=3&hmainid=' +item.hmainid
 				})
 			},
-			//鍒犻櫎淇濆吇璁板綍鍗�
+			//鍒犻櫎寮傚父鍙嶉绛惧埌鍗�
 			del(item) {
 				uni.showModal({
 					title: '鍒犻櫎纭',
@@ -338,7 +358,7 @@
 						if (res.confirm) {
 							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
 							CommonUtils.doRequest2({
-								url: '/Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill',
+								url: '/Sc_MESTransFerWorkBill/DeleteOA_ErrMsgBackCheckBill',
 								data: {
 									HInterID: item['hmainid'],
 									user: getUserInfo()['Czymc']
@@ -372,13 +392,6 @@
 							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
 						}
 					}
-				});
-			},
-			//瀛愯〃鏌ョ湅
-			toSon(item) {
-				uni.navigateTo({
-					url: '/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList_son?HInterID=' + item.hmainid + '&浜у搧妯″叿=' + item
-						.浜у搧妯″叿 + '&浜у搧妯″叿浠g爜=' + item.浜у搧妯″叿浠g爜,
 				});
 			}
 		},
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue
new file mode 100644
index 0000000..dc0a762
--- /dev/null
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue
@@ -0,0 +1,1047 @@
+<template>
+	<view>
+		<!-- 椤电鍖哄煙 -->
+		<view class="tabs" id="tabs">
+			<view class="tabs">
+				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鍏朵粬淇℃伅</view>
+				<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍒跺崟淇℃伅</view>
+			</view>
+		</view>
+		<!-- 鍩烘湰淇℃伅 -->
+		<template v-if="tabs == 0">
+			<view class="form" :style="{height: containerHeight + 'px',overflow: 'auto' }">
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input name="HBillNo" disabled v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HDate" disabled v-model="hform.HDate" placeholder="璇烽�夋嫨" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">澶勭悊鍐呭:</view>
+					<view class="right">
+						<input name="HHandleNote" v-model="hform.HHandleNote" placeholder="璇疯緭鍏ュ鐞嗗唴瀹�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">澶勭悊缁撴灉:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHHandleResult" placeholder="璇烽�夋嫨澶勭悊缁撴灉" v-model="hform.HHandleResult"
+							@input="HHandleResultChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹屾垚鏃堕棿:</view>
+					<view class="righton">
+						<input name="HHandleDate" disabled v-model="hform.HHandleDate" placeholder="璇烽�夋嫨" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">涓婚:</view>
+					<view class="right">
+						<input name="HContext" v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
+					</view>
+				</view>
+				<view class="form-item" style="align-items: flex-start;">
+					<view class="title"><text>*</text>璇︾粏鍐呭:</view>
+					<view class="right" style="min-height: 150rpx;">
+						<textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1"
+							placeholder="璇疯緭鍏ヨ缁嗗唴瀹�"></textarea>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">寮傚父绫诲瀷:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="璇烽�夋嫨"
+							v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍙戦�侀儴闂�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+							@input="HDeptNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍙戦�佷汉:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鍙戦�佷汉" v-model="hform.HSendMan"
+							@input="HSendManChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title"><text>*</text>鎺ユ敹浜�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎺ユ敹浜�" v-model="hform.HReceiveMan"
+							@input="HReceiveManChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title"><text>*</text>澶勭悊浜�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨澶勭悊浜�" v-model="hform.HHandleEmpName"
+							@input="HHandleEmpChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">澶勭悊鍘熷洜:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHBadReasonName" placeholder="璇烽�夋嫨澶勭悊鍘熷洜" v-model="hform.HBadReasonName"
+							@input="HBadReasonNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐩稿叧璁惧:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEquipName" placeholder="璇烽�夋嫨璁惧" v-model="hform.HEquipName"
+							@input="HEquipNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐩稿叧妯″叿:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHMouldName" placeholder="璇烽�夋嫨妯″叿" v-model="hform.HMouldName"
+							@input="HMouldIDNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浜у搧鍚嶇О:</view>
+					<view class="right">
+						<input name="HMaterName" v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瑙勬牸鍨嬪彿:</view>
+					<view class="right">
+						<input name="HMaterModel" v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">澶囨敞:</view>
+					<view class="right" style="min-height: 150rpx;">
+						<input name="HRemark" v-model="hform.HRemark" placeholder="" />
+					</view>
+				</view>
+			</view>
+		</template>
+		<!-- 鍏朵粬淇℃伅 -->
+		<template v-if="tabs == 1">
+			<view class="form">
+				<view class="form-item">
+					<view class="title">鎺ユ敹閮ㄩ棬:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HReceiveName"
+							@input="HRecceiveChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鎶勯�佷汉:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎶勯�佷汉" v-model="hform.HCopyMan"
+							@input="HCopyManChange" multiple></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">绱ф�ョ▼搴�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHLevel" placeholder="璇烽�夋嫨绱ф�ョ▼搴�" v-model="hform.HLevel"
+							@input="HLevelChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁绫诲瀷:</view>
+					<view class="righton">
+						<input name="HBillTypeName" disabled v-model="hform.HBillTypeName" placeholder="璇疯緭鍏ュ崟鎹被鍨�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙风爜:</view>
+					<view class="righton">
+						<input name="HPlanBillNo" disabled v-model="hform.HPlanBillNo" placeholder="璇疯緭鍏ュ崟鎹彿鐮�" />
+					</view>
+				</view>
+			</view>
+		</template>
+		<!-- 鍒跺崟淇℃伅 -->
+		<template v-if="tabs == 2">
+			<view class="form">
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HMaker" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HMakeDate" disabled v-model="hform.HMakeDate" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDater" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HUpDateDate" disabled v-model="hform.HUpDateDate" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HChecker" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HCheckDate" disabled v-model="hform.HCheckDate" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteMan" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HDeleteDate" disabled v-model="hform.HDeleteDate" placeholder="" />
+					</view>
+				</view>
+			</view>
+		</template>
+		<view class="buttons" id="buttons">
+			<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			<view style="flex: 1;"></view>
+			<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+			<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+		</view>
+	</view>
+</template>
+<script>
+	import dayjs from "dayjs";
+	import {
+		CommonUtils
+	} from "@/utils/common";
+	import getDateTime from '@/utils/getdateTime.js';
+	import {
+		getUserInfo
+	} from "../../../../utils/auth";
+	import "@/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss"
+	export default {
+		data() {
+			return {
+				tabs: 0,
+				tabsBottom: 0,
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				OperationType: 1,
+				refSav: "",
+
+				arrayHLevel: ['鏅��', '绱ф��'],
+				arrayHHandleResult: ['澶勭悊瀹屾垚', '鏃犳硶澶勭悊', '鏈鐞�'],
+
+				// 浜哄憳鐩稿叧鏁扮粍
+				arrayHEmpName: [], // 鎺ユ敹浜� 鍙戦�佷汉 澶勭悊浜� 璐d换浜� 鎶勯�佷汉 QE璐d换浜�
+				HEmpNameList: [],
+
+
+				// 鍏朵粬鏁扮粍
+				arrayHDeptName: [], // 鎺ユ敹銆佸彂閫侀儴闂�
+				HDeptNameList: [],
+				arrayHBadReasonName: [], // 澶勭悊鍘熷洜
+				HBadReasonNameList: [],
+				arrayHErrMsgBackTypeName: [], // 寮傚父鍙嶉绫诲瀷
+				HErrMsgBackTypeNameList: [],
+				arrayHEquipName: [], //璁惧
+				HEquipNameList: [],
+				arrayHMouldName: [], //妯″叿
+				HMouldNameList: [],
+
+				isEdit: false,
+
+				hform: {
+					HBillNo: '',
+					HInterID: '',
+					HDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+					HHandleDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+					HHandleNote: '',
+					HContext: '',
+					HDescription: '',
+					HRemark: '',
+
+					HErrMsgBackTypeName: '',
+					HErrMsgBackTypeID: '0',
+					HDeptName: getUserInfo().HDeptName,
+					HDeptID: getUserInfo().HDeptID,
+					HReceiveName: getUserInfo().HDeptName,
+					HReceiveID: getUserInfo().HDeptID,
+
+					HSendMan: getUserInfo().Czymc, //鍙戦�佷汉
+					HReceiveMan: getUserInfo().HEmpName, //鎺ユ敹浜�
+					HHandleEmpName: getUserInfo().HEmpName, //澶勭悊浜�
+					HHandleEmpID: getUserInfo().HEmpID,
+					HCopyMan: '', //鎶勯�佷汉
+
+					HBadReasonID: '0',
+					HBadReasonName: '',
+					HHandleResult: '澶勭悊瀹屾垚',
+					HLevel: '鏅��',
+					HBillTypeName: '',
+					HPlanBillNo: '',
+					HMaterNumber: '',
+					HMaterName: '',
+					HMaterModel: '',
+
+					// 鏂版坊鍔犵殑瀛楁
+
+
+					HEquipName: '', // 璁惧
+					HEquipID: '0', // 璁惧ID
+					HMouldName: '', // 妯″叿
+					HMouldID: '0', // 妯″叿ID
+
+					HMainSourceBillNo: '',
+					HMainSourceInterID: '0',
+					HMainSourceEntryID: '0',
+					HMainSourceBillType: '',
+
+					HErrMsgBackBillNo: '',
+					HErrMsgBackInterID: '0',
+					HErrMsgBackEntryID: '0',
+
+					HMaker: getUserInfo().Czymc,
+					HMakeDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+					HUpDater: '',
+					HUpDateDate: '',
+					HChecker: '',
+					HCheckDate: '',
+					HDeleteMan: '', // 浣滃簾浜�
+					HDeleteDate: '', // 浣滃簾鏃ユ湡
+				}
+			}
+		},
+		onLoad(e) {
+			this.getListData()
+			if (!e.OperationType) {
+				this.OperationType = 1
+			} else {
+				this.OperationType = e.OperationType
+			}
+			
+			// 鏂板锛氳幏鍙栬矾鐢卞弬鏁�
+			this.linterid = e.linterid || ''
+			this.HEntryID = e.HEntryID || '0'
+			this.HSouceBillType = e.HSouceBillType || ''
+			
+			if (this.OperationType == 1) {
+				// 鏂板
+				this.getMaxNum()
+			} else if (this.OperationType == 2) {
+				// 鏈夋簮鍗�
+				this.getMaxNum()
+				// 鑾峰彇婧愬崟鏁版嵁骞惰祴鍊�
+				this.getSourceData(this.linterid, this.HEntryID, this.HSouceBillType)
+			} else if (this.OperationType == 3) {
+				// 缂栬緫
+				this.getEditData(e.hmainid)
+			} else if (this.OperationType == 4) {
+				// 娴忚
+			}
+		},
+		computed: {
+			containerHeight: {
+				get() {
+					return this.btnTop - this.tabsBottom - 5
+				}
+			}
+		},
+		onReady() {
+			const query = uni.createSelectorQuery().in(this)
+			query.select("#buttons")
+				.boundingClientRect()
+				.select("#tabs")
+				.boundingClientRect()
+				.exec(res => {
+					this.btnTop = Math.floor(res[0].top)
+					this.tabsBottom = Math.ceil(res[1].bottom)
+				})
+		},
+		methods: {
+			//閫夋嫨澶勭悊鍘熷洜
+			HBadReasonNameChange(e) {
+				for (var i = 0; i < this.HBadReasonNameList.length; i++) {
+					if (this.HBadReasonNameList[i].澶勭悊鏂规鍚嶇О == e) {
+						this.hform.HBadReasonID = this.HBadReasonNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨鍙戦�侀儴闂� 
+			HDeptNameChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HDeptID = this.HDeptNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨鎺ユ敹閮ㄩ棬
+			HRecceiveChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HReceiveID = this.HDeptNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨寮傚父鍙嶉绫诲瀷
+			HErrMsgBackTypeNameChange(e) {
+				for (var i = 0; i < this.HErrMsgBackTypeNameList.length; i++) {
+					if (this.HErrMsgBackTypeNameList[i].寮傚父鍙嶉绫诲瀷鍚嶇О == e) {
+						this.hform.HErrMsgBackTypeName = this.HErrMsgBackTypeNameList[i].寮傚父鍙嶉绫诲瀷鍚嶇О;
+						this.hform.HErrMsgBackTypeID = this.HErrMsgBackTypeNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨鍙戦�佷汉
+			HSendManChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+
+					}
+				}
+			},
+			//閫夋嫨鎺ユ敹浜�
+			HReceiveManChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+
+					}
+				}
+			},
+			//閫夋嫨澶勭悊浜�
+			HHandleEmpChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HHandleEmpID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			//閫夋嫨鎶勯�佷汉
+			HCopyManChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+
+					}
+				}
+			},
+			//閫夋嫨璁惧 
+			HEquipNameChange(e) {
+				for (var i = 0; i < this.HEquipNameList.length; i++) {
+					if (this.HEquipNameList[i].HName == e) {
+						this.hform.HEquipName = this.HEquipNameList[i].HName;
+						this.hform.HEquipID = this.HEquipNameList[i].HInterID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨妯″叿 
+			HMouldIDNameChange(e) {
+				for (var i = 0; i < this.HMouldNameList.length; i++) {
+					if (this.HMouldNameList[i].HName == e) {
+						this.hform.HMouldName = this.HMouldNameList[i].HName;
+						this.hform.HMouldID = this.HMouldNameList[i].HInterID;
+						break;
+					}
+				}
+			},
+			// 闈欐�佷笅鎷夋閫夋嫨鏂规硶
+			HLevelChange(e) {
+				this.hform.HLevel = e;
+			},
+			//鏂板鎸夐挳浜嬩欢
+			addNew() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛岀‘瀹氳鏂板鍚楋紵',
+					success: (res) => {
+						if (res.confirm) {
+							uni.redirectTo({
+								url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill?operationType=1'
+							})
+							// 閲嶆柊鑾峰彇鏈�澶у崟鎹彿
+							this.getMaxNum();
+							// 鍒囨崲鍒板熀鏈俊鎭〉绛�
+							this.tabs = 0;
+						}
+					}
+				});
+			},
+			// 鑾峰彇鎵�鏈夊垪琛ㄦ暟鎹�
+			getListData() {
+				// 鑾峰彇閮ㄩ棬鍒楄〃
+				this.getDepartmentList();
+				// 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
+				this.getHErrMesTypeList();
+				// 鑾峰彇浜哄憳鍒楄〃锛堟帴鏀朵汉銆佸鐞嗕汉銆佹妱閫佷汉銆佽矗浠讳汉銆丵E璐d换浜猴級
+				this.getPersonList();
+				// 鑾峰彇璁惧鍒楄〃
+				this.getEquipList();
+				// 鑾峰彇妯″叿鍒楄〃
+				this.getModList();
+				// 鑾峰彇澶勭悊鍘熷洜鍒楄〃
+				this.getBadReasonList();
+			},
+
+			// 鑾峰彇閮ㄩ棬鍒楄〃
+			getDepartmentList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Department/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HDeptNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: res.data.Message,
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			// 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
+			getHErrMesTypeList() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetGy_ErrMsgBackTypeList_Json',
+					data: {
+						ErrMsg: "",
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HErrMsgBackTypeNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHErrMsgBackTypeName[i] = res.data.data[i].寮傚父鍙嶉绫诲瀷鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '鑾峰彇寮傚父鍙嶉绫诲瀷淇℃伅澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鑾峰彇寮傚父鍙嶉绫诲瀷淇℃伅澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			// 鑾峰彇浜哄憳鍒楄〃锛堥�氱敤鏂规硶锛�
+			getPersonList() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetEmployeeList_Json',
+					data: {
+						Employee: '',
+						HGroupID: 0
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HEmpNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHEmpName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			// 鑾峰彇璁惧鍒楄〃
+			getEquipList() {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/GetEquipList_Json',
+					data: {
+						Equip: "",
+						HCenterID: 0 //uni.getStorageSync("HWorkCenterID")
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HEquipNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHEquipName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: res.data.Message,
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			// 鑾峰彇妯″叿鍒楄〃
+			getModList() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetGy_MouldFileMainList_Json',
+					data: {
+						MouldFileMain: ""
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HMouldNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHMouldName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: res.data.Message,
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			// 鑾峰彇澶勭悊鍘熷洜鍒楄〃
+			getBadReasonList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_DisposeWay/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HBadReasonNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHBadReasonName[i] = res.data.data[i].澶勭悊鏂规鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: res.data.Message,
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			//鏂板
+			getMaxNum() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetMAXNum',
+					data: {
+						HBillType: '4531'
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.hform.HInterID = res.data.data[0].HInterID
+							this.hform.HBillNo = res.data.data[0].HBillNo
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			// 鑾峰彇婧愬崟鏁版嵁骞惰祴鍊�
+			getSourceData(HInterID, HEntryID, HSouceBillType) {
+				let num = 1
+				if (HSouceBillType == '4502') {
+					num = 1 // 寮傚父鍙嶉鍗�
+				} else if (HSouceBillType == '4529') {
+					num = 2 // 寮傚父鍙嶉鎺ユ敹鍗�
+				}
+
+				uni.request({
+					url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_OA_ErrMsgBackList',
+					method: 'GET',
+					data: {
+						"HInterID": HInterID,
+						"HEntryID": HEntryID,
+						"user": uni.getStorageSync('HUserName'),
+						"num": num
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							const LoadData = res.data.data[0]
+
+							if (num == 1) {
+								// 寮傚父鍙嶉鍗�
+								this.hform.HDeptID = LoadData.HDeptID
+								this.hform.HDeptName = LoadData.鍙戦�侀儴闂�
+								this.hform.HReceiveID = LoadData.HRecDeptID
+								this.hform.HReceiveName = LoadData.鎺ユ敹閮ㄩ棬
+								this.hform.HErrMsgBackTypeID = LoadData.HErrMsgBackTypeID
+								this.hform.HErrMsgBackTypeName = LoadData.寮傚父绫诲瀷鍚嶇О
+								this.hform.HSendMan = LoadData.鍙戦�佷汉
+								this.hform.HReceiveMan = LoadData.鎸囨淳澶勭悊浜�
+								this.hform.HCopyMan = LoadData.鎶勯��
+								this.hform.HLevel = LoadData.绱ф�ョ▼搴�
+								this.hform.HContext = LoadData.涓婚
+								this.hform.HDescription = LoadData.璇︾粏鍐呭
+								this.hform.HMaterName = LoadData.鐗╂枡鍚嶇О
+								this.hform.HMaterModel = LoadData.瑙勬牸鍨嬪彿
+								this.hform.HEquipID = LoadData.璁惧id
+								this.hform.HEquipName = LoadData.璁惧鍚嶇О
+								this.hform.HMouldID = LoadData.妯″叿id
+								this.hform.HMouldName = LoadData.妯″叿鍚嶇О
+								this.hform.HBillTypeName = HSouceBillType
+								this.hform.HPlanBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceInterID = LoadData.HInterID
+								this.hform.HMainSourceEntryID = LoadData.HEntryID
+								this.hform.HMainSourceBillType = HSouceBillType
+								this.hform.HErrMsgBackBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HErrMsgBackInterID = LoadData.HInterID
+								this.hform.HErrMsgBackEntryID = LoadData.HEntryID
+								this.hform.HHandleEmpID = LoadData.HHandleEmpID
+								this.hform.HHandleEmpName = LoadData.鎸囨淳澶勭悊浜�
+							} else if (num == 2) {
+								// 寮傚父鍙嶉鎺ユ敹鍗�
+								this.hform.HDeptID = LoadData.HDeptID
+								this.hform.HDeptName = LoadData.鍙戦�侀儴闂�
+								this.hform.HReceiveID = LoadData.HReceiveID == undefined ? 0 : LoadData
+									.HReceiveID
+								this.hform.HReceiveName = LoadData.鎺ユ敹閮ㄩ棬
+								this.hform.HErrMsgBackTypeID = LoadData.HErrMsgBackTypeID
+								this.hform.HErrMsgBackTypeName = LoadData.寮傚父绫诲瀷鍚嶇О
+								this.hform.HSendMan = LoadData.鍙戦�佷汉
+								this.hform.HReceiveMan = LoadData.鎺ユ敹浜�
+								this.hform.HCopyMan = LoadData.鎶勯�佷汉
+								this.hform.HLevel = LoadData.绱ф�ョ▼搴�
+								this.hform.HContext = LoadData.涓婚
+								this.hform.HDescription = LoadData.璇︾粏鍐呭
+								this.hform.HMaterName = LoadData.浜у搧鍚嶇О
+								this.hform.HMaterModel = LoadData.瑙勬牸鍨嬪彿
+								this.hform.HBillTypeName = HSouceBillType
+								this.hform.HPlanBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HEquipID = LoadData.HEquipID
+								this.hform.HEquipName = LoadData.璁惧鍚嶇О
+								this.hform.HMouldID = LoadData.HMouldID
+								this.hform.HMouldName = LoadData.妯℃不鍏峰悕绉�
+								this.hform.HMainSourceBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceInterID = LoadData.hmainid
+								this.hform.HMainSourceEntryID = LoadData.HEntryID == undefined ? "0" : LoadData.HEntryID
+								this.hform.HMainSourceBillType = HSouceBillType
+								this.hform.HHandleEmpID = LoadData.HHandleEmpID
+								this.hform.HHandleEmpName = LoadData.鎸囨淳澶勭悊浜�
+							}
+
+							// 寮哄埗鏇存柊瑙嗗浘
+							this.$forceUpdate()
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: res.data.msg,
+							icon: 'none'
+						})
+					},
+				})
+			},
+			//缂栬緫
+			getEditData(HInterID) {
+				uni.showLoading({
+					title: '鍔犺浇涓�'
+				});
+				uni.request({
+					url: this.serverUrl + '/Sc_MESTransFerWorkBill/Edit_OA_ErrMsgBackHandleBill',
+					data: {
+						"HID": HInterID
+					},
+					success: (res) => {
+						uni.hideLoading();
+						console.log('缂栬緫鏁版嵁:', res);
+						if (res.data.code == 1) {
+							const data = res.data.data[0]; // 娉ㄦ剰杩欓噷鏀逛负data[0]
+							this.hform = {
+								...this.hform, // 淇濈暀鍘熸湁鐨勯粯璁ゅ��
+								HInterID: data["hmainid"] || '',
+								HEntryID: data["HEntryID"] || '',
+								HBillNo: data["鍗曟嵁鍙�"] || '',
+								HDate: data["鏃ユ湡"] ? dayjs(data["鏃ユ湡"]).format("YYYY-MM-DD") : dayjs(
+									new Date()).format("YYYY-MM-DD"),
+
+								HErrMsgBackTypeID: data["HErrMsgBackTypeID"] || '0',
+								HErrMsgBackTypeName: data["寮傚父绫诲瀷"] || '',
+								HContext: data["涓婚"] || '',
+								HDescription: data["鍐呭"] || '',
+
+								HDeptID: data["HDeptID"] || '0',
+								HDeptName: data["鍙戦�侀儴闂�"] || '',
+								HReceiveID: data["HReceiveID"] || '0', // 鏂板瀛楁
+								HReceiveName: data["鎺ユ敹閮ㄩ棬"] || '',
+
+								HSendMan: data["鍙戦�佷汉"] || '',
+								HReceiveMan: data["鎺ユ敹浜�"] || '',
+								HCopyMan: data["鎶勯�佷汉"] || '',
+
+								HBillTypeName: data["鍗曟嵁绫诲瀷"] || '',
+								HPlanBillNo: data["鍗曟嵁鍙风爜"] || '',
+								HMaterName: data["浜у搧鍚嶇О"] || '',
+								HMaterModel: data["瑙勬牸鍨嬪彿"] || '',
+
+								HEquipID: data["HEquipID"] || '0',
+								HEquipName: data["璁惧鍚嶇О"] || '',
+
+								HMouldID: data["HMouldID"] || '0', // 淇瀛楁鍚�
+								HMouldName: data["妯℃不鍏峰悕绉�"] || '',
+
+								HHandleEmpID: data["HHandleEmpID"] || '0',
+								HHandleEmp: data["澶勭悊浜�"] || '',
+								HHandleNote: data["澶勭悊鍐呭"] || '', // 鏂板瀛楁
+								HHandleDate: data["澶勭悊瀹屾垚鏃堕棿"] ? dayjs(data["澶勭悊瀹屾垚鏃堕棿"]).format(
+									"YYYY-MM-DD HH:mm:ss") : '',
+								HBadReasonID: data["HBadReasonID"] || '',
+								HBadReasonName: data["澶勭悊鍘熷洜"] || '', // 鏂板瀛楁
+
+
+								HMainSourceInterID: data["婧愬崟ID"] || '0',
+								HMainSourceEntryID: data["婧愬崟瀛怚D"] || '0',
+								HMainSourceBillNo: data["婧愬崟鍗曞彿"] || '',
+								HMainSourceBillType: data["婧愬崟绫诲瀷"] || '',
+
+								HErrMsgBackBillNo: data["寮傚父鍙嶉鍗曞彿"] || '', // 鏂板瀛楁
+								HErrMsgBackInterID: data["寮傚父鍙嶉鍗曚富鍐呯爜"] || '0', // 鏂板瀛楁
+								HErrMsgBackEntryID: data["寮傚父鍙嶉鍗曞瓙鍐呯爜"] || '0', // 鏂板瀛楁
+
+								HRemark: data["琛ㄥご澶囨敞"] || '',
+								HMaker: data["鍒跺崟浜�"] || this.userInfo.Czymc || '',
+								HMakeDate: data["鍒跺崟鏃ユ湡"] ? dayjs(data["鍒跺崟鏃ユ湡"]).format("YYYY-MM-DD") : dayjs(
+									new Date()).format("YYYY-MM-DD"),
+
+								HUpDater: data["淇敼浜�"] || this.userInfo.Czymc || '',
+								HUpDateDate: data["淇敼鏃ユ湡"] ? dayjs(data["淇敼鏃ユ湡"]).format("YYYY-MM-DD") :
+									dayjs(new Date()).format("YYYY-MM-DD"),
+
+								HChecker: data["瀹℃牳浜�"] || '',
+								HCheckDate: data["瀹℃牳鏃ユ湡"] ? dayjs(data["瀹℃牳鏃ユ湡"]).format("YYYY-MM-DD") : '',
+
+								HDeleteMan: data["浣滃簾浜�"] || '',
+								HDeleteDate: data["浣滃簾鏃ユ湡"] ? dayjs(data["浣滃簾鏃ユ湡"]).format("YYYY-MM-DD") : '',
+
+								HLevel: data["绱ф�ョ▼搴�"] || '鏅��'
+							};
+
+							this.isEdit = true;
+						} else {
+							uni.showToast({
+								title: res.data.msg || '鑾峰彇缂栬緫鏁版嵁澶辫触',
+								icon: 'none'
+							});
+						}
+					},
+					fail: (res) => {
+						uni.hideLoading();
+						console.log('缂栬緫鏁版嵁璇锋眰澶辫触:', res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						});
+					}
+				});
+			},
+			//淇濆瓨
+			submit() {
+				if (!this.hform.HReceiveMan) {
+					uni.showToast({
+						title: '璇烽�夋嫨鎺ユ敹浜�',
+						icon: 'none'
+					})
+				} else {
+					uni.showLoading({
+						title: '璇风◢鍊�'
+					})
+					if (this.OperationType == 1 || this.OperationType == 2 || this.OperationType == 4) {
+						this.refSav = "Add";
+					}
+					//鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+					if (this.OperationType == 3) {
+						this.refSav = "Update";
+						this.hform.HUpdater = getUserInfo().Czymc;
+						this.hform.HUpdaterDate = dayjs(new Date()).format("YYYY-MM-DD");
+					}
+					var sMainStr = JSON.stringify(this.hform);
+					var sMainSub = sMainStr + ';' + this.refSav + ';' + uni.getStorageSync('HUserName')
+					uni.request({
+						url: this.serverUrl + '/Sc_MESTransFerWorkBill/SaveOA_ErrMsgBackHandleBill_APP',
+						method: 'POST',
+						dataType: "json",
+						data: {
+							"msg": sMainSub
+						},
+						success: (res) => {
+							console.log(1, res);
+							uni.hideLoading()
+							if (res.data.count == 1) {
+								if (res.data.Verify == "Y") { //鑷姩瀹℃牳
+									this.SaveVerify(res.data.HInterID) //瀹℃牳
+								} else {
+									uni.showModal({
+										title: '鎻愮ず',
+										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+										success: (res) => {
+											if (res.confirm) {
+												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+												uni.redirectTo({
+													url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill2?operationType=1'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 50)
+											}
+										}
+									});
+								}
+							}
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					});
+				}
+			},
+
+			SaveVerify(HInterID) {
+				var datas = {
+					HInterID: HInterID,
+					IsAudit: 0,
+					CurUserName: getUserInfo().Czymc
+				}
+				uni.request({
+					url: this.serverUrl + '/Sc_MESTransFerWorkBill/AuditOA_ErrMsgBackHandleBill',
+					method: 'GET',
+					dataType: "json",
+					async: true,
+					data: datas,
+					success: (res) => {
+						uni.showModal({
+							title: '鎻愮ず',
+							content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+							success: (res) => {
+								if (res.confirm) {
+									console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+									uni.redirectTo({
+										url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill?operationType=1'
+									})
+								} else if (res.cancel) {
+									console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+									setTimeout(() => {
+										uni.navigateBack();
+									}, 50)
+								}
+							}
+						});
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			goBack() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBillList.vue
similarity index 86%
copy from pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue
copy to pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBillList.vue
index 19b1b9a..a232eab 100644
--- a/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBillList.vue
@@ -49,27 +49,45 @@
 		</view>
 		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
 		<scroll-view id="pageContent" scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
-			<view v-for="(item,index) in listData" :key="index">
-				<uni-card :title="item.浜у搧妯″叿" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+			<view class="list" v-for="(item,index) in listData" :key="index">
+				<uni-card :title="item.鍗曟嵁鐘舵��" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
 					@tap="showDetail = showDetail==index?-1:index">
 					<view class="card-detail">
-						<view class="detail" v-if="item.浜у搧妯″叿缂栫爜">
-							<text>浜у搧妯″叿缂栫爜锛�</text>{{item.浜у搧妯″叿缂栫爜}}
+						<view class="detail" v-if="item.浜у搧鍚嶇О">
+							<text>浜у搧鍚嶇О锛�</text>{{item.浜у搧鍚嶇О}}
 						</view>
-						<view class="detail" v-if="item.淇濆吇璁″垝缂栧彿">
-							<text>淇濆吇璁″垝缂栧彿锛�</text>{{item.淇濆吇璁″垝缂栧彿}}
+						<view class="detail" v-if="item.涓婚">
+							<text>涓婚锛�</text>{{item.涓婚}}
 						</view>
-						<view class="detail" v-if="item.淇濆吇瑙勭▼缂栧彿">
-							<text>淇濆吇瑙勭▼缂栧彿锛�</text>{{item.淇濆吇瑙勭▼缂栧彿}}
+						<view class="detail" v-if="item.鍐呭">
+							<text>鍐呭锛�</text>{{item.鍐呭}}
 						</view>
-						<view class="detail" v-if="item.淇濆吇寮�濮嬫棩鏈�">
-							<text>淇濆吇寮�濮嬫棩鏈燂細</text>{{item.淇濆吇寮�濮嬫棩鏈�.substr(0,10)}}
+						<view class="detail" v-if="item.寮傚父绫诲瀷">
+							<text>寮傚父绫诲瀷锛�</text>{{item.寮傚父绫诲瀷}}
 						</view>
-						<view class="detail" v-if="item.淇濆吇缁撴潫鏃ユ湡">
-							<text>淇濆吇缁撴潫鏃ユ湡锛�</text>{{item.淇濆吇缁撴潫鏃ユ湡.substr(0,10)}}
+						<view class="detail" v-if="item.鍙戦�侀儴闂�">
+							<text>鍙戦�侀儴闂細</text>{{item.鍙戦�侀儴闂▆}
 						</view>
-						<view class="detail" v-if="item.鏈�缁堢粨璁�">
-							<text>鏈�缁堢粨璁猴細</text>{{item.鏈�缁堢粨璁簘}
+						<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="card-detail" v-if="showDetail == index">
@@ -126,7 +144,6 @@
 					</view>
 
 					<view class="op" v-if="operations == index">
-						<button class="op1" size="mini" plain @tap.stop="toSon(item)">瀛愯〃淇℃伅</button>
 						<button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
 						<button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
 						<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
@@ -150,7 +167,7 @@
 	} from '@/utils/common.js'
 	import {
 		getUserInfo
-	} from '../../../utils/auth'
+	} from '../../../../utils/auth'
 	export default {
 		data() {
 			return {
@@ -292,7 +309,7 @@
 			},
 			get_DisplayPage(sWhere) {
 				CommonUtils.doRequest2({
-					url: '/Sc_MouldMaintainBill/GetMouldMaintainBillListPage',
+					url: '/Sc_MESTransFerWorkBill/Get_OA_ErrMsgBackHandleBillListPage',
 					data: {
 						"sWhere": sWhere,
 						"user": getUserInfo()["Czymc"],
@@ -316,20 +333,20 @@
 				this.onSearchClickHandler()
 				this.goTop()
 			},
-			// 鏂板妯″叿淇濆吇璁板綍鍗�
+			// 鏂板寮傚父鍙嶉鍗�
 			onAddClickHandler() {
 				uni.navigateTo({
-					url: "/pages/MJGL/mujubaoyangjiludan/form"
+					url: "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill?OperationType=1"
 				})
 			},
-			//缂栬緫淇濆吇璁板綍鍗�
+			//缂栬緫寮傚父鍙嶉绛惧埌鍗�
 			edit(item) {
 				console.log(item)
 				uni.navigateTo({
-					url: '/pages/MJGL/mujubaoyangjiludan/form?hmainid=' + item.hmainid
+					url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill?OperationType=3&hmainid=' +item.hmainid
 				})
 			},
-			//鍒犻櫎淇濆吇璁板綍鍗�
+			//鍒犻櫎寮傚父鍙嶉绛惧埌鍗�
 			del(item) {
 				uni.showModal({
 					title: '鍒犻櫎纭',
@@ -338,7 +355,7 @@
 						if (res.confirm) {
 							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
 							CommonUtils.doRequest2({
-								url: '/Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill',
+								url: '/Sc_MESTransFerWorkBill/DeleteOA_ErrMsgBackHandleBill',
 								data: {
 									HInterID: item['hmainid'],
 									user: getUserInfo()['Czymc']
@@ -372,13 +389,6 @@
 							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
 						}
 					}
-				});
-			},
-			//瀛愯〃鏌ョ湅
-			toSon(item) {
-				uni.navigateTo({
-					url: '/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList_son?HInterID=' + item.hmainid + '&浜у搧妯″叿=' + item
-						.浜у搧妯″叿 + '&浜у搧妯″叿浠g爜=' + item.浜у搧妯″叿浠g爜,
 				});
 			}
 		},
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue
new file mode 100644
index 0000000..aaff83c
--- /dev/null
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue
@@ -0,0 +1,908 @@
+<template>
+	<view>
+		<!-- 椤电鍖哄煙 -->
+		<view class="tabs" id="tabs">
+			<view class="tabs">
+				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鍏朵粬淇℃伅</view>
+				<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍒跺崟淇℃伅</view>
+			</view>
+		</view>
+		<!-- 鍩烘湰淇℃伅 -->
+		<template v-if="tabs == 0">
+			<view class="form" :style="{height: containerHeight + 'px',overflow: 'auto' }">
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input name="HBillNo" disabled v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HDate" disabled v-model="hform.HDate" placeholder="璇烽�夋嫨" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鎺ユ敹纭:</view>
+					<view class="right">
+						<input name="HReceiveNote" v-model="hform.HReceiveNote" placeholder="璇疯緭鍏ユ槸鍚︽帴鏀剁‘璁�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">澶勭悊寤鸿:</view>
+					<view class="right">
+						<input name="HHandleAdvise" v-model="hform.HHandleAdvise" placeholder="璇疯緭鍏ュ鐞嗗缓璁�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">纭鏃堕棿:</view>
+					<view class="righton">
+						<input name="HReceiveDate" disabled v-model="hform.HReceiveDate" placeholder="璇烽�夋嫨" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">涓婚:</view>
+					<view class="right">
+						<input name="HContext" v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
+					</view>
+				</view>
+				<view class="form-item" style="align-items: flex-start;">
+					<view class="title"><text>*</text>璇︾粏鍐呭:</view>
+					<view class="right" style="min-height: 150rpx;">
+						<textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1"
+							placeholder="璇疯緭鍏ヨ缁嗗唴瀹�"></textarea>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">寮傚父绫诲瀷:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="璇烽�夋嫨"
+							v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍙戦�侀儴闂�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+							@input="HDeptNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍙戦�佷汉:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鍙戦�佷汉" v-model="hform.HSendMan"
+							@input="HSendManChange"></uni-combox>
+					</view>
+				</view>
+
+				<view class="form-item">
+					<view class="title"><text>*</text>鎺ユ敹浜�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎺ユ敹浜�" v-model="hform.HReceiveMan"
+							@input="HReceiveManChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍏宠仈浜�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鍏宠仈浜�" v-model="hform.HRelationEmpName"
+							@input="HRelationEmpNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鎸囨淳澶勭悊浜�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎸囨淳澶勭悊浜�" v-model="hform.HHandleEmpName"
+							@input="HHandleEmpNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐩稿叧璁惧:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEquipName" placeholder="璇烽�夋嫨" v-model="hform.HEquipName"
+							@input="HEquipNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐩稿叧妯″叿:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHMouldName" placeholder="璇烽�夋嫨" v-model="hform.HMouldName"
+							@input="HMouldIDNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浜у搧鍚嶇О:</view>
+					<view class="right">
+						<input name="HMaterName" v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瑙勬牸鍨嬪彿:</view>
+					<view class="right">
+						<input name="HMaterModel" v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">澶囨敞:</view>
+					<view class="right" style="min-height: 150rpx;">
+						<input name="HRemark" v-model="hform.HRemark" placeholder="" />
+					</view>
+				</view>
+			</view>
+		</template>
+		<!-- 鍏朵粬淇℃伅 -->
+		<template v-if="tabs == 1">
+			<view class="form">
+				<view class="form-item">
+					<view class="title">鎺ユ敹閮ㄩ棬:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HReceiveName"
+							@input="HRecceiveChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鎶勯�佷汉:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎶勯�佷汉" v-model="hform.HCopyMan"
+							@input="HCopyManChange" multiple></uni-combox>
+					</view>
+				</view>
+
+				<view class="form-item">
+					<view class="title">绱ф�ョ▼搴�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHLevel" placeholder="璇烽�夋嫨绱ф�ョ▼搴�" v-model="hform.HLevel"
+							@input="HLevelChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁绫诲瀷:</view>
+					<view class="righton">
+						<input name="HBillTypeName" disabled v-model="hform.HBillTypeName" placeholder="璇疯緭鍏ュ崟鎹被鍨�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙风爜:</view>
+					<view class="righton">
+						<input name="HPlanBillNo" disabled v-model="hform.HPlanBillNo" placeholder="璇疯緭鍏ュ崟鎹彿鐮�" />
+					</view>
+				</view>
+			</view>
+		</template>
+		<!-- 鍒跺崟淇℃伅 -->
+		<template v-if="tabs == 2">
+			<view class="form">
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HMaker" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HMakeDate" disabled v-model="hform.HMakeDate" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDater" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HUpDateDate" disabled v-model="hform.HUpDateDate" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HChecker" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HCheckDate" disabled v-model="hform.HCheckDate" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteMan" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HDeleteDate" disabled v-model="hform.HDeleteDate" placeholder="" />
+					</view>
+				</view>
+			</view>
+		</template>
+		<view class="buttons" id="buttons">
+			<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			<view style="flex: 1;"></view>
+			<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+			<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+		</view>
+	</view>
+</template>
+<script>
+	import dayjs from "dayjs";
+	import {
+		CommonUtils
+	} from "@/utils/common";
+	import getDateTime from '@/utils/getdateTime.js';
+	import {
+		getUserInfo
+	} from "../../../../utils/auth";
+	import "@/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss"
+	export default {
+		data() {
+			return {
+				tabs: 0,
+				tabsBottom: 0,
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				OperationType: 1,
+				refSav: "",
+
+				arrayHLevel: ['鏅��', '绱ф��'],
+
+				// 浜哄憳鐩稿叧鏁扮粍
+				arrayHEmpName: [], // 鎺ユ敹浜� 鍙戦�佷汉 澶勭悊浜� 璐d换浜� 鎶勯�佷汉 QE璐d换浜�
+				HEmpNameList: [],
+
+
+				// 鍏朵粬鏁扮粍
+				arrayHDeptName: [], // 鎺ユ敹銆佸彂閫侀儴闂�
+				HDeptNameList: [],
+				arrayHErrMsgBackTypeName: [], // 寮傚父鍙嶉绫诲瀷
+				HErrMsgBackTypeNameList: [],
+				arrayHEquipName: [], //璁惧
+				HEquipNameList: [],
+				arrayHMouldName: [], //妯″叿
+				HMouldNameList: [],
+
+				isEdit: false,
+
+				hform: {
+					HBillNo: '',
+					HInterID: '',
+					HDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+					HReceiveDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+					HReceiveNote: '',
+					HContext: '',
+					HDescription: '',
+					HRemark: '',
+
+					HErrMsgBackTypeName: '',
+					HErrMsgBackTypeID: '0',
+					HDeptName: getUserInfo().HDeptName,
+					HDeptID: getUserInfo().HDeptID,
+					HReceiveName: getUserInfo().HDeptName,
+					HReceiveID: getUserInfo().HDeptID,
+
+					HSendMan: getUserInfo().Czymc, //鍙戦�佷汉
+					HReceiveMan: getUserInfo().HEmpName, //鎺ユ敹浜�
+					HRelationEmpName: getUserInfo().HEmpName, //鍏宠仈
+					HRelationEmpID: getUserInfo().HEmpID,
+					HHandleEmpName: getUserInfo().HEmpName, //澶勭悊浜�
+					HHandleEmpID: getUserInfo().HEmpID,
+					HCopyMan: '',
+
+
+					HHandleAdvise: '',
+					HLevel: '鏅��',
+					HBillTypeName: '',
+					HPlanBillNo: '',
+					HMaterNumber: '',
+					HMaterName: '',
+					HMaterModel: '',
+
+					// 鏂版坊鍔犵殑瀛楁
+
+
+					HEquipName: '', // 璁惧
+					HEquipID: '0', // 璁惧ID
+					HMouldName: '', // 妯″叿
+					HMouldID: '0', // 妯″叿ID
+
+					HMainSourceBillNo: '',
+					HMainSourceInterID: '0',
+					HMainSourceEntryID: '0',
+					HMainSourceBillType: '',
+
+					HErrMsgBackBillNo: '',
+					HErrMsgBackInterID: '0',
+					HErrMsgBackEntryID: '0',
+
+					HMaker: getUserInfo().Czymc,
+					HMakeDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+					HUpDater: '',
+					HUpDateDate: '',
+					HChecker: '',
+					HCheckDate: '',
+					HDeleteMan: '', // 浣滃簾浜�
+					HDeleteDate: '', // 浣滃簾鏃ユ湡
+				}
+			}
+		},
+		onLoad(e) {
+			this.getListData()
+			if (!e.OperationType) {
+				this.OperationType = 1
+			} else {
+				this.OperationType = e.OperationType
+			}
+
+			if (this.OperationType == 1) {
+				// 鏂板
+				this.getMaxNum()
+			} else if (this.OperationType == 2) {
+				// 鏈夋簮鍗�
+				this.getMaxNum()
+			} else if (this.OperationType == 3) {
+				// 缂栬緫
+				this.getEditData(e.hmainid)
+			} else if (this.OperationType == 4) {
+				// 娴忚
+			}
+		},
+		computed: {
+			containerHeight: {
+				get() {
+					return this.btnTop - this.tabsBottom - 5
+				}
+			}
+		},
+		onReady() {
+			const query = uni.createSelectorQuery().in(this)
+			query.select("#buttons")
+				.boundingClientRect()
+				.select("#tabs")
+				.boundingClientRect()
+				.exec(res => {
+					this.btnTop = Math.floor(res[0].top)
+					this.tabsBottom = Math.ceil(res[1].bottom)
+				})
+		},
+		methods: {
+			//閫夋嫨鍙戦�侀儴闂� 
+			HDeptNameChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HDeptID = this.HDeptNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨鎺ユ敹閮ㄩ棬
+			HRecceiveChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HReceiveID = this.HDeptNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨寮傚父鍙嶉绫诲瀷
+			HErrMsgBackTypeNameChange(e) {
+				for (var i = 0; i < this.HErrMsgBackTypeNameList.length; i++) {
+					if (this.HErrMsgBackTypeNameList[i].寮傚父鍙嶉绫诲瀷鍚嶇О == e) {
+						this.hform.HErrMsgBackTypeName = this.HErrMsgBackTypeNameList[i].寮傚父鍙嶉绫诲瀷鍚嶇О;
+						this.hform.HErrMsgBackTypeID = this.HErrMsgBackTypeNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨鍙戦�佷汉
+			HSendManChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+
+					}
+				}
+			},
+			//閫夋嫨鎺ユ敹浜�
+			HReceiveManChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+
+					}
+				}
+			},
+			//閫夋嫨鍏宠仈浜�
+			HRelationEmpNameChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HRelationEmpID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			//閫夋嫨澶勭悊浜�
+			HHandleEmpChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HHandleEmpID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			//閫夋嫨鎶勯�佷汉
+			HCopyManChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+
+					}
+				}
+			},
+			//閫夋嫨璁惧 
+			HEquipNameChange(e) {
+				for (var i = 0; i < this.HEquipNameList.length; i++) {
+					if (this.HEquipNameList[i].HName == e) {
+						this.hform.HEquipName = this.HEquipNameList[i].HName;
+						this.hform.HEquipID = this.HEquipNameList[i].HInterID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨妯″叿 
+			HMouldIDNameChange(e) {
+				for (var i = 0; i < this.HMouldNameList.length; i++) {
+					if (this.HMouldNameList[i].HName == e) {
+						this.hform.HMouldName = this.HMouldNameList[i].HName;
+						this.hform.HMouldID = this.HMouldNameList[i].HInterID;
+						break;
+					}
+				}
+			},
+			// 闈欐�佷笅鎷夋閫夋嫨鏂规硶
+			HLevelChange(e) {
+				this.hform.HLevel = e;
+			},
+			//鏂板鎸夐挳浜嬩欢
+			addNew() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛岀‘瀹氳鏂板鍚楋紵',
+					success: (res) => {
+						if (res.confirm) {
+							uni.redirectTo({
+								url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill?operationType=1'
+							})
+							// 閲嶆柊鑾峰彇鏈�澶у崟鎹彿
+							this.getMaxNum();
+							// 鍒囨崲鍒板熀鏈俊鎭〉绛�
+							this.tabs = 0;
+						}
+					}
+				});
+			},
+			// 鑾峰彇鎵�鏈夊垪琛ㄦ暟鎹�
+			async getListData() {
+				// 鑾峰彇閮ㄩ棬鍒楄〃
+				await this.getDepartmentList();
+				// 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
+				await this.getHErrMesTypeList();
+				// 鑾峰彇浜哄憳鍒楄〃锛堟帴鏀朵汉銆佸鐞嗕汉銆佹妱閫佷汉銆佽矗浠讳汉銆丵E璐d换浜猴級
+				await this.getPersonList();
+				// 鑾峰彇璁惧鍒楄〃
+				await this.getEquipList();
+				// 鑾峰彇妯″叿鍒楄〃
+				await this.getModList();
+			},
+
+			// 鑾峰彇閮ㄩ棬鍒楄〃
+			getDepartmentList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Department/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HDeptNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: res.data.Message,
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			// 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
+			getHErrMesTypeList() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetGy_ErrMsgBackTypeList_Json',
+					data: {
+						ErrMsg: "",
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HErrMsgBackTypeNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHErrMsgBackTypeName[i] = res.data.data[i].寮傚父鍙嶉绫诲瀷鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '鑾峰彇寮傚父鍙嶉绫诲瀷淇℃伅澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鑾峰彇寮傚父鍙嶉绫诲瀷淇℃伅澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			// 鑾峰彇浜哄憳鍒楄〃锛堥�氱敤鏂规硶锛�
+			getPersonList() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetEmployeeList_Json',
+					data: {
+						Employee: '',
+						HGroupID: 0
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HEmpNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHEmpName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			// 鑾峰彇璁惧鍒楄〃
+			getEquipList() {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/GetEquipList_Json',
+					data: {
+						Equip: "",
+						HCenterID: 0 //uni.getStorageSync("HWorkCenterID")
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HEquipNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHEquipName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: res.data.Message,
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			// 鑾峰彇妯″叿鍒楄〃
+			getModList() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetGy_MouldFileMainList_Json',
+					data: {
+						MouldFileMain: ""
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HMouldNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHMouldName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: res.data.Message,
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			//鏂板
+			getMaxNum() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetMAXNum',
+					data: {
+						HBillType: '4529'
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.hform.HInterID = res.data.data[0].HInterID
+							this.hform.HBillNo = res.data.data[0].HBillNo
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			getEditData(HInterID) {
+				uni.showLoading({
+					title: '鍔犺浇涓�'
+				});
+				uni.request({
+					url: this.serverUrl + '/Sc_MESTransFerWorkBill/Edit_OA_ErrMsgBackReceiveBill',
+					data: {
+						"HID": HInterID
+					},
+					success: (res) => {
+						uni.hideLoading();
+						console.log('缂栬緫鏁版嵁:', res);
+						if (res.data.code == 1) {
+							const data = res.data.data[0]; // 娉ㄦ剰杩欓噷鏀逛负data[0]
+							this.hform = {
+								...this.hform, // 淇濈暀鍘熸湁鐨勯粯璁ゅ��
+								HInterID: data["hmainid"] || '',
+								HEntryID: data["HEntryID"] || '',
+								HBillNo: data["鍗曟嵁鍙�"] || '',
+								HDate: data["鏃ユ湡"] ? dayjs(data["鏃ユ湡"]).format("YYYY-MM-DD") : dayjs(
+									new Date()).format("YYYY-MM-DD"),
+
+								HErrMsgBackTypeID: data["HErrMsgBackTypeID"] || '0',
+								HErrMsgBackTypeName: data["寮傚父绫诲瀷"] || '',
+								HContext: data["涓婚"] || '',
+								HDescription: data["鍐呭"] || '',
+
+								HDeptID: data["HDeptID"] || '0',
+								HDeptName: data["鍙戦�侀儴闂�"] || '',
+								HReceiveID: data["HReceiveID"] || '0', // 鏂板瀛楁
+								HReceiveName: data["鎺ユ敹閮ㄩ棬"] || '',
+
+								HSendMan: data["鍙戦�佷汉"] || '',
+								HReceiveMan: data["鎺ユ敹浜�"] || '',
+								HCopyMan: data["鎶勯�佷汉"] || '',
+
+								HBillTypeName: data["鍗曟嵁绫诲瀷"] || '',
+								HPlanBillNo: data["鍗曟嵁鍙风爜"] || '',
+								HMaterName: data["浜у搧鍚嶇О"] || '',
+								HMaterModel: data["瑙勬牸鍨嬪彿"] || '',
+
+								HEquipID: data["HEquipID"] || '0',
+								HEquipName: data["璁惧鍚嶇О"] || '',
+
+								HMouldID: data["HMouldID"] || '0', // 淇瀛楁鍚�
+								HMouldName: data["妯℃不鍏峰悕绉�"] || '',
+
+								HRelationEmpID: data["HRelationEmpID"] || '0',
+								HRelationEmpName: data["鍏宠仈浜�"] || '',
+								HReceiveNote: data["鎺ユ敹纭"] || '', 
+								HReceiveDate: data["鎺ユ敹纭鏃堕棿"] ? dayjs(data["鎺ユ敹纭鏃堕棿"]).format(
+									"YYYY-MM-DD HH:mm:ss") : '',
+								HHandleEmpID: data["HHandleEmpID"] || '0',
+								HandleEmpName: data["鎸囨淳澶勭悊浜�"] || '',
+								HHandleAdvise: data["澶勭悊寤鸿"] || '', 
+
+
+								HMainSourceInterID: data["婧愬崟ID"] || '0',
+								HMainSourceEntryID: data["婧愬崟瀛怚D"] || '0',
+								HMainSourceBillNo: data["婧愬崟鍗曞彿"] || '',
+								HMainSourceBillType: data["婧愬崟绫诲瀷"] || '',
+
+								HErrMsgBackBillNo: data["寮傚父鍙嶉鍗曞彿"] || '', 
+								HErrMsgBackInterID: data["寮傚父鍙嶉鍗曚富鍐呯爜"] || '0',
+								HErrMsgBackEntryID: data["寮傚父鍙嶉鍗曞瓙鍐呯爜"] || '0',
+
+								HRemark: data["琛ㄥご澶囨敞"] || '',
+								HMaker: data["鍒跺崟浜�"] || this.userInfo.Czymc || '',
+								HMakeDate: data["鍒跺崟鏃ユ湡"] ? dayjs(data["鍒跺崟鏃ユ湡"]).format("YYYY-MM-DD") : dayjs(
+									new Date()).format("YYYY-MM-DD"),
+
+								HUpDater: data["淇敼浜�"] || this.userInfo.Czymc || '',
+								HUpDateDate: data["淇敼鏃ユ湡"] ? dayjs(data["淇敼鏃ユ湡"]).format("YYYY-MM-DD") :
+									dayjs(new Date()).format("YYYY-MM-DD"),
+
+								HChecker: data["瀹℃牳浜�"] || '',
+								HCheckDate: data["瀹℃牳鏃ユ湡"] ? dayjs(data["瀹℃牳鏃ユ湡"]).format("YYYY-MM-DD") : '',
+
+								HDeleteMan: data["浣滃簾浜�"] || '',
+								HDeleteDate: data["浣滃簾鏃ユ湡"] ? dayjs(data["浣滃簾鏃ユ湡"]).format("YYYY-MM-DD") : '',
+
+								HLevel: data["绱ф�ョ▼搴�"] || '鏅��'
+							};
+
+							this.isEdit = true;
+						} else {
+							uni.showToast({
+								title: res.data.msg || '鑾峰彇缂栬緫鏁版嵁澶辫触',
+								icon: 'none'
+							});
+						}
+					},
+					fail: (res) => {
+						uni.hideLoading();
+						console.log('缂栬緫鏁版嵁璇锋眰澶辫触:', res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						});
+					}
+				});
+			},
+
+			submit() {
+				if (!this.hform.HReceiveMan) {
+					uni.showToast({
+						title: '璇烽�夋嫨鎺ユ敹浜�',
+						icon: 'none'
+					})
+				} else {
+					uni.showLoading({
+						title: '璇风◢鍊�'
+					})
+					if (this.OperationType == 1 || this.OperationType == 2 || this.OperationType == 4) {
+						this.refSav = "Add";
+					}
+					//鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+					if (this.OperationType == 3) {
+						this.refSav = "Update";
+						this.hform.HUpdater = getUserInfo().Czymc;
+						this.hform.HUpdaterDate = dayjs(new Date()).format("YYYY-MM-DD");
+					}
+					var sMainStr = JSON.stringify(this.hform);
+					var sMainSub = sMainStr + ';' + this.refSav + ';' + uni.getStorageSync('HUserName')
+					uni.request({
+						url: this.serverUrl + '/Sc_MESTransFerWorkBill/SaveOA_ErrMsgBackReceiveBill_APP',
+						method: 'POST',
+						dataType: "json",
+						data: {
+							"msg": sMainSub
+						},
+						success: (res) => {
+							console.log(1, res);
+							uni.hideLoading()
+							if (res.data.count == 1) {
+								if (res.data.Verify == "Y") { //鑷姩瀹℃牳
+									this.SaveVerify(res.data.HInterID) //瀹℃牳
+								} else {
+									uni.showModal({
+										title: '鎻愮ず',
+										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+										success: (res) => {
+											if (res.confirm) {
+												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+												uni.redirectTo({
+													url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill?operationType=1'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 50)
+											}
+										}
+									});
+								}
+							}
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					});
+				}
+			},
+
+			SaveVerify(HInterID) {
+				var datas = {
+					HInterID: HInterID,
+					IsAudit: 0,
+					CurUserName: getUserInfo().Czymc
+				}
+				uni.request({
+					url: this.serverUrl + '/Sc_MESTransFerWorkBill/AuditOA_ErrMsgBackSignBill',
+					method: 'GET',
+					dataType: "json",
+					async: true,
+					data: datas,
+					success: (res) => {
+						uni.showModal({
+							title: '鎻愮ず',
+							content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+							success: (res) => {
+								if (res.confirm) {
+									console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+									uni.redirectTo({
+										url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill?operationType=1'
+									})
+								} else if (res.cancel) {
+									console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+									setTimeout(() => {
+										uni.navigateBack();
+									}, 50)
+								}
+							}
+						});
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			goBack() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBillList.vue
similarity index 84%
copy from pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue
copy to pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBillList.vue
index 19b1b9a..63447c4 100644
--- a/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBillList.vue
@@ -49,27 +49,54 @@
 		</view>
 		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
 		<scroll-view id="pageContent" scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
-			<view v-for="(item,index) in listData" :key="index">
-				<uni-card :title="item.浜у搧妯″叿" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+			<view class="list" v-for="(item,index) in listData" :key="index">
+				<uni-card :title="item.鍗曟嵁鐘舵��" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
 					@tap="showDetail = showDetail==index?-1:index">
 					<view class="card-detail">
-						<view class="detail" v-if="item.浜у搧妯″叿缂栫爜">
-							<text>浜у搧妯″叿缂栫爜锛�</text>{{item.浜у搧妯″叿缂栫爜}}
+						<view class="detail" v-if="item.浜у搧鍚嶇О">
+							<text>浜у搧鍚嶇О锛�</text>{{item.浜у搧鍚嶇О}}
 						</view>
-						<view class="detail" v-if="item.淇濆吇璁″垝缂栧彿">
-							<text>淇濆吇璁″垝缂栧彿锛�</text>{{item.淇濆吇璁″垝缂栧彿}}
+						<view class="detail" v-if="item.涓婚">
+							<text>涓婚锛�</text>{{item.涓婚}}
 						</view>
-						<view class="detail" v-if="item.淇濆吇瑙勭▼缂栧彿">
-							<text>淇濆吇瑙勭▼缂栧彿锛�</text>{{item.淇濆吇瑙勭▼缂栧彿}}
+						<view class="detail" v-if="item.鍐呭">
+							<text>鍐呭锛�</text>{{item.鍐呭}}
 						</view>
-						<view class="detail" v-if="item.淇濆吇寮�濮嬫棩鏈�">
-							<text>淇濆吇寮�濮嬫棩鏈燂細</text>{{item.淇濆吇寮�濮嬫棩鏈�.substr(0,10)}}
+						<view class="detail" v-if="item.寮傚父绫诲瀷">
+							<text>寮傚父绫诲瀷锛�</text>{{item.寮傚父绫诲瀷}}
 						</view>
-						<view class="detail" v-if="item.淇濆吇缁撴潫鏃ユ湡">
-							<text>淇濆吇缁撴潫鏃ユ湡锛�</text>{{item.淇濆吇缁撴潫鏃ユ湡.substr(0,10)}}
+						<view class="detail" v-if="item.鍙戦�侀儴闂�">
+							<text>鍙戦�侀儴闂細</text>{{item.鍙戦�侀儴闂▆}
 						</view>
-						<view class="detail" v-if="item.鏈�缁堢粨璁�">
-							<text>鏈�缁堢粨璁猴細</text>{{item.鏈�缁堢粨璁簘}
+						<view class="detail" v-if="item.鎺ユ敹閮ㄩ棬">
+							<text>鎺ユ敹閮ㄩ棬锛�</text>{{item.鎺ユ敹閮ㄩ棬}}
+						</view>
+						<view class="detail" v-if="item.鍙戦�佷汉">
+							<text>鍙戦�佷汉锛�</text>{{item.鍙戦�佷汉}}
+						</view>
+						<view class="detail" v-if="item.鍏宠仈浜�">
+							<text>鍏宠仈浜猴細</text>{{item.鍏宠仈浜簘}
+						</view>
+						<view class="detail" v-if="item.鎸囨淳澶勭悊浜�">
+							<text>鎸囨淳澶勭悊浜猴細</text>{{item.鎸囨淳澶勭悊浜簘}
+						</view>
+						<view class="detail" v-if="item.鎶勯�佷汉">
+							<text>鎶勯�佷汉锛�</text>{{item.鎶勯�佷汉}}
+						</view>
+						<view class="detail" v-if="item.璁惧鍚嶇О">
+							<text>璁惧鍚嶇О锛�</text>{{item.璁惧鍚嶇О}}
+						</view>
+						<view class="detail" v-if="item.妯℃不鍏峰悕绉�">
+							<text>妯℃不鍏峰悕绉帮細</text>{{item.妯℃不鍏峰悕绉皚}
+						</view>
+						<view class="detail" v-if="item.澶勭悊鎰忚">
+							<text>澶勭悊鎰忚锛�</text>{{item.澶勭悊鎰忚}}
+						</view>
+						<view class="detail" v-if="item.鎸囨淳澶勭悊浜�">
+							<text>鎸囨淳澶勭悊浜猴細</text>{{item.鎸囨淳澶勭悊浜簘}
+						</view>
+						<view class="detail" v-if="item.寮傚父鍙嶉鍗曞彿">
+							<text>寮傚父鍙嶉鍗曞彿锛�</text>{{item.寮傚父鍙嶉鍗曞彿}}
 						</view>
 					</view>
 					<view class="card-detail" v-if="showDetail == index">
@@ -126,7 +153,6 @@
 					</view>
 
 					<view class="op" v-if="operations == index">
-						<button class="op1" size="mini" plain @tap.stop="toSon(item)">瀛愯〃淇℃伅</button>
 						<button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
 						<button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
 						<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
@@ -150,7 +176,7 @@
 	} from '@/utils/common.js'
 	import {
 		getUserInfo
-	} from '../../../utils/auth'
+	} from '../../../../utils/auth'
 	export default {
 		data() {
 			return {
@@ -292,7 +318,7 @@
 			},
 			get_DisplayPage(sWhere) {
 				CommonUtils.doRequest2({
-					url: '/Sc_MouldMaintainBill/GetMouldMaintainBillListPage',
+					url: '/Sc_MESTransFerWorkBill/Get_OA_ErrMsgBackReceiveBillListPage',
 					data: {
 						"sWhere": sWhere,
 						"user": getUserInfo()["Czymc"],
@@ -316,20 +342,21 @@
 				this.onSearchClickHandler()
 				this.goTop()
 			},
-			// 鏂板妯″叿淇濆吇璁板綍鍗�
+			// 鏂板寮傚父鍙嶉鍗�
 			onAddClickHandler() {
 				uni.navigateTo({
-					url: "/pages/MJGL/mujubaoyangjiludan/form"
+					url: "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill?OperationType=1"
 				})
 			},
-			//缂栬緫淇濆吇璁板綍鍗�
+			//缂栬緫寮傚父鍙嶉绛惧埌鍗�
 			edit(item) {
 				console.log(item)
 				uni.navigateTo({
-					url: '/pages/MJGL/mujubaoyangjiludan/form?hmainid=' + item.hmainid
+					url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill?OperationType=3&hmainid=' +
+						item.hmainid
 				})
 			},
-			//鍒犻櫎淇濆吇璁板綍鍗�
+			//鍒犻櫎寮傚父鍙嶉绛惧埌鍗�
 			del(item) {
 				uni.showModal({
 					title: '鍒犻櫎纭',
@@ -338,7 +365,7 @@
 						if (res.confirm) {
 							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
 							CommonUtils.doRequest2({
-								url: '/Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill',
+								url: '/Sc_MESTransFerWorkBill/DeleteOA_ErrMsgBackReceiveBill',
 								data: {
 									HInterID: item['hmainid'],
 									user: getUserInfo()['Czymc']
@@ -372,13 +399,6 @@
 							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
 						}
 					}
-				});
-			},
-			//瀛愯〃鏌ョ湅
-			toSon(item) {
-				uni.navigateTo({
-					url: '/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList_son?HInterID=' + item.hmainid + '&浜у搧妯″叿=' + item
-						.浜у搧妯″叿 + '&浜у搧妯″叿浠g爜=' + item.浜у搧妯″叿浠g爜,
 				});
 			}
 		},
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue
new file mode 100644
index 0000000..d9c5c84
--- /dev/null
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue
@@ -0,0 +1,989 @@
+<template>
+	<view>
+		<!-- 椤电鍖哄煙 -->
+		<view class="tabs" id="tabs">
+			<view class="tabs">
+				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鍏朵粬淇℃伅</view>
+				<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍒跺崟淇℃伅</view>
+			</view>
+		</view>
+		<!-- 鍩烘湰淇℃伅 -->
+		<template v-if="tabs == 0">
+			<view class="form" :style="{height: containerHeight + 'px',overflow: 'auto' }">
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input name="HBillNo" disabled v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HDate" disabled v-model="hform.HDate" placeholder="璇烽�夋嫨" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">绛惧埌纭:</view>
+					<view class="right">
+						<input name="HSignNote" v-model="hform.HSignNote" placeholder="璇疯緭鍏ユ槸鍚︾鍒�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">绛惧埌鏃堕棿:</view>
+					<view class="righton">
+						<input name="HSignDate" disabled v-model="hform.HSignDate" placeholder="璇烽�夋嫨" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">涓婚:</view>
+					<view class="right">
+						<input name="HContext" v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
+					</view>
+				</view>
+				<view class="form-item" style="align-items: flex-start;">
+					<view class="title"><text>*</text>璇︾粏鍐呭:</view>
+					<view class="right" style="min-height: 150rpx;">
+						<textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1"
+							placeholder="璇疯緭鍏ヨ缁嗗唴瀹�"></textarea>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">寮傚父绫诲瀷:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="璇烽�夋嫨"
+							v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍙戦�侀儴闂�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+							@input="HDeptNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍙戦�佷汉:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鍙戦�佷汉" v-model="hform.HSendMan"
+							@input="HSendManChange"></uni-combox>
+					</view>
+				</view>
+
+				<view class="form-item">
+					<view class="title"><text>*</text>鎺ユ敹浜�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎺ユ敹浜�" v-model="hform.HReceiveMan"
+							@input="HReceiveManChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">绛惧埌浜�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨绛惧埌浜�" v-model="hform.HSignEmpName"
+							@input="HSignEmpNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐩稿叧璁惧:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEquipName" placeholder="璇烽�夋嫨" v-model="hform.HEquipName"
+							@input="HEquipNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐩稿叧妯″叿:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHMouldName" placeholder="璇烽�夋嫨" v-model="hform.HMouldName"
+							@input="HMouldIDNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浜у搧鍚嶇О:</view>
+					<view class="right">
+						<input name="HMaterName" v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瑙勬牸鍨嬪彿:</view>
+					<view class="right">
+						<input name="HMaterModel" v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">澶囨敞:</view>
+					<view class="right" style="min-height: 150rpx;">
+						<input name="HRemark" v-model="hform.HRemark" placeholder="" />
+					</view>
+				</view>
+			</view>
+		</template>
+		<!-- 鍏朵粬淇℃伅 -->
+		<template v-if="tabs == 1">
+			<view class="form">
+				<view class="form-item">
+					<view class="title">鎺ユ敹閮ㄩ棬:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HReceiveName"
+							@input="HRecceiveChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鎶勯�佷汉:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎶勯�佷汉" v-model="hform.HCopyMan"
+							@input="HCopyManChange" multiple></uni-combox>
+					</view>
+				</view>
+
+				<view class="form-item">
+					<view class="title">绱ф�ョ▼搴�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHLevel" placeholder="璇烽�夋嫨绱ф�ョ▼搴�" v-model="hform.HLevel"
+							@input="HLevelChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁绫诲瀷:</view>
+					<view class="righton">
+						<input name="HBillTypeName" disabled v-model="hform.HBillTypeName" placeholder="璇疯緭鍏ュ崟鎹被鍨�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙风爜:</view>
+					<view class="righton">
+						<input name="HPlanBillNo" disabled v-model="hform.HPlanBillNo" placeholder="璇疯緭鍏ュ崟鎹彿鐮�" />
+					</view>
+				</view>
+			</view>
+		</template>
+		<!-- 鍒跺崟淇℃伅 -->
+		<template v-if="tabs == 2">
+			<view class="form">
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HMaker" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HMakeDate" disabled v-model="hform.HMakeDate" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDater" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HUpDateDate" disabled v-model="hform.HUpDateDate" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HChecker" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HCheckDate" disabled v-model="hform.HCheckDate" placeholder="" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteMan" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾鏃ユ湡:</view>
+					<view class="righton">
+						<input name="HDeleteDate" disabled v-model="hform.HDeleteDate" placeholder="" />
+					</view>
+				</view>
+			</view>
+		</template>
+		<view class="buttons" id="buttons">
+			<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			<view style="flex: 1;"></view>
+			<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+			<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+		</view>
+	</view>
+</template>
+<script>
+	import dayjs from "dayjs";
+	import {
+		CommonUtils
+	} from "@/utils/common";
+	import getDateTime from '@/utils/getdateTime.js';
+	import {
+		getUserInfo
+	} from "../../../../utils/auth";
+	import "@/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss"
+	export default {
+		data() {
+			return {
+				tabs: 0,
+				tabsBottom: 0,
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				OperationType: 1,
+				refSav: "",
+
+				arrayHLevel: ['鏅��', '绱ф��'],
+
+				// 浜哄憳鐩稿叧鏁扮粍
+				arrayHEmpName: [], // 鎺ユ敹浜� 鍙戦�佷汉 澶勭悊浜� 璐d换浜� 鎶勯�佷汉 QE璐d换浜�
+				HEmpNameList: [],
+
+
+				// 鍏朵粬鏁扮粍
+				arrayHDeptName: [], // 鎺ユ敹銆佸彂閫侀儴闂�
+				HDeptNameList: [],
+				arrayHErrMsgBackTypeName: [], // 寮傚父鍙嶉绫诲瀷
+				HErrMsgBackTypeNameList: [],
+				arrayHEquipName: [], //璁惧
+				HEquipNameList: [],
+				arrayHMouldName: [], //妯″叿
+				HMouldNameList: [],
+
+				isEdit: false,
+
+				hform: {
+					HBillNo: '',
+					HInterID: '',
+					HDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+					HSignDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+					HSignNote: '',
+					HContext: '',
+					HDescription: '',
+					HRemark: '',
+
+					HErrMsgBackTypeName: '',
+					HErrMsgBackTypeID: '0',
+					HDeptName: getUserInfo().HDeptName,
+					HDeptID: getUserInfo().HDeptID,
+					HReceiveName: getUserInfo().HDeptName,
+					HReceiveID: getUserInfo().HDeptID,
+
+					HSendMan: getUserInfo().Czymc, //鍙戦�佷汉
+					HReceiveMan: getUserInfo().HEmpName, //鎺ユ敹浜�
+					HSignEmpName: getUserInfo().HEmpName, //绛惧埌
+					HSignEmpID: getUserInfo().HEmpID,
+					HCopyMan: '',
+
+
+
+					HLevel: '鏅��',
+					HBillTypeName: '',
+					HPlanBillNo: '',
+					HMaterNumber: '',
+					HMaterName: '',
+					HMaterModel: '',
+
+					// 鏂版坊鍔犵殑瀛楁
+
+
+					HEquipName: '', // 璁惧
+					HEquipID: '0', // 璁惧ID
+					HMouldName: '', // 妯″叿
+					HMouldID: '0', // 妯″叿ID
+
+					HMainSourceBillNo: '',
+					HMainSourceInterID: '0',
+					HMainSourceEntryID: '0',
+					HMainSourceBillType: '',
+
+					HErrMsgBackBillNo: '',
+					HErrMsgBackInterID: '0',
+					HErrMsgBackEntryID: '0',
+
+					HMaker: getUserInfo().Czymc,
+					HMakeDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+					HUpDater: '',
+					HUpDateDate: '',
+					HChecker: '',
+					HCheckDate: '',
+					HDeleteMan: '', // 浣滃簾浜�
+					HDeleteDate: '', // 浣滃簾鏃ユ湡
+				}
+			}
+		},
+		onLoad(e) {
+			this.getListData()
+			if (!e.OperationType) {
+				this.OperationType = 1
+			} else {
+				this.OperationType = e.OperationType
+			}
+			// 鏂板锛氳幏鍙栬矾鐢卞弬鏁�
+			this.linterid = e.linterid || ''
+			this.HEntryID = e.HEntryID || '0'
+			this.HSouceBillType = e.HSouceBillType || ''
+
+			if (this.OperationType == 1) {
+				// 鏂板
+				this.getMaxNum()
+			} else if (this.OperationType == 2) {
+				// 鏈夋簮鍗�
+				this.getMaxNum()
+				// 鑾峰彇婧愬崟鏁版嵁骞惰祴鍊�
+				this.getSourceData(this.linterid, this.HEntryID, this.HSouceBillType)
+			} else if (this.OperationType == 3) {
+				// 缂栬緫
+				this.getEditData(e.hmainid)
+			} else if (this.OperationType == 4) {
+				// 娴忚
+			}
+		},
+		computed: {
+			containerHeight: {
+				get() {
+					return this.btnTop - this.tabsBottom - 5
+				}
+			}
+		},
+		onReady() {
+			const query = uni.createSelectorQuery().in(this)
+			query.select("#buttons")
+				.boundingClientRect()
+				.select("#tabs")
+				.boundingClientRect()
+				.exec(res => {
+					this.btnTop = Math.floor(res[0].top)
+					this.tabsBottom = Math.ceil(res[1].bottom)
+				})
+		},
+		methods: {
+			//閫夋嫨鍙戦�侀儴闂� 
+			HDeptNameChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HDeptID = this.HDeptNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨鎺ユ敹閮ㄩ棬
+			HRecceiveChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HReceiveID = this.HDeptNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨寮傚父鍙嶉绫诲瀷
+			HErrMsgBackTypeNameChange(e) {
+				for (var i = 0; i < this.HErrMsgBackTypeNameList.length; i++) {
+					if (this.HErrMsgBackTypeNameList[i].寮傚父鍙嶉绫诲瀷鍚嶇О == e) {
+						this.hform.HErrMsgBackTypeName = this.HErrMsgBackTypeNameList[i].寮傚父鍙嶉绫诲瀷鍚嶇О;
+						this.hform.HErrMsgBackTypeID = this.HErrMsgBackTypeNameList[i].HItemID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨鍙戦�佷汉
+			HSendManChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+
+					}
+				}
+			},
+			//閫夋嫨鎺ユ敹浜�
+			HReceiveManChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+
+					}
+				}
+			},
+			//閫夋嫨绛惧埌浜�
+			HSignEmpNameChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HSignEmpID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			//閫夋嫨鎶勯�佷汉
+			HCopyManChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+
+					}
+				}
+			},
+			//閫夋嫨璁惧 
+			HEquipNameChange(e) {
+				for (var i = 0; i < this.HEquipNameList.length; i++) {
+					if (this.HEquipNameList[i].HName == e) {
+						this.hform.HEquipName = this.HEquipNameList[i].HName;
+						this.hform.HEquipID = this.HEquipNameList[i].HInterID;
+						break;
+					}
+				}
+			},
+			//閫夋嫨妯″叿 
+			HMouldIDNameChange(e) {
+				for (var i = 0; i < this.HMouldNameList.length; i++) {
+					if (this.HMouldNameList[i].HName == e) {
+						this.hform.HMouldName = this.HMouldNameList[i].HName;
+						this.hform.HMouldID = this.HMouldNameList[i].HInterID;
+						break;
+					}
+				}
+			},
+			// 闈欐�佷笅鎷夋閫夋嫨鏂规硶
+			HLevelChange(e) {
+				this.hform.HLevel = e;
+			},
+			//鏂板鎸夐挳浜嬩欢
+			addNew() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛岀‘瀹氳鏂板鍚楋紵',
+					success: (res) => {
+						if (res.confirm) {
+							uni.redirectTo({
+								url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill?operationType=1'
+							})
+							// 閲嶆柊鑾峰彇鏈�澶у崟鎹彿
+							this.getMaxNum();
+							// 鍒囨崲鍒板熀鏈俊鎭〉绛�
+							this.tabs = 0;
+						}
+					}
+				});
+			},
+			// 鑾峰彇鎵�鏈夊垪琛ㄦ暟鎹�
+			getListData() {
+				// 鑾峰彇閮ㄩ棬鍒楄〃
+				this.getDepartmentList();
+				// 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
+				this.getHErrMesTypeList();
+				// 鑾峰彇浜哄憳鍒楄〃锛堟帴鏀朵汉銆佸鐞嗕汉銆佹妱閫佷汉銆佽矗浠讳汉銆丵E璐d换浜猴級
+				this.getPersonList();
+				// 鑾峰彇璁惧鍒楄〃
+				this.getEquipList();
+				// 鑾峰彇妯″叿鍒楄〃
+				this.getModList();
+			},
+
+			// 鑾峰彇閮ㄩ棬鍒楄〃
+			getDepartmentList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Department/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HDeptNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: res.data.Message,
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			// 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
+			getHErrMesTypeList() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetGy_ErrMsgBackTypeList_Json',
+					data: {
+						ErrMsg: "",
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HErrMsgBackTypeNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHErrMsgBackTypeName[i] = res.data.data[i].寮傚父鍙嶉绫诲瀷鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '鑾峰彇寮傚父鍙嶉绫诲瀷淇℃伅澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鑾峰彇寮傚父鍙嶉绫诲瀷淇℃伅澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			// 鑾峰彇浜哄憳鍒楄〃锛堥�氱敤鏂规硶锛�
+			getPersonList() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetEmployeeList_Json',
+					data: {
+						Employee: '',
+						HGroupID: 0
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HEmpNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHEmpName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			// 鑾峰彇璁惧鍒楄〃
+			getEquipList() {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/GetEquipList_Json',
+					data: {
+						Equip: "",
+						HCenterID: 0 //uni.getStorageSync("HWorkCenterID")
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HEquipNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHEquipName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: res.data.Message,
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			// 鑾峰彇妯″叿鍒楄〃
+			getModList() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetGy_MouldFileMainList_Json',
+					data: {
+						MouldFileMain: ""
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HMouldNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHMouldName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: res.data.Message,
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			//鏂板
+			getMaxNum() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetMAXNum',
+					data: {
+						HBillType: '4530'
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.hform.HInterID = res.data.data[0].HInterID
+							this.hform.HBillNo = res.data.data[0].HBillNo
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			// 鑾峰彇婧愬崟鏁版嵁骞惰祴鍊�
+			getSourceData(HInterID, HEntryID, HSouceBillType) {
+				let num = 1
+				if (HSouceBillType == '4502') {
+					num = 1 // 寮傚父鍙嶉鍗�
+				} else if (HSouceBillType == '4529') {
+					num = 2 // 寮傚父鍙嶉鎺ユ敹鍗�
+				}
+
+				uni.request({
+					url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_OA_ErrMsgBackList',
+					method: 'GET',
+					data: {
+						"HInterID": HInterID,
+						"HEntryID": HEntryID,
+						"user": uni.getStorageSync('HUserName'),
+						"num": num
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							const LoadData = res.data.data[0]
+
+							if (num == 1) {
+								// 寮傚父鍙嶉鍗�
+								this.hform.HDeptID = LoadData.HDeptID
+								this.hform.HDeptName = LoadData.鍙戦�侀儴闂�
+								this.hform.HReceiveID = LoadData.HRecDeptID
+								this.hform.HReceiveName = LoadData.鎺ユ敹閮ㄩ棬
+								this.hform.HErrMsgBackTypeID = LoadData.HErrMsgBackTypeID
+								this.hform.HErrMsgBackTypeName = LoadData.寮傚父绫诲瀷鍚嶇О
+								this.hform.HSendMan = LoadData.鍙戦�佷汉
+								this.hform.HReceiveMan = LoadData.鎸囨淳澶勭悊浜�
+								this.hform.HCopyMan = LoadData.鎶勯��
+								this.hform.HLevel = LoadData.绱ф�ョ▼搴�
+								this.hform.HContext = LoadData.涓婚
+								this.hform.HDescription = LoadData.璇︾粏鍐呭
+								this.hform.HMaterName = LoadData.鐗╂枡鍚嶇О
+								this.hform.HMaterModel = LoadData.瑙勬牸鍨嬪彿
+								this.hform.HEquipID = LoadData.璁惧id
+								this.hform.HEquipName = LoadData.璁惧鍚嶇О
+								this.hform.HMouldID = LoadData.妯″叿id
+								this.hform.HMouldName = LoadData.妯″叿鍚嶇О
+								this.hform.HBillTypeName = HSouceBillType
+								this.hform.HPlanBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceInterID = LoadData.HInterID
+								this.hform.HMainSourceEntryID = LoadData.HEntryID
+								this.hform.HMainSourceBillType = HSouceBillType
+								this.hform.HErrMsgBackBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HErrMsgBackInterID = LoadData.HInterID
+								this.hform.HErrMsgBackEntryID = LoadData.HEntryID
+								this.hform.HSignEmpID = LoadData.HHandleEmpID
+								this.hform.HSignEmpName = LoadData.鎸囨淳澶勭悊浜�
+							} else if (num == 2) {
+								// 寮傚父鍙嶉鎺ユ敹鍗�
+								this.hform.HDeptID = LoadData.HDeptID
+								this.hform.HDeptName = LoadData.鍙戦�侀儴闂�
+								this.hform.HReceiveID = LoadData.HReceiveID == undefined ? 0 : LoadData
+									.HReceiveID
+								this.hform.HReceiveName = LoadData.鎺ユ敹閮ㄩ棬
+								this.hform.HErrMsgBackTypeID = LoadData.HErrMsgBackTypeID
+								this.hform.HErrMsgBackTypeName = LoadData.寮傚父绫诲瀷鍚嶇О
+								this.hform.HSendMan = LoadData.鍙戦�佷汉
+								this.hform.HReceiveMan = LoadData.鎺ユ敹浜�
+								this.hform.HCopyMan = LoadData.鎶勯�佷汉
+								this.hform.HLevel = LoadData.绱ф�ョ▼搴�
+								this.hform.HContext = LoadData.涓婚
+								this.hform.HDescription = LoadData.璇︾粏鍐呭
+								this.hform.HMaterName = LoadData.浜у搧鍚嶇О
+								this.hform.HMaterModel = LoadData.瑙勬牸鍨嬪彿
+								this.hform.HBillTypeName = HSouceBillType
+								this.hform.HPlanBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HEquipID = LoadData.HEquipID
+								this.hform.HEquipName = LoadData.璁惧鍚嶇О
+								this.hform.HMouldID = LoadData.HMouldID
+								this.hform.HMouldName = LoadData.妯℃不鍏峰悕绉�
+								this.hform.HMainSourceBillNo = LoadData.鍗曟嵁鍙�
+								this.hform.HMainSourceInterID = LoadData.hmainid
+								this.hform.HMainSourceEntryID = LoadData.HEntryID == undefined ? "0" : LoadData
+									.HEntryID
+								this.hform.HMainSourceBillType = HSouceBillType
+								this.hform.HSignEmpID = LoadData.HHandleEmpID
+								this.hform.HSignEmpName = LoadData.鎸囨淳澶勭悊浜�
+							}
+
+							// 寮哄埗鏇存柊瑙嗗浘
+							this.$forceUpdate()
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: res.data.msg,
+							icon: 'none'
+						})
+					},
+				})
+			},
+			//缂栬緫
+			getEditData(HInterID) {
+				uni.showLoading({
+					title: '鍔犺浇涓�'
+				});
+				uni.request({
+					url: this.serverUrl + '/Sc_MESTransFerWorkBill/Edit_OA_ErrMsgBackSignBill',
+					data: {
+						"HID": HInterID
+					},
+					success: (res) => {
+						uni.hideLoading();
+						console.log('缂栬緫鏁版嵁:', res);
+						if (res.data.code == 1) {
+							const data = res.data.data[0]; // 娉ㄦ剰杩欓噷鏀逛负data[0]
+							this.hform = {
+								...this.hform, // 淇濈暀鍘熸湁鐨勯粯璁ゅ��
+								HInterID: data["hmainid"] || '',
+								HEntryID: data["HEntryID"] || '',
+								HBillNo: data["鍗曟嵁鍙�"] || '',
+								HDate: data["鏃ユ湡"] ? dayjs(data["鏃ユ湡"]).format("YYYY-MM-DD") : dayjs(
+									new Date()).format("YYYY-MM-DD"),
+
+								HErrMsgBackTypeID: data["HErrMsgBackTypeID"] || '0',
+								HErrMsgBackTypeName: data["寮傚父绫诲瀷"] || '',
+								HContext: data["涓婚"] || '',
+								HDescription: data["鍐呭"] || '',
+
+								HDeptID: data["HDeptID"] || '0',
+								HDeptName: data["鍙戦�侀儴闂�"] || '',
+								HReceiveID: data["HReceiveID"] || '0', // 鏂板瀛楁
+								HReceiveName: data["鎺ユ敹閮ㄩ棬"] || '',
+
+								HSendMan: data["鍙戦�佷汉"] || '',
+								HReceiveMan: data["鎺ユ敹浜�"] || '',
+								HCopyMan: data["鎶勯�佷汉"] || '',
+
+								HBillTypeName: data["鍗曟嵁绫诲瀷"] || '',
+								HPlanBillNo: data["鍗曟嵁鍙风爜"] || '',
+								HMaterName: data["浜у搧鍚嶇О"] || '',
+								HMaterModel: data["瑙勬牸鍨嬪彿"] || '',
+
+								HEquipID: data["HEquipID"] || '0',
+								HEquipName: data["璁惧鍚嶇О"] || '',
+
+								HMouldID: data["HMouldID"] || '0', // 淇瀛楁鍚�
+								HMouldName: data["妯℃不鍏峰悕绉�"] || '',
+
+								HSignEmpID: data["HSignEmpID"] || '0',
+								HSignEmpName: data["绛惧埌浜�"] || '',
+								HSignNote: data["绛惧埌纭"] || '', // 鏂板瀛楁
+								HSignDate: data["绛惧埌鏃堕棿"] ? dayjs(data["绛惧埌鏃堕棿"]).format(
+									"YYYY-MM-DD HH:mm:ss") : '',
+
+
+								HMainSourceInterID: data["婧愬崟ID"] || '0',
+								HMainSourceEntryID: data["婧愬崟瀛怚D"] || '0',
+								HMainSourceBillNo: data["婧愬崟鍗曞彿"] || '',
+								HMainSourceBillType: data["婧愬崟绫诲瀷"] || '',
+
+								HErrMsgBackBillNo: data["寮傚父鍙嶉鍗曞彿"] || '', // 鏂板瀛楁
+								HErrMsgBackInterID: data["寮傚父鍙嶉鍗曚富鍐呯爜"] || '0', // 鏂板瀛楁
+								HErrMsgBackEntryID: data["寮傚父鍙嶉鍗曞瓙鍐呯爜"] || '0', // 鏂板瀛楁
+
+								HRemark: data["琛ㄥご澶囨敞"] || '',
+								HMaker: data["鍒跺崟浜�"] || this.userInfo.Czymc || '',
+								HMakeDate: data["鍒跺崟鏃ユ湡"] ? dayjs(data["鍒跺崟鏃ユ湡"]).format(
+									"YYYY-MM-DD") : dayjs(
+									new Date()).format("YYYY-MM-DD"),
+
+								HUpDater: data["淇敼浜�"] || this.userInfo.Czymc || '',
+								HUpDateDate: data["淇敼鏃ユ湡"] ? dayjs(data["淇敼鏃ユ湡"]).format(
+									"YYYY-MM-DD") : dayjs(new Date()).format("YYYY-MM-DD"),
+
+								HChecker: data["瀹℃牳浜�"] || '',
+								HCheckDate: data["瀹℃牳鏃ユ湡"] ? dayjs(data["瀹℃牳鏃ユ湡"]).format(
+									"YYYY-MM-DD") : '',
+
+								HDeleteMan: data["浣滃簾浜�"] || '',
+								HDeleteDate: data["浣滃簾鏃ユ湡"] ? dayjs(data["浣滃簾鏃ユ湡"]).format(
+									"YYYY-MM-DD") : '',
+
+								HLevel: data["绱ф�ョ▼搴�"] || '鏅��'
+							};
+
+							this.isEdit = true;
+						} else {
+							uni.showToast({
+								title: res.data.msg || '鑾峰彇缂栬緫鏁版嵁澶辫触',
+								icon: 'none'
+							});
+						}
+					},
+					fail: (res) => {
+						uni.hideLoading();
+						console.log('缂栬緫鏁版嵁璇锋眰澶辫触:', res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						});
+					}
+				});
+			},
+
+			submit() {
+				if (!this.hform.HReceiveMan) {
+					uni.showToast({
+						title: '璇烽�夋嫨鎺ユ敹浜�',
+						icon: 'none'
+					})
+				} else {
+					uni.showLoading({
+						title: '璇风◢鍊�'
+					})
+					if (this.OperationType == 1 || this.OperationType == 2 || this.OperationType == 4) {
+						this.refSav = "Add";
+					}
+					//鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+					if (this.OperationType == 3) {
+						this.refSav = "Update";
+						this.hform.HUpdater = getUserInfo().Czymc;
+						this.hform.HUpdaterDate = dayjs(new Date()).format("YYYY-MM-DD");
+					}
+					var sMainStr = JSON.stringify(this.hform);
+					var sMainSub = sMainStr + ';' + this.refSav + ';' + uni.getStorageSync('HUserName')
+					uni.request({
+						url: this.serverUrl + '/Sc_MESTransFerWorkBill/SaveOA_ErrMsgBackSignBill_APP',
+						method: 'POST',
+						dataType: "json",
+						data: {
+							"msg": sMainSub
+						},
+						success: (res) => {
+							console.log(1, res);
+							uni.hideLoading()
+							if (res.data.count == 1) {
+								if (res.data.Verify == "Y") { //鑷姩瀹℃牳
+									this.SaveVerify(res.data.HInterID) //瀹℃牳
+								} else {
+									uni.showModal({
+										title: '鎻愮ず',
+										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+										success: (res) => {
+											if (res.confirm) {
+												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+												uni.redirectTo({
+													url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill?operationType=1'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 50)
+											}
+										}
+									});
+								}
+							}
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					});
+				}
+			},
+
+			SaveVerify(HInterID) {
+				var datas = {
+					HInterID: HInterID,
+					IsAudit: 0,
+					CurUserName: getUserInfo().Czymc
+				}
+				uni.request({
+					url: this.serverUrl + '/Sc_MESTransFerWorkBill/AuditOA_ErrMsgBackSignBill',
+					method: 'GET',
+					dataType: "json",
+					async: true,
+					data: datas,
+					success: (res) => {
+						uni.showModal({
+							title: '鎻愮ず',
+							content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+							success: (res) => {
+								if (res.confirm) {
+									console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+									uni.redirectTo({
+										url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill?operationType=1'
+									})
+								} else if (res.cancel) {
+									console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+									setTimeout(() => {
+										uni.navigateBack();
+									}, 50)
+								}
+							}
+						});
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+
+			goBack() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBillList.vue
similarity index 86%
copy from pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue
copy to pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBillList.vue
index 19b1b9a..8bba83e 100644
--- a/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBillList.vue
@@ -49,27 +49,45 @@
 		</view>
 		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
 		<scroll-view id="pageContent" scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
-			<view v-for="(item,index) in listData" :key="index">
-				<uni-card :title="item.浜у搧妯″叿" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+			<view class="list" v-for="(item,index) in listData" :key="index">
+				<uni-card :title="item.鍗曟嵁鐘舵��" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
 					@tap="showDetail = showDetail==index?-1:index">
 					<view class="card-detail">
-						<view class="detail" v-if="item.浜у搧妯″叿缂栫爜">
-							<text>浜у搧妯″叿缂栫爜锛�</text>{{item.浜у搧妯″叿缂栫爜}}
+						<view class="detail" v-if="item.浜у搧鍚嶇О">
+							<text>浜у搧鍚嶇О锛�</text>{{item.浜у搧鍚嶇О}}
 						</view>
-						<view class="detail" v-if="item.淇濆吇璁″垝缂栧彿">
-							<text>淇濆吇璁″垝缂栧彿锛�</text>{{item.淇濆吇璁″垝缂栧彿}}
+						<view class="detail" v-if="item.涓婚">
+							<text>涓婚锛�</text>{{item.涓婚}}
 						</view>
-						<view class="detail" v-if="item.淇濆吇瑙勭▼缂栧彿">
-							<text>淇濆吇瑙勭▼缂栧彿锛�</text>{{item.淇濆吇瑙勭▼缂栧彿}}
+						<view class="detail" v-if="item.鍐呭">
+							<text>鍐呭锛�</text>{{item.鍐呭}}
 						</view>
-						<view class="detail" v-if="item.淇濆吇寮�濮嬫棩鏈�">
-							<text>淇濆吇寮�濮嬫棩鏈燂細</text>{{item.淇濆吇寮�濮嬫棩鏈�.substr(0,10)}}
+						<view class="detail" v-if="item.寮傚父绫诲瀷">
+							<text>寮傚父绫诲瀷锛�</text>{{item.寮傚父绫诲瀷}}
 						</view>
-						<view class="detail" v-if="item.淇濆吇缁撴潫鏃ユ湡">
-							<text>淇濆吇缁撴潫鏃ユ湡锛�</text>{{item.淇濆吇缁撴潫鏃ユ湡.substr(0,10)}}
+						<view class="detail" v-if="item.鍙戦�侀儴闂�">
+							<text>鍙戦�侀儴闂細</text>{{item.鍙戦�侀儴闂▆}
 						</view>
-						<view class="detail" v-if="item.鏈�缁堢粨璁�">
-							<text>鏈�缁堢粨璁猴細</text>{{item.鏈�缁堢粨璁簘}
+						<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="card-detail" v-if="showDetail == index">
@@ -126,7 +144,6 @@
 					</view>
 
 					<view class="op" v-if="operations == index">
-						<button class="op1" size="mini" plain @tap.stop="toSon(item)">瀛愯〃淇℃伅</button>
 						<button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
 						<button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
 						<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
@@ -150,7 +167,7 @@
 	} from '@/utils/common.js'
 	import {
 		getUserInfo
-	} from '../../../utils/auth'
+	} from '../../../../utils/auth'
 	export default {
 		data() {
 			return {
@@ -292,7 +309,7 @@
 			},
 			get_DisplayPage(sWhere) {
 				CommonUtils.doRequest2({
-					url: '/Sc_MouldMaintainBill/GetMouldMaintainBillListPage',
+					url: '/Sc_MESTransFerWorkBill/Get_OA_ErrMsgBackSignBillListPage',
 					data: {
 						"sWhere": sWhere,
 						"user": getUserInfo()["Czymc"],
@@ -316,20 +333,21 @@
 				this.onSearchClickHandler()
 				this.goTop()
 			},
-			// 鏂板妯″叿淇濆吇璁板綍鍗�
+			// 鏂板寮傚父鍙嶉鍗�
 			onAddClickHandler() {
 				uni.navigateTo({
-					url: "/pages/MJGL/mujubaoyangjiludan/form"
+					url: "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill?OperationType=1"
 				})
 			},
-			//缂栬緫淇濆吇璁板綍鍗�
+			//缂栬緫寮傚父鍙嶉绛惧埌鍗�
 			edit(item) {
 				console.log(item)
 				uni.navigateTo({
-					url: '/pages/MJGL/mujubaoyangjiludan/form?hmainid=' + item.hmainid
+					url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill?OperationType=3&hmainid=' +
+						item.hmainid
 				})
 			},
-			//鍒犻櫎淇濆吇璁板綍鍗�
+			//鍒犻櫎寮傚父鍙嶉绛惧埌鍗�
 			del(item) {
 				uni.showModal({
 					title: '鍒犻櫎纭',
@@ -338,7 +356,7 @@
 						if (res.confirm) {
 							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
 							CommonUtils.doRequest2({
-								url: '/Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill',
+								url: '/Sc_MESTransFerWorkBill/DeleteOA_ErrMsgBackSignBill',
 								data: {
 									HInterID: item['hmainid'],
 									user: getUserInfo()['Czymc']
@@ -372,13 +390,6 @@
 							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
 						}
 					}
-				});
-			},
-			//瀛愯〃鏌ョ湅
-			toSon(item) {
-				uni.navigateTo({
-					url: '/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList_son?HInterID=' + item.hmainid + '&浜у搧妯″叿=' + item
-						.浜у搧妯″叿 + '&浜у搧妯″叿浠g爜=' + item.浜у搧妯″叿浠g爜,
 				});
 			}
 		},
diff --git a/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue b/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue
new file mode 100644
index 0000000..6d8455a
--- /dev/null
+++ b/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue
@@ -0,0 +1,735 @@
+<template>
+	<view>
+		<view class="page-header">
+			<view class="search-item">
+				<view class="left">鏃ユ湡闂撮殧</view>
+				<view class="right">
+					<picker mode="selector" :value="curDateGap" :range="dateRangePicker"
+						@change="onDateRangePickerChangeHandler">
+						<input disabled v-model="curDateGap" placeholder="璇烽�夋嫨鏃ユ湡闂撮殧" />
+						<view class="picker-overlay"></view>
+					</picker>
+
+				</view>
+			</view>
+			<view class="search-item">
+				<view class="left">寮�濮嬫棩鏈�</view>
+				<view class="right">
+					<uni-datetime-picker :clear-icon="false" type="date" v-model="startDate"
+						:disabled="!enableCustomDateRange">
+						<view class="datetime-picker-inner"
+							:class="enableCustomDateRange?'font__enable':'font__disable'">
+							<text>{{ startDate }}</text>
+						</view>
+					</uni-datetime-picker>
+				</view>
+			</view>
+			<view class="search-item">
+				<view class="left">缁撴潫鏃ユ湡</view>
+				<view class="right">
+					<uni-datetime-picker :clear-icon="false" type="date" v-model="endDate"
+						:disabled="!enableCustomDateRange">
+						<view class="datetime-picker-inner"
+							:class="enableCustomDateRange?'font__enable':'font__disable'">{{ endDate }}</view>
+					</uni-datetime-picker>
+				</view>
+			</view>
+
+			<view class="button-groups">
+				<button type="default" size="mini" class="btn-c" @tap.stop="onSearchClickHandler">鏌ヨ</button>
+				<button type="default" size="mini" class="btn-a" @tap.stop="onResetClickHandler">閲嶇疆</button>
+			</view>
+		</view>
+
+		<!-- 椤电鍖哄煙 -->
+		<view class="tab-container">
+			<view class="tab-list">
+				<view v-for="(tab, index) in tabs" :key="index" :class="['tab-item', { 'active': activeTab === index }]"
+					@tap="switchTab(index)">
+					<text>{{ tab.label }}</text>
+					<text v-if="tab.count > 0" class="tab-count">{{ tab.count }}</text>
+				</view>
+			</view>
+		</view>
+
+		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+		<!-- 椤电鍐呭鍖哄煙 -->
+		<scroll-view v-for="(tab, tabIndex) in tabs" :key="tabIndex" v-show="activeTab === tabIndex" id="pageContent"
+			scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
+			<view class="list" v-for="(item,index) in tab.listData" :key="index">
+				<uni-card :title="item.鍗曟嵁鐘舵��" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+					@tap="showDetail = showDetail==item.hmainid?-1:item.hmainid">
+					<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 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="card-detail" v-if="showDetail == item.hmainid">
+						<view class="detail" v-if="item.鍒跺崟浜�">
+							<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+						</view>
+						<view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+							<text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
+						</view>
+						<view class="detail" v-if="item.瀹℃牳浜�">
+							<text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
+						</view>
+						<view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+							<text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
+						</view>
+						<view class="detail" v-if="item.淇敼浜�">
+							<text>淇敼浜猴細</text>{{item.淇敼浜簘}
+						</view>
+						<view class="detail" v-if="item.淇敼鏃ユ湡">
+							<text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
+						</view>
+						<view class="detail" v-if="item.鍏抽棴浜�">
+							<text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
+						</view>
+						<view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+							<text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
+						</view>
+						<view class="detail" v-if="item.浣滃簾浜�">
+							<text>浣滃簾浜猴細</text>{{item.浣滃簾浜簘}
+						</view>
+						<view class="detail" v-if="item.浣滃簾鏃ユ湡">
+							<text>浣滃簾鏃ユ湡锛�</text>{{item.浣滃簾鏃ユ湡.substr(0,10)}}
+						</view>
+					</view>
+
+					<view class="more" v-if="showDetail == item.hmainid && operations != item.hmainid">
+						<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==item.hmainid?-1:item.hmainid">
+							<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+								size="14"></uni-icons>鎿嶄綔
+						</view>
+					</view>
+					<view class="more" v-if="showDetail != item.hmainid && operations != item.hmainid">
+						<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==item.hmainid?-1:item.hmainid">
+							<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+								size="14"></uni-icons>鎿嶄綔
+						</view>
+					</view>
+
+					<view class="op" v-if="operations == item.hmainid">
+						<!-- 鏍规嵁褰撳墠椤电鏄剧ず涓嶅悓鐨勪笅鎺ㄦ寜閽� -->
+						<button v-if="activeTab === 0 && item.鍗曟嵁鐘舵�� === '宸插弽棣�'" class="op1" size="mini" plain
+							@tap.stop="pushSignBill(item)">
+							涓嬫帹绛惧埌鍗�
+						</button>
+						<button v-else-if="activeTab === 1 && item.鍗曟嵁鐘舵�� === '宸茬鍒�'" class="op2" size="mini" plain
+							@tap.stop="pushHandleBill(item)">
+							涓嬫帹澶勭悊鍗�
+						</button>
+						<button v-else-if="activeTab === 2 && item.鍗曟嵁鐘舵�� === '宸插鐞�'" class="op3" size="mini" plain
+							@tap.stop="pushCheckBill(item)">
+							涓嬫帹楠屾敹鍗�
+						</button>
+						<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+					</view>
+				</uni-card>
+			</view>
+			<view class="over" v-if="tabs[activeTab].listData.length == 0">鏆傛棤鏁版嵁</view>
+		</scroll-view>
+
+		<!-- 鍒嗛〉鍣� -->
+		<view class="page-footer">
+			<uni-pagination id="pagination" title="鏍囬鏂囧瓧" v-model="tabs[activeTab].pageMeta.curPage"
+				:pageSize="tabs[activeTab].pageMeta.size" :total="tabs[activeTab].pageMeta.total"
+				@change="onPageChangeHandler"></uni-pagination>
+		</view>
+	</view>
+</template>
+
+<script>
+	import dayjs from 'dayjs'
+	import {
+		CommonUtils
+	} from '@/utils/common.js'
+	import {
+		getUserInfo
+	} from '../../../../utils/auth'
+	export default {
+		data() {
+			return {
+				// 璁$畻鍗$墖鍒楄〃楂樺害
+				pagination_top: 0,
+				pageContent_top: 0,
+
+				// 褰撳墠婵�娲荤殑椤电
+				activeTab: 0,
+
+				tabs: [{
+						label: '寰呯鍒�',
+						type: 0,
+						count: 0,
+						listData: [], // 娣诲姞杩欎釜
+						pageMeta: { // 娣诲姞杩欎釜
+							curPage: 1,
+							size: 50,
+							total: 0,
+						}
+					},
+					{
+						label: '寰呭鐞�',
+						type: 1,
+						count: 0,
+						listData: [], // 娣诲姞杩欎釜
+						pageMeta: { // 娣诲姞杩欎釜
+							curPage: 1,
+							size: 50,
+							total: 0,
+						}
+					},
+					{
+						label: '寰呴獙鏀�',
+						type: 2,
+						count: 0,
+						listData: [], // 娣诲姞杩欎釜
+						pageMeta: { // 娣诲姞杩欎釜
+							curPage: 1,
+							size: 50,
+							total: 0,
+						}
+					},
+					{
+						label: '鍏ㄩ儴鍗曟嵁',
+						type: 3,
+						count: 0,
+						listData: [], // 娣诲姞杩欎釜
+						pageMeta: { // 娣诲姞杩欎釜
+							curPage: 1,
+							size: 50,
+							total: 0,
+						}
+					}
+				],
+
+				// 婊氬姩鎺у埗
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				},
+
+				dateRangePicker: ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"],
+				curDateGap: "杩戜竷澶�",
+				enableCustomDateRange: false,
+				startDate: dayjs(new Date()).subtract(7, 'day').format('YYYY-MM-DD'),
+				endDate: dayjs(new Date()).format('YYYY-MM-DD'),
+				HBillNo: '',
+
+				showDetail: -1,
+				operations: -1,
+			}
+		},
+		computed: {
+			pageContentHeight: {
+				get() {
+					return (this.pagination_top - this.pageContent_top)
+				}
+			},
+		},
+		onLoad() {
+			this.onSearchClickHandler()
+		},
+		onPullDownRefresh() {
+			this.onSearchClickHandler()
+		},
+		async onReady() {
+			// #ifndef MP-WEIXIN
+			let query = uni.createSelectorQuery().in(this)
+			query.select("#pagination")
+				.boundingClientRect((data) => {
+					if (data) {
+						this.pagination_top = data.top
+					} else {
+						console.log("鏈壘鍒�#pagination鑺傜偣");
+					}
+				})
+				.exec();
+			query.select("#pageContent")
+				.boundingClientRect((data) => {
+					if (data) {
+						this.pageContent_top = data.top
+					} else {
+						console.log("鏈壘鍒�#pageContent鑺傜偣");
+					}
+				})
+				.exec();
+			// #endif
+		},
+		methods: {
+			goTop: function(e) {
+				// 瑙e喅view灞備笉鍚屾鐨勯棶棰�
+				this.scrollTop = this.old.scrollTop
+				this.$nextTick(function() {
+					this.scrollTop = 0
+				});
+			},
+
+			// 鍒囨崲椤电
+			switchTab(index) {
+				this.activeTab = index
+				this.showDetail = -1
+				this.operations = -1
+			},
+
+			onDateRangePickerChangeHandler({
+				detail
+			}) {
+				this.enableCustomDateRange = false
+				this.curDateGap = this.dateRangePicker[detail.value]
+				let date = new Date()
+				switch (this.curDateGap) {
+					case "浠婂ぉ":
+						this.startDate = dayjs(date).format("YYYY-MM-DD")
+						break;
+					case "杩戜竴澶�":
+						this.startDate = dayjs(date).subtract(1, 'day').format("YYYY-MM-DD")
+						break;
+					case "杩戜袱澶�":
+						this.startDate = dayjs(date).subtract(2, 'day').format("YYYY-MM-DD")
+						break;
+					case "杩戜笁澶�":
+						this.startDate = dayjs(date).subtract(3, 'day').format("YYYY-MM-DD")
+						break;
+					case "杩戝洓澶�":
+						this.startDate = dayjs(date).subtract(4, 'day').format("YYYY-MM-DD")
+						break;
+					case "杩戜簲澶�":
+						this.startDate = dayjs(date).subtract(5, 'day').format("YYYY-MM-DD")
+						break;
+					case "杩戝叚澶�":
+						this.startDate = dayjs(date).subtract(6, 'day').format("YYYY-MM-DD")
+						break;
+					case "杩戜竷澶�":
+						this.startDate = dayjs(date).subtract(7, 'day').format("YYYY-MM-DD")
+						break;
+					case "杩�30澶�":
+						this.startDate = dayjs(date).subtract(30, 'day').format("YYYY-MM-DD")
+						break;
+				}
+				if (this.curDateGap == '浠绘剰闂撮殧') {
+					this.enableCustomDateRange = true
+				}
+			},
+
+			onSearchClickHandler() {
+				let sWhere = ""
+				// 鑾峰彇褰撳墠婵�娲荤殑椤电
+				const currentTab = this.tabs[this.activeTab]
+				sWhere = {
+					HBeginDate: this.startDate,
+					HEndDate: this.endDate
+				}
+				this.get_DisplayPage(JSON.stringify(sWhere), currentTab.type)
+			},
+
+			clear() {
+				this.curDateGap = "杩戜竷澶�"
+				this.enableCustomDateRange = false
+				this.startDate = dayjs(new Date()).subtract(7, 'day').format('YYYY-MM-DD')
+				this.endDate = dayjs(new Date()).format('YYYY-MM-DD')
+				this.HBillNo = ''
+			},
+
+			async onResetClickHandler() {
+				this.clear()
+				await this.$nextTick()
+				this.onSearchClickHandler()
+			},
+
+			get_DisplayPage(sWhere, tabType) {
+				CommonUtils.doRequest2({
+					url: '/Sc_MESTransFerWorkBill/GetSc_MESTransFerWorkBillQuery_APP',
+					data: {
+						"sWhere": sWhere,
+						"user": getUserInfo()["Czymc"],
+					},
+					resFunction: (res) => {
+						let {
+							data,
+							Message,
+							count
+						} = res.data
+						console.log('res.data: ', res.data)
+
+						// 灏嗘暟鎹垎鍒祴鍊肩粰瀵瑰簲鐨勯〉绛�
+						// h_p_OA_ErrMsgBackSelfQuery_APP: 寰呯鍒�
+						// h_p_OA_ErrMsgBackSelfQuery_APP1: 寰呭鐞�
+						// h_p_OA_ErrMsgBackSelfQuery_APP2: 寰呴獙鏀�
+						// h_p_OA_ErrMsgBackSelfQuery_APP3: 鍏ㄩ儴鍗曟嵁
+
+						if (data && data.h_p_OA_ErrMsgBackSelfQuery_APP) {
+							// 鏇存柊寰呯鍒伴〉绛�
+							this.tabs[0].listData = data.h_p_OA_ErrMsgBackSelfQuery_APP
+							this.tabs[0].pageMeta.total = data.h_p_OA_ErrMsgBackSelfQuery_APP.length
+							this.tabs[0].count = data.h_p_OA_ErrMsgBackSelfQuery_APP.length
+						}
+
+						if (data && data.h_p_OA_ErrMsgBackSelfQuery_APP1) {
+							// 鏇存柊寰呭鐞嗛〉绛�
+							this.tabs[1].listData = data.h_p_OA_ErrMsgBackSelfQuery_APP1
+							this.tabs[1].pageMeta.total = data.h_p_OA_ErrMsgBackSelfQuery_APP1.length
+							this.tabs[1].count = data.h_p_OA_ErrMsgBackSelfQuery_APP1.length
+						}
+
+						if (data && data.h_p_OA_ErrMsgBackSelfQuery_APP2) {
+							// 鏇存柊寰呴獙鏀堕〉绛�
+							this.tabs[2].listData = data.h_p_OA_ErrMsgBackSelfQuery_APP2
+							this.tabs[2].pageMeta.total = data.h_p_OA_ErrMsgBackSelfQuery_APP2.length
+							this.tabs[2].count = data.h_p_OA_ErrMsgBackSelfQuery_APP2.length
+						}
+
+						if (data && data.h_p_OA_ErrMsgBackSelfQuery_APP3) {
+							// 鏇存柊鍏ㄩ儴鍗曟嵁椤电
+							this.tabs[3].listData = data.h_p_OA_ErrMsgBackSelfQuery_APP3
+							this.tabs[3].pageMeta.total = data.h_p_OA_ErrMsgBackSelfQuery_APP3.length
+							this.tabs[3].count = data.h_p_OA_ErrMsgBackSelfQuery_APP3.length
+						}
+
+						uni.stopPullDownRefresh()
+					}
+				})
+			},
+
+			onPageChangeHandler() {
+				this.onSearchClickHandler()
+				this.goTop()
+			},
+
+			// 涓嬫帹寮傚父鍙嶉绛惧埌鍗� (椤电1锛氬緟绛惧埌)
+			pushSignBill(item) {
+				if (item.鍗曟嵁鐘舵�� !== '宸插弽棣�') {
+					uni.showToast({
+						title: '褰撳墠鍗曟嵁鐘舵�佷笉鍏佽涓嬫帹寮傚父鍙嶉绛惧埌鍗�',
+						icon: 'none'
+					})
+					return
+				}
+
+				console.log('涓嬫帹绛惧埌鍗�:', item)
+				uni.navigateTo({
+					url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill?OperationType=2&linterid=' +
+						item.HInterID + '&HEntryID=' + (item.HEntryID || 0) + '&HSouceBillType=4502',
+					success: () => {
+						// 璺宠浆鎴愬姛鍚庤Е鍙戞煡璇�
+						this.onSearchClickHandler()
+					}
+				})
+			},
+
+			// 涓嬫帹寮傚父鍙嶉澶勭悊鍗� (椤电2锛氬緟澶勭悊)
+			pushHandleBill(item) {
+				if (item.鍗曟嵁鐘舵�� !== '宸茬鍒�') {
+					uni.showToast({
+						title: '褰撳墠鍗曟嵁鐘舵�佷笉鍏佽涓嬫帹澶勭悊鍗�',
+						icon: 'none'
+					})
+					return
+				}
+
+				console.log('涓嬫帹澶勭悊鍗�:', item)
+				uni.navigateTo({
+					url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill?OperationType=2&linterid=' +
+						item.HInterID + '&HEntryID=' + (item.HEntryID || 0) + '&HSouceBillType=4502',
+					success: () => {
+						// 璺宠浆鎴愬姛鍚庤Е鍙戞煡璇�
+						this.onSearchClickHandler()
+					}
+				})
+			},
+
+			// 涓嬫帹寮傚父鍙嶉楠屾敹鍗� (椤电3锛氬緟楠屾敹)
+			pushCheckBill(item) {
+				if (item.鍗曟嵁鐘舵�� !== '宸插鐞�') {
+					uni.showToast({
+						title: '褰撳墠鍗曟嵁鐘舵�佷笉鍏佽涓嬫帹楠屾敹鍗�',
+						icon: 'none'
+					})
+					return
+				}
+
+				console.log('涓嬫帹楠屾敹鍗�:', item)
+				uni.navigateTo({
+					url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill?OperationType=2&linterid=' +
+						item.HInterID + '&HEntryID=' + (item.HEntryID || 0) + '&HSouceBillType=4502',
+					success: () => {
+						// 璺宠浆鎴愬姛鍚庤Е鍙戞煡璇�
+						this.onSearchClickHandler()
+					}
+				})
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.page-header {
+		display: flex;
+		box-sizing: border-box;
+		padding: 20rpx;
+		flex-direction: column;
+		gap: 10rpx;
+		font-size: 32rpx;
+
+		.search-item {
+			display: flex;
+			flex-direction: row;
+			gap: 10rpx;
+			justify-content: center;
+			align-items: center;
+
+			.left {
+				width: 4em;
+			}
+
+			.right {
+				flex: 1;
+				position: relative;
+				border-radius: 22rpx;
+				border: 1px solid #acacac;
+				display: flex;
+				padding: 4rpx 10rpx;
+
+				picker {
+					width: 100%;
+				}
+			}
+		}
+
+		input {
+			width: inherit;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
+
+		.datetime-picker-inner {
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+			display: flex;
+			align-items: center;
+		}
+
+		.font__enable {
+			color: #000;
+		}
+
+		.font__disable {
+			color: #cccccc;
+		}
+	}
+
+	.button-groups {
+		box-sizing: border-box;
+		padding: 10rpx 0 0 0;
+		display: flex;
+		flex-direction: row;
+		gap: 10rpx;
+		justify-content: space-between;
+
+		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;
+		}
+	}
+
+	/* 椤电鏍峰紡 */
+	.tab-container {
+		background-color: #fff;
+	}
+
+	.tab-list {
+		display: flex;
+		flex-direction: row;
+		border-bottom: 1px solid #e5e5e5;
+	}
+
+	.tab-item {
+		flex: 1;
+		padding: 20rpx 0;
+		text-align: center;
+		font-size: 28rpx;
+		color: #666;
+		position: relative;
+
+		&.active {
+			color: #3a78ff;
+			font-weight: bold;
+
+			&::after {
+				content: '';
+				position: absolute;
+				bottom: 0;
+				left: 50%;
+				transform: translateX(-50%);
+				width: 80rpx;
+				height: 4rpx;
+				background-color: #3a78ff;
+			}
+		}
+
+		.tab-count {
+			display: inline-block;
+			margin-left: 10rpx;
+			padding: 0 12rpx;
+			background-color: #ff6b6b;
+			color: #fff;
+			border-radius: 20rpx;
+			font-size: 20rpx;
+			min-width: 30rpx;
+			text-align: center;
+		}
+	}
+
+	.page-content {
+		box-sizing: border-box;
+		padding: 10rpx 0;
+
+		.card-detail {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			line-height: 120%;
+
+			.detail {
+				font-size: 26rpx;
+				margin-bottom: 12rpx;
+				color: #555;
+				margin-right: 20rpx;
+
+				text {
+					color: #999;
+					font-size: 26rpx;
+				}
+			}
+		}
+
+		.more {
+			color: #888;
+			font-size: 24rpx;
+			display: flex;
+			border-top: 1px solid #eee;
+			padding-top: 20rpx;
+
+			.part {
+				width: 50%;
+				text-align: center;
+			}
+		}
+
+		.op {
+			display: flex;
+			justify-content: space-around;
+			margin-top: 20rpx;
+
+			button {
+				padding: 0;
+				width: 150rpx;
+				font-size: 25rpx;
+
+				&:disabled {
+					opacity: 0.5;
+				}
+			}
+
+			.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;
+			}
+		}
+	}
+
+	.over {
+		text-align: center;
+		padding: 40rpx;
+		color: #999;
+		font-size: 28rpx;
+	}
+
+	.page-footer {
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 32rpx 40rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/ZLGL/AanDengHujiao/style/MJListStyle.scss b/pages/ZLGL/AanDengHujiao/style/MJListStyle.scss
new file mode 100644
index 0000000..f27e690
--- /dev/null
+++ b/pages/ZLGL/AanDengHujiao/style/MJListStyle.scss
@@ -0,0 +1,193 @@
+	.form {
+		padding: 20rpx;
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+	}
+    
+    .other {
+    	margin-top: 8rpx;
+    	text-align: center;
+    	font-size: 28rpx;
+    	padding: 4rpx 18rpx;
+    	color: #1890FF;
+    }
+
+	.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;
+				color: #555;
+                padding-bottom: 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;
+			}
+		}
+        
+        .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;
+            }
+        }
+	}
+    
+    .pagination-zone {
+        position: fixed;
+        bottom: 0;
+        box-sizing: border-box;
+        background-color: #fff;
+        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+        padding: 20rpx 40rpx 20rpx 40rpx;
+        display: flex;
+        flex-direction: column;
+        gap: 20rpx;
+        justify-content: space-between;
+        width: 100%;
+    }
\ No newline at end of file
diff --git a/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss b/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss
new file mode 100644
index 0000000..ecd24bd
--- /dev/null
+++ b/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss
@@ -0,0 +1,271 @@
+.buttons {
+    box-sizing: border-box;
+    width: 100%;
+    height: 120rpx;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    background-color: #fff;
+    box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+    padding: 30rpx 40rpx 40rpx 40rpx;
+    display: flex;
+    flex-direction: row;
+    gap: 10rpx;
+    button {
+        border-radius: 50rpx;
+        width: 180rpx;
+        height: 66rpx;
+        line-height: 66rpx;
+        font-size: 28rpx;
+    }
+    .btn-a {
+        background-color: #3a78ff;
+        color: #fff;
+    }
+    .btn-b {
+        background-color: #41a863;
+        color: #fff;
+    }
+    .btn-c {
+        background-color: #acacac;
+        color: #fff;
+        // position: absolute;
+        // right: 120rpx;
+    }
+    .btn-d {
+        background-color: #ff8901;
+        color: #fff;
+    }
+    .placeholder-view {
+        flex: 1;
+    }
+}
+
+.tabs {
+    width: 100%;
+    display: flex;
+    border-bottom: 1px solid #ddd;
+
+    view {
+        width: 100%;
+        font-size: 30rpx;
+        color: #555;
+        text-align: center;
+        padding: 16rpx 0;
+    }
+
+    .on {
+        color: #3a78ff;
+        font-weight: bold;
+        border-bottom: 3px solid #3a78ff;
+    }
+}
+
+.form {
+    display: flex;
+    flex-direction: column;
+    gap: 10rpx;
+    box-sizing: border-box;
+    padding: 20rpx 40rpx;
+}
+
+.form-item {
+    display: flex;
+    align-items: center;
+    font-size: 30rpx;
+    padding: 6rpx 0;
+    gap: 12rpx;
+
+    .title {
+        width: 208rpx;
+        flex-shrink: 0;
+
+        text {
+            color: red;
+            font-weight: bold;
+        }
+    }
+    
+    .required::after{
+          content: "*";
+          color: red;
+          margin-left: 4px; 
+          font-weight: bold;
+    }
+    
+    .right {
+        // width: 450rpx;
+        flex: 1;
+        border-radius: 22rpx;
+        border: 1px solid #acacac;
+        position: relative;
+        display: flex;
+
+        picker {
+            width: 100%;
+        }
+
+        .uni-combox {
+            width: 100%
+        }
+    }
+
+    .righton {
+        width: 450rpx;
+        border-radius: 22rpx;
+        border: 1px solid #e4e4e4;
+        background-color: #e4e4e4;
+    }
+
+    input {
+        width: 100%;
+        padding: 8rpx 20rpx;
+        font-size: 30rpx;
+    }
+
+    textarea {
+        width: 98%;
+        height: 6em;
+        padding: 8rpx 20rpx;
+        font-size: 30rpx;
+    }
+
+    .icon-wrapper {
+        background-color: #3A78FF;
+        width: 52rpx;
+        height: 52rpx;
+        border-radius: 100%;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex-shrink: 0;
+
+        .uni-icons {
+            color: #fff !important;
+        }
+    }
+
+    .icon-wrapper[disabled] {
+        background-color: rgba(228, 228, 228, 1);
+        pointer-events: none;
+        touch-action: none;
+    }
+
+}
+
+.none-border {
+    border: none !important;
+}
+
+.radio_Container {
+    display: flex;
+    flex-direction: row;
+    gap: 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: 24rpx;
+            display: flex;
+            border-top: 1px solid #eee;
+            padding-top: 20rpx;
+
+            .part {
+                width: 50%;
+                text-align: center;
+            }
+        }
+    }
+    
+.card-item-wrapper {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        box-sizing: border-box;
+        padding: 20rpx 20rpx;
+
+        .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;
+                }
+            }
+
+            .operation {
+                display: flex;
+                align-items: center;
+                gap: 10rpx;
+
+                .btn-a {
+                    background-color: #3A78FF;
+                    color: #fff;
+                }
+
+                .btn-b {
+                    background-color: rgb(255, 87, 34);
+                    color: #fff;
+                }
+
+                uni-button {}
+            }
+
+        }
+
+        .more {
+            color: #888;
+            font-size: 24rpx;
+            display: flex;
+            border-top: 1px solid #eee;
+            padding-top: 20rpx;
+
+            .part {
+                width: 50%;
+                text-align: center;
+            }
+        }
+    }
+
+    .attachment-btns {
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-start;
+        gap: 6rpx;
+
+    }
\ No newline at end of file
diff --git a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
index 34d0e38..37fb1b4 100644
--- a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
+++ b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
@@ -470,15 +470,13 @@
 
             },
             HCheckResultChangeHandle(e) {
-
                 this.detailManifestItem.HCheckResult =
-                    this.HCheckResultList.find(elem => elem.text = e)?.value
+                    this.HCheckResultList.find(elem => elem.text == e)?.value
 
             },
             HUseResultChangeHandle(e) {
-
                 this.detailManifestItem.HUseResult =
-                    this.HUseResultList.find(elem => elem.text = e)?.value
+                    this.HUseResultList.find(elem => elem.text == e)?.value
 
             },
             async toDetail(item, index) {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3c6551a..5dfac23 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -339,230 +339,6 @@
 					},
 					
 				],
-				// itemData: [{
-				// 		img: '../../static/icon/icon1.png',
-				// 		text: '璁惧妗f',
-				// 		url: '/pages/shebeidangan/table',
-				// 		id: 1
-				// 	}, {
-				// 		img: '../../static/icon/icon8.png',
-				// 		text: '璁惧灞ュ巻',
-				// 		url: '/pages/shebeilvli/table',
-				// 		id: 0,
-				// 	}, {
-				// 		img: '../../static/icon/icon2.png',
-				// 		text: '璁惧淇濆吇璁″垝鍗�',
-				// 		url: '/pages/baoyangjihua/table',
-				// 		id: 2
-				// 	}, {
-				// 		img: '../../static/icon/icon3.png',
-				// 		text: '璁惧淇濆吇璁板綍鍗�',
-				// 		url: '/pages/baoyangjilu/table',
-				// 		id: 3
-				// 	}, {
-				// 		img: '../../static/icon/icon4.png',
-				// 		text: '璁惧鐐规璁″垝鍗�',
-				// 		url: '',
-				// 		id: 4
-				// 	}, {
-				// 		img: '../../static/icon/icon5.png',
-				// 		text: '璁惧鐐规璁板綍鍗�',
-				// 		url: '',
-				// 		id: 5,
-				// 	}, {
-				// 		img: '../../static/icon/icon6.png',
-				// 		text: '璁惧鏁呴殰鐧昏琛�',
-				// 		url: '/pages/guzhangdengji/table',
-				// 		id: 6
-				// 	}, {
-				// 		img: '../../static/icon/icon7.png',
-				// 		text: '璁惧缁翠慨璁板綍鍗�',
-				// 		url: '/pages/shebeiweixiu/table',
-				// 		id: 7,
-				// 		// },{
-				// 		//  img:'../../static/icon/icon8.png',
-				// 		//  text:'璁惧灞ュ巻',
-				// 		//  url:'/pages/shebeilvli/table',
-				// 		//  id:8,
-				// 	}, {
-				// 		img: '../../static/icon/icon9.png',
-				// 		text: '宸ュ簭杩涚珯鎺ユ敹鍗�',
-				// 		url: '/pages/gongxuIn/table',
-				// 		id: 9,
-				// 	}, {
-				// 		img: '../../static/icon/icon10.png',
-				// 		text: '宸ュ簭鍑虹珯姹囨姤鍗�',
-				// 		url: '/pages/gongxuOut/table',
-				// 		id: 10,
-				// 	}, {
-				// 		img: '../../static/icon/icon11.png',
-				// 		text: '宸ュ簭濮斿鍙戝嚭鍗�',
-				// 		url: '/pages/weiwaigxIn/table',
-				// 		id: 11,
-				// 	}, {
-				// 		img: '../../static/icon/icon12.png',
-				// 		text: '宸ュ簭濮斿鎺ユ敹鍗�',
-				// 		url: '/pages/weiwaigxOut/table',
-				// 		id: 12,
-				// 		// }, {
-				// 		// 	img: '../../static/icon/icon13.png',
-				// 		// 	text: '璁惧绠$悊',
-				// 		// 	url: '/pages/shebeiguanli/table',
-				// 		// 	id: 13,
-				// 	}, {
-				// 		img: '../../static/icon/icon14.png',
-				// 		text: '鎶ュ伐骞冲彴',
-				// 		url: '/pages/baogong/table',
-				// 		id: 14,
-				// 	}, {
-				// 		img: '../../static/icon/icon15.png',
-				// 		text: '寮傚父鍙嶉鍗�',
-				// 		url: '/pages/yichang/table',
-				// 		id: 15,
-				// 	}, {
-				// 		img: '../../static/icon/icon16.png',
-				// 		text: '寮傚父鍙嶉澶勭悊鍗�',
-				// 		url: '/pages/yichang/list',
-				// 		id: 16,
-				// 	}, {
-				// 		img: '../../static/icon/icon17.png',
-				// 		text: '閲囪喘鍏ュ簱',
-				// 		url: '/pages/caigouruku/table',
-				// 		id: 17,
-				// 	}, {
-				// 		img: '../../static/icon/icon18.png',
-				// 		text: '閲囪喘閫�鏂�',
-				// 		url: '/pages/caigoutuiliao/table',
-				// 		id: 18,
-				// 	}, {
-				// 		img: '../../static/icon/icon19.png',
-				// 		text: '閿�鍞嚭搴�',
-				// 		url: '/pages/xiaoshouchuku/table',
-				// 		id: 19,
-				// 	}, {
-				// 		img: '../../static/icon/icon20.png',
-				// 		text: '閿�鍞��璐�',
-				// 		url: '/pages/xiaoshoutuihuo/table',
-				// 		id: 20,
-				// 	}, {
-				// 		img: '../../static/icon/icon21.png',
-				// 		text: '鏀舵枡閫氱煡鍗�',
-				// 		url: '/pages/shouliaotongzhi/table',
-				// 		id: 21,
-				// 	},{
-				// 		img: '../../static/icon/icon30.png',
-				// 		text: '鐢熶骇棰嗘枡鏍¢獙',
-				// 		url: '/pages/shengchanlingliao/table',
-				// 		id: 30,
-				// 	},{
-				// 		img: '../../static/icon/icon31.png',
-				// 		text: '鐢熶骇鍏ュ簱鏍¢獙',
-				// 		url: '/pages/shengchanruku/table',
-				// 		id: 31,
-				// 	},{
-				// 		img: '../../static/icon/icon32.png',
-				// 		text: '鐢熶骇璋冩嫧鏍¢獙',
-				// 		url: '/pages/shengchandiaobo/table',
-				// 		id: 32,
-				// 	},
-				// 	{
-				// 		img: '../../static/icon/icon16.png',
-				// 		text: '鏍囩鎵撳嵃',
-				// 		url: '/pages/labelPrinter/index',
-				// 		id: 22,
-				// 	},
-				// 	{
-				// 		img: '../../static/icon/icon16.png',
-				// 		text: '璁惧杩愯鐘舵��',
-				// 		url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
-				// 		id: 23,
-				// 	},
-				// 	{
-				// 		img: '../../static/icon/icon16.png',
-				// 		text: '妯″叿杩愯鐘舵��',
-				// 		url: '/pages/mujvzhuangtai/mujvzhuangtai',
-				// 		id: 24,
-				// 	},
-				// 	{
-				// 		img: '../../static/icon/icon16.png',
-				// 		text: '鏉$爜鎷嗙爜',
-				// 		url: '/pages/tiaomachaima/tiaomachaima',
-				// 		id: 25,
-				// 	},
-				// 	{
-				// 		img: '../../static/icon/icon16.png',
-				// 		text: '鍏朵粬鍏ュ簱',
-				// 		url: '/pages/qitaruku/qitaruku',
-				// 		id: 26,
-				// 	},
-				// 	{
-				// 		img: '../../static/icon/icon16.png',
-				// 		text: '鍏朵粬鍑哄簱',
-				// 		url: '/pages/qitachuku/qitachuku',
-				// 		id: 27,
-				// 	},
-				// 	{
-				// 		img: '../../static/icon/icon16.png',
-				// 		text: '鏉ユ枡鏉$爜鎵撳嵃',
-				// 		url: '/pages/tiaomadaying/tiaomadaying',
-				// 		id: 28,
-				// 	},
-				// 	{
-				// 		img: '../../static/icon/icon16.png',
-				// 		text: '涓婃ā鍗�',
-				// 		url: '/pages/MJGL/shangmudan/table',
-				// 		id: 29,
-				// 	},
-				// 	{
-				// 		img: '../../static/icon/icon16.png',
-				// 		text: '閲囪喘璁㈠崟',
-				// 		url: '/pages/caigoudingdan/caigoudingdan',
-				// 		id: 30,
-				// 	},
-				// 	{
-				// 		img: '../../static/icon/icon16.png',
-				// 		text: '鍏朵粬鍑哄簱鏍¢獙',
-				// 		url: '/pages/qitachukujiaoyan/qitachukujiaoyan',
-				// 		id: 31,
-				// 	},
-				// 	{
-				// 		img: '../../static/icon/icon16.png',
-				// 		text: '鐢熶骇琛ユ枡鏍¢獙',
-				// 		url: '/pages/shengchanbuliaojiaoyan/CacheList',
-				// 		id: 32,
-				// 	},
-				// 	{
-				// 		img: '../../static/icon/icon16.png',
-				// 		text: '閿�鍞嚭搴撴牎楠�',
-				// 		url: '/pages/xiaoshouchukujiaoyan/table',
-				// 		id: 33,
-				// 	},
-				// 	{
-				// 		img: '../../static/icon/icon16.png',
-				// 		text: '濮斿棰嗘枡鏍¢獙',
-				// 		url: '/pages/weiwailingliaojiaoyan/table',
-				// 		id: 34,
-				// 	},
-				// 	{
-				// 		img: '../../static/icon/icon16.png',
-				// 		text: '閲囪喘鍏ュ簱鏍¢獙',
-				// 		url: '/pages/caigourukujiaoyan/table',
-				// 		id: 35,
-				// 	},
-
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '濮斿琛ユ枡鏍¢獙',
-                // 		url: '/pages/weiwaibuliaojiaoyan/Kf_EntrustReplenishOutBill_CheckList',
-                // 		id: 37,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon17.png',
-                // 		text: '鐢熶骇棰嗘枡',
-                // 		url: '/pages/shengchanlingliaoshengdan/Kf_MateOutBillList',
-                // 		id: 38,
-                // 	}, 
-                // ]
             }
         },
         onLoad() {
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index a1c53df..06c5dde 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -6,15 +6,15 @@
 			</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)">
+			<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)">
+			<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">
@@ -220,7 +220,7 @@
 						img: '../../static/icon/icon16.png',
 						text: '鍒嗘寮忚皟鍏ュ崟缂撳瓨',
 						url: '/pages/fenbushidiaorudan/table',
-						id: 28,
+						id: 24,
 						hidden: false,
 					},
 					{
@@ -228,80 +228,87 @@
 						text: '宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�',
 						tip: '鏌ョ湅鍒楄〃',
 						url: '/pages/gongxuIn/Cj_StationInBillList',
-						id: 2,
+						id: 25,
 						hidden: false,
-					}, 
+					},
 					{
 						img: '../../static/icon/icon10.png',
 						text: '宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�',
 						tip: '鏌ョ湅鍒楄〃',
 						url: '/pages/gongxuOut/Cj_StationOutBillList',
-						id: 4,
+						id: 26,
 						hidden: false,
-					}, 
+					},
 					{
 						img: '../../static/icon/icon11.png',
 						text: '宸ュ簭濮斿鍙戝嚭鍗曞垪琛�',
 						tip: '鏌ョ湅鍒楄〃',
 						url: '/pages/weiwaigxIn/Cj_StationEntrustInBillList',
-						id: 6,
+						id: 27,
 						hidden: false,
-					}, 
+					},
 					{
 						img: '../../static/icon/icon12.png',
 						text: '宸ュ簭濮斿鎺ユ敹鍗曞垪琛�',
 						tip: '鏌ョ湅鍒楄〃',
 						url: '/pages/weiwaigxOut/Cj_StationEntrustOutBillList',
-						id: 8,
+						id: 28,
 						hidden: false,
-					}, 
+					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "妯″叿鎶ュ簾鍑哄簱鍗曞垪琛�",
 						"url": "/pages/MJGL/MouldScrapOutBill/MouldScrapOutBillList",
-						"id": 51,
+						"id": 29,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "妯″叿璋冩嫧鍗曞垪琛�",
 						"url": "/pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
-						"id": 51,
-						"hidden": false
-					},
-					{
-						"img": "../../static/icon/icon8.png",
-						"text": "妯″叿棰嗙敤閫�搴撳崟鍒楄〃",
-						"url": "/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
-						"id": 50,
-						"hidden": false
-					},
-					{
-						"img": "../../static/icon/icon5.png",
-						"text": "妯″叿鐐规璁板綍鍗曞垪琛�",
-						"url": "/pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList",
-						"id": 47,
-						"hidden": false
-					},
-					{
-						"img": "../../static/icon/icon5.png",
-						"text": "妯″叿淇濆吇璁板綍鍗曞垪琛�",
-						"url": "/pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList",
-						"id": 48,
+						"id": 30,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "妯″叿棰嗙敤鍑哄簱鍗曞垪琛�",
 						"url": "/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
-						"id": 49,
+						"id": 31,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "妯″叿棰嗙敤閫�搴撳崟鍒楄〃",
+						"url": "/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
+						"id": 32,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon13.png",
-						"text": "妯″叿缁翠慨璁板綍鍒楄〃",
-						"url": "/pages/weixiujilu/mouldRepairRecordBillList",
-						"id": 39,
+						"text": "涓婃ā鍗曞垪琛�",
+						"url": "/pages/MJGL/shangmudan/MouldUpperBillList",
+						"id": 33,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon13.png",
+						"text": "涓嬫ā鍗曞垪琛�",
+						"url": "/pages/MJGL/xiamodan/MouldLowerBillList",
+						"id": 34,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon5.png",
+						"text": "妯″叿鐐规璁板綍鍗曞垪琛�",
+						"url": "/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBillList",
+						"id": 35,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon5.png",
+						"text": "妯″叿淇濆吇璁板綍鍗曞垪琛�",
+						"url": "/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBillList",
+						"id": 36,
 						"hidden": false
 					},
 					{
@@ -312,6 +319,29 @@
 						"hidden": false
 					},
 					{
+						"img": "../../static/icon/icon8.png",
+						"text": "妯″叿缁翠慨娲惧伐鍗曞垪琛�",
+						"url": "/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBillList",
+						"id": 38,
+						"hidden": false
+					},
+
+					{
+						"img": "../../static/icon/icon13.png",
+						"text": "妯″叿缁翠慨璁板綍鍒楄〃",
+						"url": "/pages/weixiujilu/mouldRepairRecordBillList",
+						"id": 39,
+						"hidden": false
+					},
+
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "妯″叿缁翠慨楠屾敹鍗曞垪琛�",
+						"url": "/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList",
+						"id": 40,
+						"hidden": false
+					},
+					{
 						"img": "../../static/icon/icon13.png",
 						"text": "棣栦欢妫�楠屽崟鍒楄〃",
 						"url": "/pages/ZLGL/shoujianjianyan/firstCheckBillList",
@@ -319,133 +349,159 @@
 						"hidden": false
 					},
 					{
-					    "img": "../../static/icon/icon8.png",
-					    "text": "宸℃妫�楠屽崟鍒楄〃",
-					    "url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
-					    "id": 43,
-					    "hidden": false
+						"img": "../../static/icon/icon8.png",
+						"text": "宸℃妫�楠屽崟鍒楄〃",
+						"url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
+						"id": 42,
+						"hidden": false
 					},
 					{
-					    "img": "../../static/icon/icon8.png",
-					    "text": "鏈欢妫�楠屽崟鍒楄〃",
-					    "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
-					    "id": 45,
-					    "hidden": false
+						"img": "../../static/icon/icon8.png",
+						"text": "鏈欢妫�楠屽崟鍒楄〃",
+						"url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
+						"id": 43,
+						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "鏉ユ枡妫�楠屽垪琛�",
 						"url": "/pages/ZLGL/lailiaojianyan/POStockInCheckBillList",
-						"id": 54,
+						"id": 44,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "鍏ㄦ妫�楠屽崟鍒楄〃",
 						"url": "/pages/ZLGL/QualityReportStep/QualityReportStepBillList",
-						"id": 55,
+						"id": 45,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "杞﹂棿鑷鍗曞垪琛�",
 						"url": "/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBillList",
-						"id": 55,
+						"id": 46,
 						"hidden": false
 					},
-					// 鏍囩鏉$爜鐩稿叧
-					
-
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "鍦ㄥ簱妫�楠屽崟缂撳瓨",
+						"url": "/pages/ZLGL/zaikujianyandan/InStockCheckBillList",
+						"id": 47,
+						"hidden": false
+					},
 					// 璁惧鐩稿叧
 					{
 						"img": "../../static/icon/icon3.png",
+						"text": "璁惧鐐规璁板綍鍗曞垪琛�",
+						"url": "/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList",
+						"id": 48,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon3.png",
 						"text": "璁惧淇濆吇璁板綍鍗曞垪琛�",
-						"url": "/pages/baoyangjilu/Sb_EquipMaintainRuleList",
-						"id": 27,
+						"url": "/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList",
+						"id": 49,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon6.png",
 						"text": "璁惧鏁呴殰鐧昏琛ㄥ垪琛�",
 						"url": "/pages/guzhangdengji/EqpConkBookBillList",
-						"id": 28,
+						"id": 50,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "璁惧缁翠慨娲惧伐鍗曞垪琛�",
+						"url": "/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList",
+						"id": 51,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon7.png",
 						"text": "璁惧缁翠慨璁板綍鍗曞垪琛�",
 						"url": "/pages/shebeiweixiu/SbEqpMaintenanceBillList",
-						"id": 29,
+						"id": 52,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "璁惧缁翠慨楠屾敹鍗曞垪琛�",
+						"url": "/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList",
+						"id": 53,
 						"hidden": false
 					},
 
-					// 寮傚父鐩稿叧
+					// 瀹夌伅鐩稿叧
 					{
 						"img": "../../static/icon/icon15.png",
 						"text": "寮傚父鍙嶉鍗曞垪琛�",
-						"url": "/pages/yichang/MESExecptFeedBackBillList",
-						"id": 30,
+						"url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBillList",
+						"id": 54,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon16.png",
+						"text": "寮傚父鍙嶉鎺ユ敹鍗曞垪琛�",
+						"url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBillList",
+						"id": 55,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon16.png",
+						"text": "寮傚父鍙嶉绛惧埌鍗曞垪琛�",
+						"url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBillList",
+						"id": 56,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon16.png",
 						"text": "寮傚父鍙嶉澶勭悊鍗曞垪琛�",
-						"url": "/pages/yichang/MESExecptFeedBackBillList",
-						"id": 31,
+						"url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBillList",
+						"id": 57,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon16.png",
+						"text": "寮傚父鍙嶉楠屾敹鍗曞垪琛�",
+						"url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBillList",
+						"id": 58,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon16.png",
+						"text": "寮傚父鍙嶉寰呭鐞嗗垪琛�",
+						"url": "/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList",
+						"id": 59,
 						"hidden": false
 					},
 
-					// 搴撳瓨鏌ヨ鐩稿叧
-					
 
 					// 鍙栨牱杩樻牱鐩稿叧
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "鍙栨牱鍗曞垪琛�",
 						"url": "/pages/quyangdan/TakeSampleCheckBillList",
-						"id": 33,
+						"id": 60,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "杩樻牱鍗曞垪琛�",
 						"url": "/pages/huanyangdan/BackSampleCheckBillList",
-						"id": 34,
+						"id": 61,
 						"hidden": false
 					},
 
-					// 妯″叿鐩稿叧
-					{
-						"img": "../../static/icon/icon13.png",
-						"text": "涓婃ā鍗曞垪琛�",
-						"url": "/pages/MJGL/shangmudan/MouldUpperBillList",
-						"id": 35,
-						"hidden": false
-					},
-					{
-						"img": "../../static/icon/icon13.png",
-						"text": "涓嬫ā鍗曞垪琛�",
-						"url": "/pages/MJGL/xiamodan/MouldLowerBillList",
-						"id": 36,
-						"hidden": false
-					},
-					
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "瑁呯鍗曟殏瀛樺垪琛�",
 						"url": "/pages/zhuangxiangdan/table",
-						"id": 52,
+						"id": 62,
 						"hidden": false
 					},
-					
-					{
-					    "img": "../../static/icon/icon8.png",
-					    "text": "鍦ㄥ簱妫�楠屽崟缂撳瓨",
-					    "url": "/pages/ZLGL/zaikujianyandan/InStockCheckBillList",
-					    "id": 57,
-					    "hidden": false
-					}
-                    
 				]
 			}
 		},
@@ -462,13 +518,13 @@
 				})
 				Array.from(data).forEach(e => {
 					this.itemData[e["HIndex"]].hidden = !CommonUtils.stringToBoolean(e["HShowMode"])
-					this.itemData[e["HIndex"]].id = e["HEntryID"];//id涓�0寮哄埗闅愯棌
+					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
diff --git a/pages/index/tab3.vue b/pages/index/tab3.vue
index 7e3fb1b..3bfaf07 100644
--- a/pages/index/tab3.vue
+++ b/pages/index/tab3.vue
@@ -6,15 +6,15 @@
 			</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)">
+			<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)">
+			<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">
@@ -43,113 +43,158 @@
 				menuListName: 'tab3',
 				canEdit: false,
 				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-				itemData: [
-					{
+				itemData: [{
 						img: '../../static/icon/icon6.png',
 						text: '妯″叿鐘舵�佸垎鏋�',
 						tip: '鏌ョ湅璇︽儏',
 						url: '/pages/mujvzhuangtai/mujvzhuangtai',
-						id: 15,
+						id: 1,
 						hidden: false,
-					
+
 					},
 					{
 						img: '../../static/icon/icon8.png',
 						text: '妯″叿妗f鏌ヨ',
 						url: `/pages/MJGL/Gy_MouldFile/Gy_MouldFileList`,
-						id: 36,
+						id: 2,
 						hidden: false,
 					},
 					{
 						img: '../../static/icon/icon16.png',
-						text: '鍣ㄥ叿瀵垮懡',
+						text: '妯″叿瀵垮懡',
 						url: '/pages/shoujishouming/table',
-						id: 17,
+						id: 3,
 						hidden: false,
 					},
 					{
 						"img": "../../static/icon/icon13.png",
 						"text": "妯″叿鏁呴殰鐧昏鍗�",
 						"url": "/pages/qijvguzhangdengji/mouldMistakeBill?operationType=1",
-						"id": 38,
+						"id": 4,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "妯″叿缁翠慨娲惧伐鍗�",
+						"url": "/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill",
+						"id": 5,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon13.png",
 						"text": "妯″叿缁翠慨璁板綍鍗�",
 						"url": "/pages/weixiujilu/mouldRepairRecordBill",
-						"id": 40,
+						"id": 6,
 						"hidden": false
 					},
-					
-					
-					
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "妯″叿缁翠慨楠屾敹鍗�",
+						"url": "/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill",
+						"id": 7,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "妯″叿鐐规璁板綍鍗�",
+						"url": "/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill",
+						"id": 8,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "妯″叿淇濆吇璁板綍鍗�",
+						"url": "/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill",
+						"id": 9,
+						"hidden": false
+					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "妯″叿棰嗙敤鍑哄簱鍗�",
 						"url": "/pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
-						"id": 49,
+						"id": 10,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "妯″叿棰嗙敤閫�搴撳崟",
 						"url": "/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill",
-						"id": 50,
-						"hidden": false
-					},
-					{
-						"img": "../../static/icon/icon8.png",
-						"text": "妯″叿鎶ュ簾鍑哄簱鍗�",
-						"url": "/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill",
-						"id": 50,
+						"id": 11,
 						"hidden": false
 					},
 					{
 						img: '../../static/icon/icon8.png',
 						text: '涓婃ā鍗�',
 						url: `/pages/MJGL/shangmudan/MouldUpperBill`,
-						id: 37,
+						id: 12,
 						hidden: false,
 					},
-                    {
-                    	img: '../../static/icon/icon1.png',
-                    	text: '璁惧妗f鏌ヨ',
-                    	tip: '鏌ョ湅璇︽儏',
-                    	url: '/pages/shebeidangan/Gy_EquipFileMainBillList',
-                    	id: 9,
-                    	hidden: true,
-                    }, 
 					{
-                    	img: '../../static/icon/icon8.png',
-                    	text: '璁惧灞ュ巻鏌ヨ',
-                    	tip: '鏌ョ湅璇︽儏',
-                    	url: '/pages/shebeilvli/EquipFileBillResume',
-                    	id: 10,
-                    	hidden: true,
-                    }, 
+						img: '../../static/icon/icon8.png',
+						text: '涓嬫ā鍗�',
+						url: `/pages/MJGL/xiamodan/MouldLowerBill`,
+						id: 13,
+						hidden: false,
+					},
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "妯″叿鎶ュ簾鍑哄簱鍗�",
+						"url": "/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill",
+						"id": 14,
+						"hidden": false
+					},
+					{
+						img: '../../static/icon/icon1.png',
+						text: '璁惧妗f鏌ヨ',
+						tip: '鏌ョ湅璇︽儏',
+						url: '/pages/shebeidangan/Gy_EquipFileMainBillList',
+						id: 15,
+						hidden: true,
+					},
+					{
+						img: '../../static/icon/icon8.png',
+						text: '璁惧灞ュ巻鏌ヨ',
+						tip: '鏌ョ湅璇︽儏',
+						url: '/pages/shebeilvli/EquipFileBillResume',
+						id: 16,
+						hidden: true,
+					},
 					{
 						img: '../../static/icon/icon32.png',
 						text: '璁惧杩愯鐘舵��',
 						tip: '鏌ョ湅璇︽儏',
 						url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
-						id: 14,
+						id: 17,
 						hidden: true,
-					}, 
-                    {
-                        "img":"../../static/icon/icon8.png",
-                        "text": "璁惧淇濆吇璁板綍鍗�",
-                        "url": "/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill",
-                        "id": 53,
-                        "hidden": false
-                    },
-                    {
-                        "img": "../../static/icon/icon8.png",
-                        "text": "璁惧鐐规璁板綍鍗�",
-                        "url": "/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill",
-                        "id": 55,
-                        "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": "璁惧淇濆吇璁板綍鍗�",
+						"url": "/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill",
+						"id": 19,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "璁惧缁翠慨娲惧伐鍗�",
+						"url": "/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill",
+						"id": 21,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "璁惧缁翠慨楠屾敹鍗�",
+						"url": "/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill",
+						"id": 23,
+						"hidden": false
+					},
 				]
 			}
 		},
@@ -166,13 +211,13 @@
 				})
 				Array.from(data).forEach(e => {
 					this.itemData[e["HIndex"]].hidden = !CommonUtils.stringToBoolean(e["HShowMode"])
-					this.itemData[e["HIndex"]].id = e["HEntryID"];//id涓�0寮哄埗闅愯棌
+					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
diff --git a/pages/index/tab4.vue b/pages/index/tab4.vue
index c74e390..85dbe89 100644
--- a/pages/index/tab4.vue
+++ b/pages/index/tab4.vue
@@ -49,7 +49,7 @@
 						"img": "../../static/icon/icon13.png",
 						"text": "棣栦欢妫�楠屽崟",
 						"url": "/pages/ZLGL/shoujianjianyan/firstCheckBill?operationType=1",
-						"id": 42,
+						"id": 1,
 						"hidden": false
 					},
 					
@@ -57,7 +57,7 @@
 					    "img": "../../static/icon/icon8.png",
 					    "text": "宸℃妫�楠屽崟",
 					    "url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1",
-					    "id": 44,
+					    "id": 2,
 					    "hidden": false
 					},
 					
@@ -65,14 +65,14 @@
 					    "img": "../../static/icon/icon8.png",
 					    "text": "鏈欢妫�楠屽崟",
 					    "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBill?operationType=1",
-					    "id": 46,
+					    "id": 3,
 					    "hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "鏉ユ枡妫�楠屽崟",
 						"url": "/pages/ZLGL/lailiaojianyan/POStockInCheckBill",
-						"id": 53,
+						"id": 4,
 						"hidden": false
 					},
 					
@@ -80,28 +80,28 @@
 						"img": "../../static/icon/icon8.png",
 						"text": "鐢熶骇鍏ュ簱妫�楠屽崟",
 						"url": "/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2",
-						"id": 53,
+						"id": 5,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "鍑哄巶鏍¢獙鍗�",
 						"url": "/pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill",
-						"id": 54,
+						"id": 6,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "鏉ユ枡妫�楠�(鎵归噺)",
 						"url": "/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast",
-						"id": 55,
+						"id": 7,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "鍏ㄦ妫�楠屽崟",
 						"url": "/pages/ZLGL/QualityReportStep/QualityReportStepBill",
-						"id": 55,
+						"id": 8,
 						"hidden": false
 					},
 					
@@ -109,18 +109,52 @@
 						"img": "../../static/icon/icon8.png",
 						"text": "杞﹂棿鑷鍗�",
 						"url": "/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBill",
-						"id": 55,
+						"id": 9,
 						"hidden": false
 					},
-					
 					{
                         "img": "../../static/icon/icon8.png",
                         "text": "鍦ㄥ簱妫�楠屽崟",
                         "url": "/pages/ZLGL/zaikujianyandan/InStockCheckBill",
-                        "id": 57,
+                        "id": 10,
                         "hidden": false
-                    }
-                    
+                    },
+					{
+						"img": "../../static/icon/icon15.png",
+						"text": "寮傚父鍙嶉鍗�",
+						"url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill",
+						"id": 11,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon15.png",
+						"text": "寮傚父鍙嶉鎺ユ敹鍗�",
+						"url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill",
+						"id": 12,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon15.png",
+						"text": "寮傚父鍙嶉绛惧埌鍗�",
+						"url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill",
+						"id": 13,
+						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon15.png",
+						"text": "寮傚父鍙嶉澶勭悊鍗�",
+						"url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill",
+						"id": 14,
+						"hidden": false
+					},
+                    {
+                    	"img": "../../static/icon/icon15.png",
+                    	"text": "寮傚父鍙嶉楠屾敹鍗�",
+                    	"url": "/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill",
+                    	"id": 15,
+                    	"hidden": false
+                    },
+
 				]
 			}
 		},
diff --git a/pages/shengchanlingliao/PPickingCheckBill.vue b/pages/shengchanlingliao/PPickingCheckBill.vue
index dc5de7d..71bcaf5 100644
--- a/pages/shengchanlingliao/PPickingCheckBill.vue
+++ b/pages/shengchanlingliao/PPickingCheckBill.vue
@@ -1105,7 +1105,7 @@
             },
             addNew() {
                 uni.redirectTo({
-                    url: '/pages/xiaoshoutuihuo/PPickingBill?OperationType=1'
+                    url: './PPickingCheckBill?OperationType=1'
                 })
             },
             async submit() {
@@ -1165,7 +1165,7 @@
                                         if (res.confirm) {
                                             console.log('鐢ㄦ埛鐐瑰嚮纭畾');
                                             uni.redirectTo({
-                                                url: '/pages/xiaoshoutuihuo/PPickingBill?OperationType=1'
+                                                url: './PPickingCheckBill?OperationType=1'
                                             })
                                         } else if (res.cancel) {
                                             console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/shengchanruku/ProductInCheckBill.vue b/pages/shengchanruku/ProductInCheckBill.vue
index ba43464..c91c584 100644
--- a/pages/shengchanruku/ProductInCheckBill.vue
+++ b/pages/shengchanruku/ProductInCheckBill.vue
@@ -950,7 +950,7 @@
             },
             addNew() {
                 uni.redirectTo({
-                    url: '/pages/shengchanruku/ProductCheckInBill?OperationType=1'
+                    url: '/pages/shengchanruku/ProductInCheckBill?OperationType=1'
                 })
             },
             async submit() {
@@ -1010,7 +1010,7 @@
                                         if (res.confirm) {
                                             console.log('鐢ㄦ埛鐐瑰嚮纭畾');
                                             uni.redirectTo({
-                                                url: '/pages/shengchanruku/ProductCheckInBill?OperationType=1'
+                                                url: '/pages/shengchanruku/ProductInCheckBill?OperationType=1'
                                             })
                                         } else if (res.cancel) {
                                             console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/yichang/ErrMsgBackHandleBillList.vue b/pages/yichang/ErrMsgBackHandleBillList.vue
deleted file mode 100644
index 8fabf6e..0000000
--- a/pages/yichang/ErrMsgBackHandleBillList.vue
+++ /dev/null
@@ -1,465 +0,0 @@
-<template>
-	<view class="content">
-		<view class="form">
-			<view class="form-item">
-				<view class="title">寮�濮嬫棩鏈�:</view>
-				<view class="right">
-					<picker mode="date" :value="hform.HBeginDate" @change="HBeginDateChange">
-						<input name="HBeginDate" disabled :value="hform.HBeginDate" placeholder="璇烽�夋嫨" />
-					</picker>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">缁撴潫鏃ユ湡:</view>
-				<view class="right">
-					<picker mode="date" :value="hform.HEndDate" @change="HEndDateChange">
-						<input name="HEndDate" disabled :value="hform.HEndDate" placeholder="璇烽�夋嫨" />
-					</picker>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鍗曟嵁鍙�:</view>
-				<view class="right">
-					<input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
-				</view>
-			</view>
-			
-			<view class="buttons">
-				<button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
-				<!-- <button class="btn-b" size="mini" type="default">鏂板</button> -->
-				<button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
-			</view>
-		</view>
-		
-		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
-		
-		<view class="list" v-for="(item,index) in listData" :key="index">
-			<uni-card :title="item.鍗曟嵁鐘舵��" :extra="item.鍗曟嵁鍙�" style="margin: 10px;">
-				<view class="card-detail">
-					<view class="detail" v-if="item.涓婚">
-						<text>涓婚锛�</text>{{item.涓婚}}
-					</view>
-					<view class="detail" v-if="item.寮傚父绫诲瀷">
-						<text>寮傚父绫诲瀷锛�</text>{{item.寮傚父绫诲瀷}}({{item.寮傚父绫诲瀷浠g爜}})
-					</view>
-					<view class="detail" v-if="item.鍙戦�侀儴闂�">
-						<text>鍙戦�侀儴闂細</text>{{item.鍙戦�侀儴闂▆}
-					</view>
-					<view class="detail" v-if="item.鍙戦�佷汉">
-						<text>鍙戦�佷汉锛�</text>{{item.鍙戦�佷汉}}
-					</view>
-					<view class="detail" v-if="item.鏄惁瀹屾垚">
-						<text>鏄惁瀹屾垚锛�</text>{{item.鏄惁瀹屾垚}}
-					</view>
-					
-					<view class="detail" v-if="item.鎺ユ敹閮ㄩ棬">
-						<text>鎺ユ敹閮ㄩ棬锛�</text>{{item.鎺ユ敹閮ㄩ棬}}
-					</view>
-					<view class="detail" v-if="item.鎺ユ敹浜�">
-						<text>鎺ユ敹浜猴細</text>{{item.鎺ユ敹浜簘}
-					</view>
-					<view class="detail" v-if="item.鎶勯�佷汉">
-						<text>鎶勯�佷汉锛�</text>{{item.鎶勯�佷汉}}
-					</view>					
-					
-					<view class="detail" v-if="item.绱ф�ョ▼搴�">
-						<text>绱ф�ョ▼搴︼細</text>{{item.绱ф�ョ▼搴}
-					</view>
-					<view class="detail" v-if="item.鍗曟嵁绫诲瀷">
-						<text>鍗曟嵁绫诲瀷锛�</text>{{item.鍗曟嵁绫诲瀷}}
-					</view>
-					<view class="detail" v-if="item.鍗曟嵁鍙风爜">
-						<text>鍗曟嵁鍙风爜锛�</text>{{item.鍗曟嵁鍙风爜}}
-					</view>
-					<view class="detail" v-if="item.浜у搧鍚嶇О">
-						<text>浜у搧鍚嶇О锛�</text>{{item.浜у搧鍚嶇О}}
-					</view>
-					<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
-						<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
-					</view>
-					<view class="detail" v-if="item.璁惧鍚嶇О">
-						<text>璁惧鍚嶇О锛�</text>{{item.璁惧鍚嶇О}}
-					</view>
-					<view class="detail" v-if="item.妯℃不鍏峰悕绉�">
-						<text>妯℃不鍏峰悕绉帮細</text>{{item.妯℃不鍏峰悕绉皚}
-					</view>
-					<view class="detail" v-if="item.澶勭悊浜�">
-						<text>澶勭悊浜猴細</text>{{item.澶勭悊浜簘}({{item.澶勭悊浜轰唬鐮亇})
-					</view>
-					<view class="detail" v-if="item.澶勭悊鍐呭">
-						<text>澶勭悊鍐呭锛�</text>{{item.澶勭悊鍐呭}}
-					</view>
-					<view class="detail" v-if="item.澶勭悊缁撴灉">
-						<text>澶勭悊缁撴灉锛�</text>{{item.澶勭悊缁撴灉}}
-					</view>
-					<view class="detail" v-if="item.澶勭悊鍘熷洜">
-						<text>澶勭悊鍘熷洜锛�</text>{{item.澶勭悊鍘熷洜}}
-					</view>
-					<view class="detail" v-if="item.澶勭悊瀹屾垚鏃堕棿">
-						<text>澶勭悊瀹屾垚鏃堕棿锛�</text>{{item.澶勭悊瀹屾垚鏃堕棿.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.寮傚父鍙嶉鍗曞彿">
-						<text>寮傚父鍙嶉鍗曞彿锛�</text>{{item.寮傚父鍙嶉鍗曞彿}}
-					</view>
-					<view class="detail" v-if="item.寮傚父鍙嶉鍗曚富鍐呯爜">
-						<text>寮傚父鍙嶉鍗曚富鍐呯爜锛�</text>{{item.寮傚父鍙嶉鍗曚富鍐呯爜}}
-					</view>
-					<view class="detail" v-if="item.寮傚父鍙嶉鍗曞瓙鍐呯爜">
-						<text>寮傚父鍙嶉鍗曞瓙鍐呯爜锛�</text>{{item.寮傚父鍙嶉鍗曞瓙鍐呯爜}}
-					</view>
-					<view class="detail" v-if="item.琛ㄥご澶囨敞">
-						<text>琛ㄥご澶囨敞锛�</text>{{item.琛ㄥご澶囨敞}}
-					</view>
-					
-					<view class="detail" v-if="item.鍒跺崟鏃ユ湡">
-						<text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.鍒跺崟浜�">
-						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
-					</view>
-					<view class="detail" v-if="item.瀹℃牳鏃ユ湡">
-						<text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.瀹℃牳浜�">
-						<text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
-					</view>
-					<view class="detail" v-if="item.淇敼鏃ユ湡">
-						<text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.淇敼浜�">
-						<text>淇敼浜猴細</text>{{item.淇敼浜簘}
-					</view>
-					<view class="detail" v-if="item.鍏抽棴鏃ユ湡">
-						<text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.鍏抽棴浜�">
-						<text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
-					</view>
-					<view class="detail" v-if="item.浣滃簾鏃ユ湡">
-						<text>浣滃簾鏃ユ湡锛�</text>{{item.浣滃簾鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.浣滃簾浜�">
-						<text>浣滃簾浜猴細</text>{{item.浣滃簾浜簘}
-					</view>
-				</view>
-				<view class="more">
-					<view class="part" style="border-right: 1px solid #eee;" @tap="reads(item.鍐呭)">
-						<uni-icons type="bars" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鍐呭
-					</view>
-					<view class="part" style="border-right: 1px solid #eee;color: #d98d00;" @tap="toCheck(item)">
-						<uni-icons type="bars" style="color: #d98d00;margin-right: 10rpx;" size="14"></uni-icons>瀹℃牳
-					</view>
-					<view class="part" style="color: #da0000;" @tap="toDel(item)">
-						<uni-icons type="pulldown" style="color: #da0000;margin-right: 10rpx;" size="14"></uni-icons>鍒犻櫎
-					</view>
-				</view>
-			</uni-card>
-		</view>
-		
-		<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
-		<view class="over" v-if="listData.length > 0 && loading">鍔犺浇涓�</view>
-		<view class="over" v-if="listData.length != 0 && !loading">宸插埌搴�</view>
-	</view>
-</template>
-
-<script>
-	import { getUserInfo } from "@/utils/auth.js";
-	import getDateTime from '@/utils/getdateTime.js';
-	export default {
-	    data() {
-	        return {
-				userInfo:getUserInfo(),
-				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
-				hform:{
-					HBillNo:'',
-					HEndDate:getDateTime.dateTimeStr('y-m-d'),
-					HBeginDate:this.getEndDate(),
-				},
-				sWhere:'',
-				listData:[],
-				listDataNew:[],
-				page:1,
-				loading:true,
-	        }
-	    },
-		onLoad() {
-			uni.showLoading({
-				title:'鍔犺浇涓�'
-			})
-			this.search()
-			// console.log(this.userInfo,uni.getStorageSync('HUserName'))
-		},
-		onPullDownRefresh: function() {
-			this.clear()
-			setTimeout(()=>{
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		onReachBottom(){
-			if(this.loading == true){
-				this.page++
-				this.getList()
-			}
-		},
-	    methods: {
-			getList(){
-				console.log(this.sWhere,uni.getStorageSync('HUserName'),this.page)
-				uni.request({
-				    url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_OA_ErrMsgBackHandleBillListPage',
-					data:{ 
-						sWhere: this.sWhere,
-						user: uni.getStorageSync('HUserName'),
-						page:this.page,
-						size:20,
-					},
-				    success: (res) => {
-				        console.log(1,res.data);
-						uni.hideLoading()
-						if(res.data.code == 1){
-							this.listDataNew = res.data.data
-							if(this.listDataNew.length<20){
-								this.loading = false
-							}
-							this.listData = this.listData.concat(this.listDataNew)
-						}else{
-							uni.showToast({
-								title:res.data.Message,
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.hideLoading()
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨鍗曟嵁鏃ユ湡
-			HBeginDateChange(e){
-				console.log(e.detail.value)
-				this.hform.HBeginDate = e.detail.value
-			},
-			//閫夋嫨鍗曟嵁鏃ユ湡
-			HEndDateChange(e){
-				console.log(e.detail.value)
-				this.hform.HEndDate = e.detail.value
-			},
-			search(){
-				this.sWhere=''
-				this.listData=[]
-				this.listDataNew=[]
-				this.page=1
-				this.loading=true
-				if (this.hform.HBeginDate) {
-					this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HBeginDate + "'";
-				}
-				if (this.hform.HEndDate) {
-					this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.hform.HEndDate + "'";
-				}
-				if (this.hform.HBillNo) {
-					this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
-				}
-				this.getList()
-			},
-			getEndDate(){
-				let currentDate = new Date();
-				currentDate.setMonth(currentDate.getMonth() - 1);
-				let year = currentDate.getFullYear();
-				let month = String(currentDate.getMonth() + 1).padStart(2, '0');
-				let day = String(currentDate.getDate()).padStart(2, '0');
-				return `${year}-${month}-${day}`;
-			},
-			clear(){
-				this.sWhere = ''
-				this.hform = {
-					HBillNo:'',
-					HEndDate:getDateTime.dateTimeStr('y-m-d'),
-					HBeginDate:this.getEndDate(),
-				}
-				this.search()
-			},
-			reads(e){
-				uni.showModal({
-					content: e,
-					showCancel: false
-				});
-			},
-			toCheck(item){
-				uni.showModal({
-				    title: '鎻愮ず',
-				    content: '鏄惁纭瀹℃牳?',
-				    success: (res) => {
-				        if (res.confirm) {
-				            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-							uni.request({
-							    url: this.serverUrl + '/Sc_MESTransFerWorkBill/AuditOA_ErrMsgBackHandleBill',
-								data:{ 
-									HInterID: item.hmainid,
-									CurUserName: uni.getStorageSync('HUserName'),
-									IsAudit:0
-								},
-							    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('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-				        }
-				    }
-				});
-			},
-			toDel(item){
-				uni.showModal({
-				    title: '鎻愮ず',
-				    content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
-				    success: (res) => {
-				        if (res.confirm) {
-				            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-							uni.request({
-							    url: this.serverUrl + '/Sc_MESTransFerWorkBill/DeleteOA_ErrMsgBackHandleBill',
-								data:{ 
-									HInterID: item.hmainid,
-									user: uni.getStorageSync('HUserName')
-								},
-							    success: (res) => {
-							        console.log(1,res);
-									if(res.data.count == 1){
-										this.clear()
-									}
-									uni.showToast({
-										title:res.data.Message,
-										icon:'none'
-									})
-								},
-								fail: (res) => {
-									console.log(res);
-									uni.hideLoading()
-									uni.showToast({
-										title:'鎺ュ彛璇锋眰澶辫触',
-										icon:'none'
-									})
-								},
-							});
-				        } else if (res.cancel) {
-				            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-				        }
-				    }
-				});
-			}
-	    }
-	}
-</script>
-
-<style lang="scss" scoped>
-	.form{
-		width: 640rpx;
-		margin: 20rpx auto;
-	}
-    .form-item{
-		display: flex;
-		align-items: center;
-		font-size: 28rpx;
-		padding: 6rpx 0;
-		.title{
-			width: 180rpx;
-			text{
-				color: red;
-				font-weight: bold;
-			}
-		}
-		.right{
-			width: 450rpx;
-			border-radius: 22rpx;
-			border: 1px solid #acacac;
-		}
-		.righton{
-			width: 450rpx;
-			border-radius: 22rpx;
-			border: 1px solid #e4e4e4;
-			background-color: #e4e4e4;
-		}
-		input{
-			width: 100%;
-			padding: 8rpx 20rpx;
-			font-size: 30rpx;
-		}
-	}
-	.buttons{
-		width: 100%;
-		display: flex;
-		justify-content: center;
-		margin-top: 20rpx;
-		button{
-			border-radius: 50rpx;
-			width: 180rpx;
-			height: 66rpx;
-			line-height: 66rpx;
-			font-size: 28rpx;
-		}
-		.btn-a{
-			background-color: #acacac;
-			color: #fff;
-		}
-		.btn-b{
-			background-color: #41a863;
-			color: #fff;
-		}
-		.btn-c{
-			background-color: #3a78ff;
-			color: #fff;
-		}
-	}
-	
-	.list{
-		width: 100%;
-		.card-detail{
-			width: 100%;
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-			line-height: 120%;
-			.detail{
-				// width: 50%;
-				font-size: 26rpx;
-				margin-bottom: 12rpx;
-				color: #555;
-				margin-right: 20rpx;
-				text{
-					color: #999;
-					font-size: 26rpx;
-				}
-			}
-		}
-		.more{
-			color: #888;
-			font-size: 24rpx;
-			display: flex;
-			border-top: 1px solid #eee;
-			padding-top: 20rpx;
-			.part{
-				width: 50%;
-				text-align: center;
-			}
-		}
-	}
-
-</style>
diff --git a/pages/yichang/MESExecptFeedBackBill.vue b/pages/yichang/MESExecptFeedBackBill.vue
deleted file mode 100644
index 9201719..0000000
--- a/pages/yichang/MESExecptFeedBackBill.vue
+++ /dev/null
@@ -1,753 +0,0 @@
-<template>
-	<view>
-		<view class="form">
-			<view class="form-item">
-				<view class="title">鍗曟嵁鍙�:</view>
-				<view class="righton">
-					<input name="HBillNo" disabled v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鍗曟嵁鏃ユ湡:</view>
-				<view class="righton">
-					<input name="HDate" disabled v-model="hform.HDate" placeholder="璇烽�夋嫨" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">涓婚:</view>
-				<view class="right">
-					<input name="HContext" v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
-				</view>
-			</view>
-			<view class="form-item" style="align-items: flex-start;">
-				<view class="title"><text>*</text>璇︾粏鍐呭:</view>
-				<view class="right" style="min-height: 150rpx;">
-					<textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1" placeholder="璇疯緭鍏ヨ缁嗗唴瀹�"></textarea>
-				</view>
-			</view>
-			<view class="form-item" style="align-items: flex-start;">
-				<view class="title">澶囨敞:</view>
-				<view class="right" style="min-height: 150rpx;">
-					<textarea name="HRemark" v-model="hform.HRemark" auto-height maxlength="-1" placeholder="璇疯緭鍏ュ娉�"></textarea>
-				</view>
-			</view>
-			
-			<view class="tab_area"></view>
-			
-			<view class="form-item">
-				<view class="title">寮傚父绫诲瀷:</view>
-				<view class="righton">
-					<input name="HErrMsgBackTypeName" disabled v-model="hform.HErrMsgBackTypeName" placeholder="" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鍙戦�侀儴闂�:</view>
-				<view class="righton">
-					<input name="HDeptName" disabled v-model="hform.HDeptName" placeholder="" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鍙戦�佷汉:</view>
-				<view class="righton">
-					<input name="HSendMan" disabled v-model="hform.HSendMan" placeholder="" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title"><text>*</text>鎺ユ敹閮ㄩ棬:</view>
-				<view class="right">
-					<uni-combox :candidates="arrayHReceiveName" placeholder="璇烽�夋嫨" v-model="hform.HReceiveName" @input="HReceiveNameChange"></uni-combox>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title"><text>*</text>鎺ユ敹浜�:</view>
-				<view class="right">
-					<uni-combox :candidates="arrayHReceiveMan" placeholder="璇烽�夋嫨" v-model="hform.HReceiveMan" @input="HReceiveManChange"></uni-combox>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">澶勭悊浜�:</view>
-				<view class="righton">
-					<input name="HHandleEmpName" disabled v-model="hform.HHandleEmpName" placeholder="" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鎶勯�佷汉:</view>
-				<view class="righton">
-					<input name="HCopyMan" disabled v-model="hform.HCopyMan" placeholder="" />
-				</view>
-			</view>
-			
-			<view class="tab_area"></view>
-			
-			<view class="form-item">
-				<view class="title">绱ф�ョ▼搴�:</view>
-				<view class="right">
-					<picker :range="arrayHLevel" v-model="hform.HLevel" @change="HLevelChange">
-						<input name="HLevel" disabled v-model="hform.HLevel" placeholder="璇烽�夋嫨绱ф�ョ▼搴�" />
-					</picker>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鍗曟嵁绫诲瀷:</view>
-				<view class="righton">
-					<input name="HBillTypeName" disabled v-model="hform.HBillTypeName" placeholder="璇疯緭鍏ュ崟鎹被鍨�" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鍗曟嵁鍙风爜:</view>
-				<view class="righton">
-					<input name="HPlanBillNo" disabled v-model="hform.HPlanBillNo" placeholder="璇疯緭鍏ュ崟鎹彿鐮�" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">浜у搧鍚嶇О:</view>
-				<view class="right">
-					<input name="HMaterName" v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">瑙勬牸鍨嬪彿:</view>
-				<view class="right">
-					<input name="HMaterModel" v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鐩稿叧璁惧:</view>
-				<view class="right">
-					<uni-combox :candidates="arrayHEquipName" placeholder="璇烽�夋嫨" v-model="hform.HEquipName" @input="HEquipNameChange"></uni-combox>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鐩稿叧妯℃不鍏�:</view>
-				<view class="right">
-					<uni-combox :candidates="arrayHMouldName" placeholder="璇烽�夋嫨" v-model="hform.HMouldName" @input="HMouldNameChange"></uni-combox>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">澶勭悊鍐呭:</view>
-				<view class="right">
-					<input name="HHandleNote" v-model="hform.HHandleNote" placeholder="璇疯緭鍏ュ鐞嗗唴瀹�" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">澶勭悊瀹屾垚鏃堕棿:</view>
-				<view class="right">
-					<uni-datetime-picker v-model="hform.HHandleDate">
-						<input name="HHandleDate" disabled :value="hform.HHandleDate" placeholder="璇烽�夋嫨" />
-					</uni-datetime-picker>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">澶勭悊缁撴灉:</view>
-				<view class="right">
-					<picker :range="arrayHHandleResult" v-model="hform.HHandleResult" @change="HHandleResultChange">
-						<input name="HHandleResult" disabled v-model="hform.HHandleResult" placeholder="璇烽�夋嫨澶勭悊缁撴灉" />
-					</picker>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title"><text>*</text>澶勭悊鏂规:</view>
-				<view class="right">
-					<uni-combox :candidates="arrayHBadReasonName" placeholder="璇烽�夋嫨" v-model="hform.HBadReasonName" @input="HBadReasonNameChange"></uni-combox>
-				</view>
-			</view>
-			
-			<view class="tab_area"></view>
-			
-			<view class="form-item">
-				<view class="title">鍒跺崟浜�:</view>
-				<view class="righton">
-					<input v-model="hform.HMaker" disabled/>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鍒跺崟鏃ユ湡:</view>
-				<view class="righton">
-					<input name="HMakeDate" disabled v-model="hform.HMakeDate" placeholder="" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">淇敼浜�:</view>
-				<view class="righton">
-					<input v-model="hform.HUpDater" disabled/>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">淇敼鏃ユ湡:</view>
-				<view class="righton">
-					<input name="HUpDateDate" disabled v-model="hform.HUpDateDate" placeholder="" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">瀹℃牳浜�:</view>
-				<view class="righton">
-					<input v-model="hform.HChecker" disabled/>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">瀹℃牳鏃ユ湡:</view>
-				<view class="righton">
-					<input name="HCheckDate" disabled v-model="hform.HCheckDate" placeholder="" />
-				</view>
-			</view>
-
-			<view class="bottom-btn">
-				<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-				<!-- <button class="btn-b" size="mini" @tap="showMask = true">鏂板</button> -->
-				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
-			</view>
-		</view>
-	</view>
-</template>
-<script>
-	import getDateTime from '@/utils/getdateTime.js';
-	import { getUserInfo } from "@/utils/auth.js";
-    export default {
-        data() {
-            return {
-				userInfo:getUserInfo(),
-				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
-				
-				arrayHLevel:['鏅��','绱ф��'],
-				arrayHHandleResult:['澶勭悊瀹屾垚','鏈鐞�','鏃犳硶澶勭悊'],
-				arrayHReceiveName:[],
-				HReceiveNameList:[],
-				arrayHReceiveMan:[],
-				HReceiveManList:[],
-				arrayHEquipName:[],
-				HEquipNameList:[],
-				arrayHMouldName:[],
-				HMouldNameList:[],
-				arrayHBadReasonName:[],
-				HBadReasonNameList:[],
-				isEdit: false,
-				eData:{
-					OperationType:'', //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
-					linterid:'',//浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-					HEntryID:'', //瀛愬唴鐮�
-					HSouceBillType:'',//婧愬崟绫诲瀷
-				},
-				hform:{
-					HBillNo:'',
-					HInterID:'',
-					HEntryID:'',
-					HDate:getDateTime.dateTimeStr('y-m-d h:i:s'),
-					HContext:'',
-					HDescription:'',
-					HRemark:'',
-					
-					HErrMsgBackTypeName:'',
-					HErrMsgBackTypeID:'',
-					HDeptName:getUserInfo().HDept,
-					HDeptID:getUserInfo().HDeptID,
-					HSendMan:getUserInfo().Czymc,
-					HReceiveName:'',
-					HReceiveID:'',
-					HReceiveMan:'',
-					HHandleEmpName:'',
-					HHandleEmpID:0,
-					HCopyMan:'',
-					
-					HLevel:'鏅��',
-					HBillTypeName:'',
-					HPlanBillNo:'',
-					HMaterName:'',
-					HMaterModel:'',
-					HEquipName:'',
-					HEquipID:'',
-					HMouldName:'',
-					HMouldID:'',
-					HHandleNote:'',
-					HHandleDate:getDateTime.dateTimeStr('y-m-d h:i:s'),
-					HHandleResult:'澶勭悊瀹屾垚',
-					HBadReasonName:'',
-					HBadReasonID:'',
-
-					HMainSourceBillNo:'',
-					HMainSourceInterID:'',
-					HMainSourceEntryID:'',
-					HMainSourceBillType:'',
-					HErrMsgBackBillNo:'',
-					HErrMsgBackInterID:'',
-					HErrMsgBackEntryID:'',
-					
-					HMaker:getUserInfo().Czymc,
-					HMakeDate:getDateTime.dateTimeStr('y-m-d h:i:s'),
-					HUpDater:'',
-					HUpDateDate:'',
-					HChecker:'',
-					HCheckDate:'',
-				}
-            }
-        },
-		onLoad(e) {
-			console.log(e)
-			uni.showLoading({
-				title:'鏁版嵁鍔犺浇涓�'
-			})
-			this.eData = e
-			this.getNewData()
-			this.getListData()
-		},
-        methods: {
-			HHandleDateChange(e){
-				console.log(e.detail.value)
-				this.hform.HHandleDate = e.detail.value
-			},
-			//閫夋嫨绱ф�ョ▼搴�
-			HLevelChange(e){
-				this.hform.HLevel = this.arrayHLevel[e.detail.value]
-			},
-			//閫夋嫨澶勭悊缁撴灉
-			HHandleResultChange(e){
-				this.hform.HHandleResult = this.arrayHHandleResult[e.detail.value]
-			},
-			//閫夋嫨閮ㄩ棬
-			HReceiveNameChange(e){
-				for(var i=0;i<this.HReceiveNameList.length;i++){
-					if(this.arrayHReceiveName[i] == e){
-						this.hform.HReceiveName = this.HReceiveNameList[i].閮ㄩ棬鍚嶇О
-						this.hform.HReceiveID = this.HReceiveNameList[i].HItemID
-					}
-				}
-			},
-			//閫夋嫨鎺ユ敹浜�
-			HReceiveManChange(e){
-				for(var i=0;i<this.HReceiveManList.length;i++){
-					if(this.arrayHReceiveMan[i] == e){
-						this.hform.HReceiveMan = this.HReceiveManList[i].title
-					}
-				}
-			},
-			//閫夋嫨璁惧
-			HEquipNameChange(e){
-				for(var i=0;i<this.HEquipNameList.length;i++){
-					if(this.arrayHEquipName[i] == e){
-						this.hform.HEquipName = this.HEquipNameList[i].璁惧鍚嶇О
-						this.hform.HEquipID = this.HEquipNameList[i].hmainid
-					}
-				}
-			},
-			//閫夋嫨妯″叿
-			HMouldNameChange(e){
-				for(var i=0;i<this.HMouldNameList.length;i++){
-					if(this.arrayHMouldName[i] == e){
-						this.hform.HMouldName = this.HMouldNameList[i].妯″叿鍚嶇О
-						this.hform.HMouldID = this.HMouldNameList[i].hmainid
-					}
-				}
-			},
-			//閫夋嫨澶勭悊鍘熷洜
-			HBadReasonNameChange(e){
-				for(var i=0;i<this.HBadReasonNameList.length;i++){
-					if(this.arrayHBadReasonName[i] == e){
-						this.hform.HBadReasonName = this.HBadReasonNameList[i].澶勭悊鏂规鍚嶇О
-						this.hform.HBadReasonID = this.HBadReasonNameList[i].HItemID
-					}
-				}
-			},
-			getListData() {
-				console.log(uni.getStorageSync('OrganizationID'))
-				uni.request({
-				    url: this.serverUrl + '/Gy_Department/list', 
-					data: { sWhere: "", user: uni.getStorageSync('HUserName'),Organization:uni.getStorageSync('Organization') },
-				    success: (res) => {
-						// console.log(444,res)
-						if(res.data.count == 1){
-							this.HReceiveNameList = res.data.data
-							for(var i=0;i<res.data.data.length;i++){
-								this.arrayHReceiveName[i] = res.data.data[i].閮ㄩ棬鍚嶇О + '(' + res.data.data[i].閮ㄩ棬浠g爜 + ')'
-							}
-							this.$forceUpdate();
-						}else{
-							uni.showToast({
-								title:'鑾峰彇閮ㄩ棬淇℃伅澶辫触',
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鑾峰彇閮ㄩ棬淇℃伅澶辫触',
-							icon:'none'
-						})
-					},
-				});
-				uni.request({
-				    url: this.serverUrl + '/PublicPageMethod/PeopleTransFerList', 
-					// data: { sWhere: "", user: uni.getStorageSync('HUserName') },
-				    success: (res) => {
-						if(res.data.count == 1){
-							// console.log(555,res.data.data)
-							this.HReceiveManList = res.data.data
-							for(var i=0;i<res.data.data.length;i++){
-								this.arrayHReceiveMan[i] = res.data.data[i].title
-							}
-							this.$forceUpdate();
-						}else{
-							uni.showToast({
-								title:'鑾峰彇鎺ユ敹浜轰俊鎭け璐�',
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鑾峰彇鎺ユ敹浜轰俊鎭け璐�',
-							icon:'none'
-						})
-					},
-				});
-				uni.request({
-				    url: this.serverUrl + '/Gy_EquipFileMain/GetList', 
-					data: { sWhere: "", user: uni.getStorageSync('HUserName') },
-				    success: (res) => {
-						// console.log(111,res.data)
-						if(res.data.count == 1){
-							this.HEquipNameList = res.data.data
-							for(var i=0;i<res.data.data.length;i++){
-								this.arrayHEquipName[i] = res.data.data[i].璁惧鍚嶇О + '(' + res.data.data[i].璁惧缂栫爜 + ')'
-							}
-							this.$forceUpdate();
-						}else{
-							uni.showToast({
-								title:'鑾峰彇鐩稿叧璁惧淇℃伅鍒楄〃澶辫触',
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鑾峰彇鐩稿叧璁惧淇℃伅鍒楄〃澶辫触',
-							icon:'none'
-						})
-					},
-				});
-				uni.request({
-				    url: this.serverUrl + '/Gy_Mould/list1', 
-					data: { sWhere: "", ModRightNameSelect: "Gy_MouldFileList", user: uni.getStorageSync('HUserName') },
-				    success: (res) => {
-						if(res.data.count == 1){
-							// console.log(222,res.data.data)
-							this.HMouldNameList = res.data.data
-							for(var i=0;i<res.data.data.length;i++){
-								this.arrayHMouldName[i] = res.data.data[i].妯″叿鍚嶇О + '(' + res.data.data[i].妯″叿缂栧彿 + ')'
-							}
-							this.$forceUpdate();
-						}else{
-							uni.showToast({
-								title:'鑾峰彇鐩稿叧妯℃不鍏峰垪琛ㄥけ璐�',
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鑾峰彇鐩稿叧妯℃不鍏峰垪琛ㄥけ璐�',
-							icon:'none'
-						})
-					},
-				});
-				uni.request({
-				    url: this.serverUrl + '/Gy_DisposeWay/list', 
-					data: { sWhere: "", user: uni.getStorageSync('HUserName') },
-				    success: (res) => {
-						if(res.data.count == 1){
-							// console.log(333,res.data.data)
-							this.HBadReasonNameList = res.data.data
-							for(var i=0;i<res.data.data.length;i++){
-								this.arrayHBadReasonName[i] = res.data.data[i].澶勭悊鏂规鍚嶇О
-							}
-							this.$forceUpdate();
-						}else{
-							uni.showToast({
-								title:'鑾峰彇澶勭悊鏂规鍒楄〃澶辫触',
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鑾峰彇澶勭悊鏂规鍒楄〃澶辫触',
-							icon:'none'
-						})
-					},
-				});
-			},
-			getBaseData(){
-				//涓昏〃
-				uni.request({
-				    url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_OA_ErrMsgBackList', 
-					data: { 
-						"HInterID": this.eData.linterid,
-						"HEntryID": this.eData.HEntryID,
-						"user": uni.getStorageSync('HUserName'),
-						"num": 1
-					},
-				    success: (res) => {
-				        console.log(1,res.data.data[0]);
-						if(res.data.code == 1){
-							var data = res.data.data[0]
-							this.hform.HDeptID=data.HDeptID //閮ㄩ棬ID
-							this.hform.HDeptName=data.鍙戦�侀儴闂� //鍙戦�侀儴闂�
-							this.hform.HReceiveID=data.HReceiveID //閮ㄩ棬ID
-							this.hform.HReceiveName=data.鎺ユ敹閮ㄩ棬 //鎺ユ敹閮ㄩ棬
-							this.hform.HErrMsgBackTypeID=data.HErrMsgBackTypeID //寮傚父绫诲瀷鍚嶇ОID
-							this.hform.HErrMsgBackTypeName=data.寮傚父绫诲瀷鍚嶇О //寮傚父绫诲瀷鍚嶇О
-							this.hform.HSendMan=data.鍙戦�佷汉 //鍙戦�佷汉
-							this.hform.HReceiveMan=data.鎸囨淳澶勭悊浜� //鎺ユ敹浜�
-							this.hform.HCopyMan=data.鎶勯�� //鎶勯��
-							this.hform.HLevel=data.绱ф�ョ▼搴� //绱ф�ョ▼搴�
-							this.hform.HContext=data.涓婚 //涓婚
-							this.hform.HDescription=data.璇︾粏鍐呭 //璇︾粏鍐呭
-							this.hform.HMaterName=data.鐗╂枡鍚嶇О //浜у搧鍚嶇О
-							this.hform.HMaterModel=data.瑙勬牸鍨嬪彿 //瑙勬牸鍨嬪彿
-							this.hform.HEquipID=data.璁惧id //璁惧id
-							this.hform.HEquipName=data.璁惧鍚嶇О //浜у搧鍚嶇О
-							this.hform.HMouldID=data.妯″叿id //妯″叿id
-							this.hform.HMouldName=data.妯″叿鍚嶇О //妯″叿鍚嶇О
-							this.hform.HBillTypeName=this.eData.HSouceBillType //鍗曟嵁绫诲瀷
-							this.hform.HPlanBillNo=data.鍗曟嵁鍙� //鍗曟嵁鍙�
-							
-							this.hform.HMainSourceBillNo=data.鍗曟嵁鍙� //婧愬崟鍗曞彿
-							this.hform.HMainSourceInterID=data.HInterID //婧愬崟涓诲唴鐮�
-							this.hform.HMainSourceEntryID=data.HEntryID //婧愬崟瀛愬唴鐮�
-							this.hform.HMainSourceBillType=this.eData.HSouceBillType //婧愬崟绫诲瀷
-							
-							this.hform.HErrMsgBackBillNo=data.鍗曟嵁鍙� //寮傚父鍙嶉鍗曞彿
-							this.hform.HErrMsgBackInterID=data.HInterID //寮傚父鍙嶉鍗曚富鍐呯爜
-							this.hform.HErrMsgBackEntryID=data.HEntryID //寮傚父鍙嶉鍗曞瓙鍐呯爜
-							
-							this.hform.HHandleEmpID=data.HHandleEmpID //绛惧埌浜篒D
-							this.hform.HHandleEmpName=data.鎸囨淳澶勭悊浜� //绛惧埌浜�
-						}else{
-							uni.showToast({
-								title:'鑾峰彇涓昏〃淇℃伅鍥炲~澶辫触',
-								icon:'none'
-							})
-						}
-						uni.hideLoading()
-					},
-					fail: (res) => {
-						uni.hideLoading()
-						console.log(res);
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-			},
-			//鏂板
-			getNewData(){
-				uni.request({
-				    url: this.serverUrl + '/Web/GetMAXNum', 
-					data: { HBillType: '4531' },
-				    success: (res) => {
-						// console.log(res.data)
-						if(res.data.count == 1){
-							this.hform.HInterID = res.data.data[0].HInterID
-							this.hform.HBillNo = res.data.data[0].HBillNo
-							this.getBaseData()
-						}else{
-							uni.showToast({
-								title:res.data.Message,
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-			},
-            submit() {
-            	if(!this.hform.HReceiveID){
-            		uni.showToast({
-            			title:'璇烽�夋嫨鎺ユ敹閮ㄩ棬',
-            			icon:'none'
-            		})
-				}else if(!this.hform.HReceiveMan){
-					uni.showToast({
-						title:'璇烽�夋嫨鎺ユ敹浜�',
-						icon:'none'
-					})
-				}else if(!this.hform.HBadReasonID){
-					uni.showToast({
-						title:'璇烽�夋嫨澶勭悊鍘熷洜',
-						icon:'none'
-					})
-            	}else{
-            		uni.showLoading({
-            			title:'璇风◢鍊�'
-            		})
-					var sMainStr = JSON.stringify(this.hform);
-					var sMainSub = sMainStr + ';Add;' + uni.getStorageSync('HUserName')
-            		// console.log(sMainSub);
-            		uni.request({
-            		    url: this.serverUrl + '/Sc_MESTransFerWorkBill/SaveOA_ErrMsgBackHandleBill',
-            			method:'POST',
-            			dataType:"json",
-            			data:{ "msg": sMainSub },
-            		    success: (res) => {
-            		        console.log(1,res);
-            				uni.hideLoading()
-            				if(res.data.count == 1){
-								if (res.data.Verify == "Y"){ //鑷姩瀹℃牳
-								    this.SaveVerify(res.data.HInterID) //瀹℃牳
-								}else {
-									let pages = getCurrentPages();
-									let prePage = pages[pages.length - 2];
-									prePage.$vm.clear()
-									setTimeout(()=>{
-										uni.navigateBack()
-									},1000)
-								}
-            				}
-            				uni.showToast({
-            					title:res.data.Message,
-            					icon:'none'
-            				})
-            			},
-            			fail: (res) => {
-            				console.log(res);
-            				uni.showToast({
-            					title:'鎺ュ彛璇锋眰澶辫触',
-            					icon:'none'
-            				})
-            			},
-            		});
-            	}
-            },
-			SaveVerify(HInterID){
-				var datas={
-					HInterID:HInterID,
-					IsAudit:0,
-					CurUserName:getUserInfo().Czymc
-				}
-				console.log(datas)
-				uni.request({
-				    url: this.serverUrl + '/Sc_MESTransFerWorkBill/AuditOA_ErrMsgBackHandleBill',
-					method:'GET',
-					dataType:"json",
-					async: true,
-					data:datas,
-				    success: (res) => {
-				        console.log(1,res);
-						uni.hideLoading()
-						if(res.data.count == 1){
-							let pages = getCurrentPages(); 
-							let prePage = pages[pages.length - 2]; 
-							prePage.$vm.clear()
-							setTimeout(()=>{
-								uni.navigateBack()
-							},1000)
-						}
-						uni.showToast({
-							title:res.data.Message,
-							icon:'none'
-						})
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-			},
-            goBack(){
-            	uni.navigateBack()
-            }
-        }
-    }
-</script>
-
-<style lang="scss" scoped>
-	.form{
-		width: 668rpx;
-		margin: 20rpx auto;
-		padding-bottom: 240rpx;
-	}
-	.tab_area{
-		width: 100%;
-		height: 50rpx;
-	}
-    .form-item{
-		display: flex;
-		align-items: center;
-		font-size: 30rpx;
-		padding: 6rpx 0;
-		.title{
-			width: 208rpx;
-			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;
-		}
-		textarea{
-			width: 94%;
-			padding: 8rpx 3%;
-			font-size: 30rpx;
-		}
-
-	}
-	.bottom-btn{
-		width: 100%;
-		// height: 120rpx;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		background-color: #fff;
-		box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
-		padding: 30rpx 40rpx 40rpx 40rpx;
-		button{
-			border-radius: 50rpx;
-			width: 180rpx;
-			height: 66rpx;
-			line-height: 66rpx;
-			font-size: 28rpx;
-		}
-		.btn-a{
-			background-color: #3A78FF;
-			color: #fff;
-		}
-		.btn-b{
-			background-color: #41a863;
-			color: #fff;
-			margin-left: 30rpx;
-		}
-		.btn-c{
-			background-color: #acacac;
-			color: #fff;
-			position: absolute;
-			right: 120rpx;
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/pages/yichang/MESExecptFeedBackBillList.vue b/pages/yichang/MESExecptFeedBackBillList.vue
deleted file mode 100644
index b08c9a0..0000000
--- a/pages/yichang/MESExecptFeedBackBillList.vue
+++ /dev/null
@@ -1,333 +0,0 @@
-<template>
-	<view class="content">
-		<view class="form">
-			<view class="form-item">
-				<view class="title">浜嬩欢鐘舵��:</view>
-				<view class="right">
-					<picker :range="arrayHStatus" v-model="hform.HReadFlag" @change="HStatusChange">
-						<input name="HStatus" disabled v-model="hform.HReadFlag" placeholder="璇烽�夋嫨浜嬩欢鐘舵��" />
-					</picker>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">寮�濮嬫棩鏈�:</view>
-				<view class="right">
-					<picker mode="date" :value="hform.HBeginDate" @change="HBeginDateChange">
-						<input name="HBeginDate" disabled :value="hform.HBeginDate" placeholder="璇烽�夋嫨" />
-					</picker>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">缁撴潫鏃ユ湡:</view>
-				<view class="right">
-					<picker mode="date" :value="hform.HEndDate" @change="HEndDateChange">
-						<input name="HEndDate" disabled :value="hform.HEndDate" placeholder="璇烽�夋嫨" />
-					</picker>
-				</view>
-			</view>
-			
-			<view class="buttons">
-				<button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
-				<!-- <button class="btn-b" size="mini" type="default">鏂板</button> -->
-				<button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
-			</view>
-		</view>
-		
-		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
-		
-		<view class="list" v-for="(item,index) in listData" :key="index">
-			<uni-card :title="item.鍗曟嵁鐘舵��" :extra="item.鍗曟嵁鍙�" style="margin: 10px;">
-				<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 class="detail" v-if="item.鎺ユ敹浜�">
-						<text>鎺ユ敹浜猴細</text>{{item.鎺ユ敹浜簘}
-					</view>
-					<view class="detail" v-if="item.鎶勯�佷汉">
-						<text>鎶勯�佷汉锛�</text>{{item.鎶勯�佷汉}}
-					</view>
-					<view class="detail" v-if="item.鎸囨淳澶勭悊浜�">
-						<text>鎸囨淳澶勭悊浜猴細</text>{{item.鎸囨淳澶勭悊浜簘}
-					</view>
-					
-					<view class="detail" v-if="item.鍒跺崟鏃ユ湡">
-						<text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.鍒跺崟浜�">
-						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
-					</view>
-					<view class="detail" v-if="item.瀹℃牳鏃ユ湡">
-						<text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
-					</view>
-					<view class="detail" v-if="item.瀹℃牳浜�">
-						<text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
-					</view>
-				</view>
-				<view class="more">
-					<view class="part" style="border-right: 1px solid #eee;" @tap="reads(item.鍐呭)">
-						<uni-icons type="bars" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鍙嶉鍗曞叿浣撳唴瀹�
-					</view>
-					<view class="part" @tap="toForm(item)">
-						<uni-icons type="pulldown" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>涓嬫帹鍙嶉澶勭悊鍗�
-					</view>
-				</view>
-			</uni-card>
-		</view>
-		
-		<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
-		<view class="over" v-if="listData.length != 0">宸插埌搴�</view>
-	</view>
-</template>
-
-<script>
-	import { getUserInfo } from "@/utils/auth.js";
-	import getDateTime from '@/utils/getdateTime.js';
-	export default {
-	    data() {
-	        return {
-				userInfo:getUserInfo(),
-				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
-				arrayHStatus:['鍏ㄩ儴','宸插弽棣�','宸茬鍒�','宸插鐞�','宸查獙鏀�'],
-				arrayHStatusId:['','2','13','9','10'],
-				hform:{
-					HStatus:'',
-					HReadFlag:'鍏ㄩ儴',
-					HEndDate:getDateTime.dateTimeStr('y-m-d'),
-					HBeginDate:this.getEndDate(),
-					HSourceID:0,
-				},
-				sWhere:'',
-				listData:[],
-	        }
-	    },
-		onLoad() {
-			this.clear()
-			console.log(this.userInfo,uni.getStorageSync('HUserName'))
-		},
-		onPullDownRefresh: function() {
-			this.clear()
-			setTimeout(()=>{
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-	    methods: {
-			getList(){
-				console.log(this.sWhere)
-				uni.request({
-				    url: this.serverUrl + '/Sc_MESTransFerWorkBill/GetSc_MESTransFerWorkBillQuery',
-					data:{ 
-						sWhere: this.hform,
-						user: uni.getStorageSync('HUserName')
-					},
-				    success: (res) => {
-				        console.log(1,res.data.data.h_p_OA_ErrMsgBackSelfQuery);
-						if(res.data.count == 1){
-							this.listData = res.data.data.h_p_OA_ErrMsgBackSelfQuery
-						}else{
-							uni.showToast({
-								title:res.data.Message,
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.hideLoading()
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-				
-				// uni.request({
-				//     url: this.serverUrl + '/Gy_EquipFileMain/Sb_EquipFileBillResumeDate',
-				// 	data: { "HInterID": 2 },
-				//     success: (res) => {
-				//         console.log(2,res);
-						
-				//     }
-				// });
-			},
-			//浜嬩欢鐘舵�佹敼鍙�
-			HStatusChange(e){
-				this.hform.HStatus = this.arrayHStatusID[e.detail.value]
-				this.hform.HReadFlag = this.arrayHStatus[e.detail.value]
-			},
-			//閫夋嫨鍗曟嵁鏃ユ湡
-			HBeginDateChange(e){
-				console.log(e.detail.value)
-				this.hform.HBeginDate = e.detail.value
-			},
-			//閫夋嫨鍗曟嵁鏃ユ湡
-			HEndDateChange(e){
-				console.log(e.detail.value)
-				this.hform.HEndDate = e.detail.value
-			},
-			search(){
-				// this.sWhere = ''
-				
-				// console.log(this.hform)
-				// if (this.hform.HBillNo) {
-				//     this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
-				// }
-				// if (this.hform.HEquipType) {
-				//     this.sWhere += " and 璁惧绫诲瀷 like '%" + this.hform.HEquipType + "%'";
-				// }
-				// if (this.hform.HBeginDate) {
-				//     this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HBeginDate + "'";
-				// }
-				// if (this.hform.HEndDate) {
-				//     this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HEndDate + "'";
-				// }
-				
-				this.getList()
-			},
-			getEndDate(){
-				let currentDate = new Date();
-				currentDate.setMonth(currentDate.getMonth() - 1);
-				let year = currentDate.getFullYear();
-				let month = String(currentDate.getMonth() + 1).padStart(2, '0');
-				let day = String(currentDate.getDate()).padStart(2, '0');
-				return `${year}-${month}-${day}`;
-			},
-			clear(){
-				this.sWhere = ''
-				this.hform = {
-					HStatus:'',
-					HReadFlag:'鍏ㄩ儴',
-					HEndDate:getDateTime.dateTimeStr('y-m-d'),
-					HBeginDate:this.getEndDate(),
-					HSourceID:0,
-				}
-				this.getList()
-			},
-			reads(e){
-				uni.showModal({
-					content: e,
-					showCancel: false
-				});
-			},
-			toForm(item){
-				uni.navigateTo({
-					url:'./form?OperationType=2&linterid=' + item.HInterID + '&HEntryID=' + item.HEntryID + '&HSouceBillType=4502'
-				})
-			}
-	    }
-	}
-</script>
-
-<style lang="scss" scoped>
-	.form{
-		width: 640rpx;
-		margin: 20rpx auto;
-	}
-    .form-item{
-		display: flex;
-		align-items: center;
-		font-size: 28rpx;
-		padding: 6rpx 0;
-		.title{
-			width: 180rpx;
-			text{
-				color: red;
-				font-weight: bold;
-			}
-		}
-		.right{
-			width: 450rpx;
-			border-radius: 22rpx;
-			border: 1px solid #acacac;
-		}
-		.righton{
-			width: 450rpx;
-			border-radius: 22rpx;
-			border: 1px solid #e4e4e4;
-			background-color: #e4e4e4;
-		}
-		input{
-			width: 100%;
-			padding: 8rpx 20rpx;
-			font-size: 30rpx;
-		}
-	}
-	.buttons{
-		width: 100%;
-		display: flex;
-		justify-content: center;
-		margin-top: 20rpx;
-		button{
-			border-radius: 50rpx;
-			width: 180rpx;
-			height: 66rpx;
-			line-height: 66rpx;
-			font-size: 28rpx;
-		}
-		.btn-a{
-			background-color: #acacac;
-			color: #fff;
-		}
-		.btn-b{
-			background-color: #41a863;
-			color: #fff;
-		}
-		.btn-c{
-			background-color: #3a78ff;
-			color: #fff;
-		}
-	}
-	
-	.list{
-		width: 100%;
-		.card-detail{
-			width: 100%;
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-			line-height: 120%;
-			.detail{
-				// width: 50%;
-				font-size: 26rpx;
-				margin-bottom: 12rpx;
-				color: #555;
-				margin-right: 20rpx;
-				text{
-					color: #999;
-					font-size: 26rpx;
-				}
-			}
-		}
-		.more{
-			color: #888;
-			font-size: 24rpx;
-			display: flex;
-			border-top: 1px solid #eee;
-			padding-top: 20rpx;
-			.part{
-				width: 50%;
-				text-align: center;
-			}
-		}
-	}
-
-</style>
diff --git a/pages/zutuo_xiaowei/form_xiaowei.vue b/pages/zutuo_xiaowei/form_xiaowei.vue
index f38ed97..512701f 100644
--- a/pages/zutuo_xiaowei/form_xiaowei.vue
+++ b/pages/zutuo_xiaowei/form_xiaowei.vue
@@ -258,7 +258,7 @@
 					HMaterModel:'',
 					HCusModel:'',
 					HCusMaterName:'',
-					HEmpID:getUserInfo()['Czybm'],
+					HEmpID:getUserInfo()['HEmpID'],
 					HEmpNumber:uni.getStorageSync("HEmpNumber"),
 					HEmpName:getUserInfo()['Czymc'],
 					HGroupID:0,
diff --git a/utils/i18n.js b/utils/i18n.js
index 04133e2..5ff2f8b 100644
--- a/utils/i18n.js
+++ b/utils/i18n.js
@@ -52,7 +52,6 @@
         }
         // 闃叉椤甸潰鍒濇鍔犺浇鏃讹紝浣跨敤鏈湴缈昏瘧妯″潡瀵艰嚧鐨� 鍋囩己澶辩幇璞�
         MissingKeysMap[key].add(HFieldCode)
-        console.log('MissingKeysMap: ', MissingKeysMap);
         if (!clockID) {
             clockID = setTimeout(() => {
                 syncMissingKeyToDB()

--
Gitblit v1.9.1