From e8d4cc42b3ce74a818705aab13c2131d81a5ed6b Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 21 一月 2026 20:26:17 +0800
Subject: [PATCH] 模具出入库和维修验收优化

---
 pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue                 |   14 
 pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue                         |   24 
 pages/index/tab3.vue                                                         |   28 
 pages.json                                                                   |   64 +
 pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue |   25 
 pages/index/tab2.vue                                                         |   20 
 pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue                     |    8 
 components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue              |  385 ++++++++++++
 pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue                   | 1275 +++++++++++++++++++++-------------------
 9 files changed, 1,163 insertions(+), 680 deletions(-)

diff --git a/components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue b/components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue
new file mode 100644
index 0000000..defa328
--- /dev/null
+++ b/components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue
@@ -0,0 +1,385 @@
+<template>
+    <view>
+        <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
+            <view class="content">
+                <view class="search-condition">
+                    <view class="title"><text>鏃ユ湡: </text></view>
+                    <view class="daterange" style="flex: 1;">
+                        <view class="right general">
+                            <uni-datetime-picker type="date" :clear-icon="false" v-model="HBeginDate">
+                                <view>{{HBeginDate}}</view>
+                            </uni-datetime-picker>
+                        </view>
+                        <view>鈥�</view>
+                        <view class="right general">
+                            <uni-datetime-picker type="date" :clear-icon="false" v-model="HEndDate">
+                                <view>{{HEndDate}}</view>
+                            </uni-datetime-picker>
+                        </view>
+                    </view>
+                </view>
+                <!-- 淇濇寔涓庢晠闅滅櫥璁板崟鐩稿悓鐨勬悳绱㈡潯浠� -->
+                <view class="search-condition">
+                    <view class="title"><text>妯″叿缂栫爜: </text></view>
+                    <view class="right"><input type="text" :focus="enablefocus" v-model="HNumber"
+                            @confirm="getRepairRecordList" /></view>
+                </view>
+                <view class="search-condition">
+                    <view class="title"><text>妯″叿鍚嶇О: </text></view>
+                    <view class="right"><input type="text" v-model="HName" @confirm="getRepairRecordList" /></view>
+                </view>
+                <view class="search-condition">
+                    <view class="title"><text>鍗曟嵁鍙�: </text></view>
+                    <view class="right"><input type="text" v-model="HBillNo" @confirm="getRepairRecordList" /></view>
+                </view>
+                <view class="buttons">
+                    <view style="flex: 1;"></view>
+                    <button size="mini" type="primary" @click="search">鎼滅储</button>
+                    <button size="mini" type="primary" @click="exit">閫�鍑�</button>
+                </view>
+                <scroll-view id="#BillListPanel" scroll-y="true" style="height: 50vh;">
+                    <view class="options-wrapper" v-show="HRepairRecordList.length != 0">
+                        <uni-card :is-active="record.isActive" :class="record.isActive?'uni-card--is-active':''"
+                            v-for="(record, index) in HRepairRecordList[curPage-1]" :key="index" 
+                            :title="record['鍗曟嵁鍙�'] || record['HBillNo'] || record['缁翠慨鍗曞彿']"
+                            @tap="clickCard(record, index)">
+                            <view class="item">
+                                <view class="left">鏃ユ湡: </view>
+                                <view class="right">{{dayjs(record['鏃ユ湡'] || record['缁翠慨鏃ユ湡'] || record['HDate']).format('YYYY-MM-DD')}}</view>
+                            </view>
+                            <view class="item" v-if="record['妯″叿缂栫爜'] || record['HMouldCode']">
+                                <view class="left">妯″叿缂栫爜: </view>
+                                <view class="right">{{record['浜у搧妯″叿浠ｇ爜'] || record['HMouldCode']}}</view>
+                            </view>
+                            <view class="item" v-if="record['妯″叿鍚嶇О'] || record['HMouldName']">
+                                <view class="left">妯″叿鍚嶇О: </view>
+                                <view class="right">{{record['浜у搧妯″叿'] || record['HMouldName']}}</view>
+                            </view>
+                            <view class="item" v-if="record['妯″叿瑙勬牸'] || record['HMouldSpec']">
+                                <view class="left">妯″叿瑙勬牸: </view>
+                                <view class="right">{{record['妯″叿瑙勬牸'] || record['HMouldSpec']}}</view>
+                            </view>
+                            <view class="item" v-if="record['妯″叿鍨嬪彿'] || record['HMouldModel']">
+                                <view class="left">妯″叿鍨嬪彿: </view>
+                                <view class="right">{{record['妯″叿鍨嬪彿'] || record['HMouldModel']}}</view>
+                            </view>
+                            <view class="item" v-if="record['缁翠慨鍗曞彿'] || record['HRepairNo']">
+                                <view class="left">缁翠慨鍗曞彿: </view>
+                                <view class="right">{{record['缁翠慨鍗曞彿'] || record['HRepairNo']}}</view>
+                            </view>
+                            <view class="item" v-if="record['缁翠慨鍐呭'] || record['HRepairContent']">
+                                <view class="left">缁翠慨鍐呭: </view>
+                                <view class="right">{{record['缁翠慨鍐呭'] || record['HRepairContent']}}</view>
+                            </view>
+                            <view class="item" v-if="record['缁翠慨浜�'] || record['HEmpName']">
+                                <view class="left">缁翠慨浜�: </view>
+                                <view class="right">{{record['缁翠慨浜�'] || record['HEmpName']}}</view>
+                            </view>
+                            <view class="item" v-if="record['缁翠慨浜�'] || record['HStatus']">
+                                <view class="left">缁翠慨浜�: </view>
+                                <view class="right">{{record['缁翠慨浜�'] || record['HStatus']}}</view>
+                            </view>
+                        </uni-card>
+                    </view>
+                    <view class="over" v-show="HRepairRecordList.length == 0">鏆傛棤鏁版嵁</view>
+                </scroll-view>
+                <uni-pagination id="#pagination" title="鏍囬鏂囧瓧" v-model="curPage" :pageSize="size"
+                    :total="length"></uni-pagination>
+            </view>
+        </uni-popup>
+    </view>
+</template>
+
+<script>
+    import dayjs from 'dayjs';
+    import {
+        CommonUtils
+    } from '../../utils/common';
+    import {
+        getUserInfo
+    } from '../../utils/auth';
+    export default {
+        name: "RepairRecordPopup",
+        data() {
+            return {
+                dayjs: dayjs,
+                enablefocus: false,
+                size: 20,
+                curPage: 1,
+                length: 0,
+                page: 0,
+                HMouldID: 0, // 褰撳墠閫夋嫨鐨勬ā鍏稩D
+                HRepairRecordList: [],
+                
+                // 鎼滅储鏉′欢 - 涓庢晠闅滅櫥璁板崟淇濇寔涓�鑷�
+                HBeginDate: dayjs(new Date()).subtract(30, 'd').format("YYYY-MM-DD"),
+                HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                HNumber: '',
+                HName: '',
+                HBillNo: '',
+                
+            };
+        },
+        props: {
+            HBillType: {
+                type: [String, Number],
+                required: true
+            },
+            HStockOrgID: {
+                type: [String, Number],
+                required: true
+            },
+            // 鏂板涓�涓槸鍚︽樉绀烘ā鍏蜂俊鎭殑鍙傛暟
+            showMouldInfo: {
+                type: Boolean,
+                default: true
+            }
+        },
+        methods: {
+            popupChangeHandler(e) {
+                if (e.show === true) {
+                    this.getRepairRecordList()
+                }
+            },
+            async exit() {
+                this.resetSearchConditions();
+                await this.$nextTick();
+                this.$refs.popup.close();
+            },
+            
+            resetSearchConditions() {
+                this.size = 20;
+                this.curPage = 1;
+                this.length = 0;
+                this.page = 0;
+                this.HRepairRecordList = [];
+                this.enablefocus = false;
+                
+                // 閲嶇疆鎼滅储鏉′欢
+                this.HBeginDate = dayjs(new Date()).subtract(30, 'd').format("YYYY-MM-DD");
+                this.HEndDate = dayjs(new Date()).format("YYYY-MM-DD");
+                this.HNumber = '';
+                this.HName = '';
+                this.HBillNo = '';
+                this.HRepairNo = '';
+                this.HRepairContent = '';
+                this.HRepairStatus = '';
+            },
+            
+            showPopup(HMouldID) {
+                this.HMouldID = HMouldID || 0;
+                this.resetSearchConditions();
+                this.$refs.popup.open();
+            },
+            
+            search() {
+                this.getRepairRecordList();
+            },
+            
+            repairStatusChange(e) {
+                const index = e.detail.value;
+                if (index == 0) {
+                    this.HRepairStatus = ''; // 鍏ㄩ儴
+                } else {
+                    this.HRepairStatus = this.repairStatusOptions[index];
+                }
+            },
+            
+            clickCard(record, index) {
+                // 鍙戦�侀�夋嫨瀹屾垚浜嬩欢
+                uni.$emit('RepairRecordSelectComplete', {	
+                    HInterID: record["hmainid"],
+                    HEntryID: record["hsubid"] || record["HEntryID"] || 0,
+                    HBillNo: record["鍗曟嵁鍙�"] || record["HBillNo"] || "",
+                    HMouldID: record['HMouldID'] || this.HMouldID || 0,
+                    HMouldName: record['浜у搧妯″叿'],
+                    HMouldCode: record['浜у搧妯″叿浠ｇ爜'],
+                    HMouldSpec: record['妯″叿瑙勬牸'],
+                    HMouldModel: record['妯″叿鍨嬪彿']
+                });
+            },
+            
+            getsWhere() {
+                let sWhere = '';
+                
+                // 鏃ユ湡鑼冨洿鏉′欢 - 涓庢晠闅滅櫥璁板崟淇濇寔涓�鑷�
+                if (this.HBeginDate && this.HEndDate) {
+                    sWhere += ` and (CONVERT(varchar(100),鏃ユ湡, 23) between '${this.HBeginDate}' and '${this.HEndDate}') `;
+                }
+                // 妯″叿ID鏉′欢 - 濡傛灉浼犲叆浜嗘ā鍏稩D
+                if (this.HMouldID) {
+                    sWhere += ` and HMouldID = ${this.HMouldID} `;
+                }
+                // 妯″叿缂栫爜鏉′欢 
+                if (this.HNumber) {
+                    sWhere += ` and (浜у搧妯″叿浠ｇ爜 like '%${this.HNumber}%'  `;
+                }
+                // 妯″叿鍚嶇О鏉′欢 
+                if (this.HName) {
+                    sWhere += ` and (浜у搧妯″叿 like '%${this.HName}%' `;
+                }
+                // 鍗曟嵁鍙锋潯浠� 
+                if (this.HBillNo) {
+                    sWhere += ` and (鍗曟嵁鍙� like '%${this.HBillNo}%'  `;
+                }
+                return sWhere;
+            },
+            
+            getRepairRecordList() {
+                this.HRepairRecordList = [];
+                this.length = 0;
+                this.page = 0;
+                this.curPage = 1;
+                
+                // 璋冪敤缁翠慨璁板綍鍒楄〃鎺ュ彛
+                CommonUtils.doRequest(
+                    "/Sb_MouldRepairWorkBill/GetMouldRepairWorkBill_PDA", {  // 璇锋牴鎹疄闄呮儏鍐佃皟鏁存帴鍙ｈ矾寰�
+                        sWhere: this.getsWhere(),
+                        user: getUserInfo()["Czymc"]
+                    },
+                    (res) => {
+                        let {
+                            data,
+                            count,
+                            Message
+                        } = res.data;
+                        if (count == 1) {
+                            this.length = Array.from(data).length;
+                            const result = [];
+                            for (let i = 0; i < data.length; i += this.size) {
+                                result.push(data.slice(i, i + this.size));
+                            }
+                            this.HRepairRecordList = result;
+                            this.page = result.length;
+                            setTimeout(() => {
+                                this.enablefocus = true;
+                            }, 500);
+                        } else {
+                            setTimeout(() => {
+                                this.enablefocus = true;
+                            }, 500);
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message || '鏆傛棤缁翠慨璁板綍鏁版嵁'
+                            });
+                        }
+                    },
+                    (err) => {
+                        setTimeout(() => {
+                            this.enablefocus = true;
+                        }, 500);
+                        uni.showToast({
+                            icon: 'none',
+                            title: '鍔犺浇澶辫触: ' + (err.message || '鏈煡閿欒')
+                        });
+                    }
+                );
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    .content {
+        box-sizing: border-box;
+        border-radius: 15rpx 15rpx 0 0;
+        padding: 20rpx 20rpx 40rpx 20rpx;
+        background-color: #fff;
+        display: flex;
+        flex-direction: column;
+        gap: 10rpx;
+
+        .search-condition {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            gap: 20rpx;
+            font-size: 30rpx;
+
+            .title {
+                width: 5rem;
+                text-align: right;
+            }
+
+            .right {
+                flex: 1;
+                border-radius: 22rpx;
+                border: 1px solid #acacac;
+                height: auto;
+                padding: 8rpx 16rpx;
+
+                input {
+                    width: 100%;
+                    font-size: 30rpx;
+                }
+                
+                picker {
+                    width: 100%;
+                    font-size: 30rpx;
+                    line-height: 1.5;
+                }
+            }
+        }
+
+        .buttons {
+            display: flex;
+            flex-direction: row;
+            gap: 20rpx;
+            justify-content: flex-end;
+
+            >button {
+                display: inline-flex;
+                width: 4rem;
+            }
+        }
+
+        .options-wrapper {
+            padding: 20rpx;
+            display: grid;
+            grid-template-columns: repeat(1, 1fr);
+            gap: 20rpx;
+
+            >view {
+                margin: 0 !important;
+                box-sizing: border-box;
+
+            }
+
+            .item {
+                .left {
+                    display: inline-block;
+                    width: 6rem;
+                    font-size: 26rpx;
+                    color: #666;
+                }
+
+                .right {
+                    display: inline-block;
+                    font-size: 28rpx;
+                    color: #333;
+                    word-break: break-all;
+                }
+            }
+        }
+
+        .uni-card--is-active {
+            background-color: rgba(0, 122, 255, 0.2);
+        }
+
+        .daterange {
+            display: flex;
+            flex-direction: row;
+            gap: 10rpx;
+            justify-content: center;
+            align-items: center;
+
+        }
+        
+        .over {
+            text-align: center;
+            padding: 100rpx 0;
+            color: #999;
+            font-size: 28rpx;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 3f5f238..c2778d1 100644
--- a/pages.json
+++ b/pages.json
@@ -449,14 +449,14 @@
 		{
 			"path": "pages/mujvzhuangtai/mujvzhuangtai",
 			"style": {
-				"navigationBarTitleText": "妯″叿鐘舵�佸垎甯�",
+				"navigationBarTitleText": "鍣ㄥ叿鐘舵�佸垎甯�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/mujvzhuangtai/detail",
 			"style": {
-				"navigationBarTitleText": "妯″叿鐘舵�佽鎯�"
+				"navigationBarTitleText": "鍣ㄥ叿鐘舵�佽鎯�"
 			}
 		},
 		{
@@ -608,39 +608,51 @@
 		{
 			"path": "pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿鐐规璁板綍鍗曞垪琛�",
+				"navigationBarTitleText": "鍣ㄥ叿鐐规璁板綍鍗曞垪琛�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill",
 			"style": {
-				"navigationBarTitleText": "妯″叿鐐规璁板綍鍗�"
+				"navigationBarTitleText": "鍣ㄥ叿鐐规璁板綍鍗�"
 			}
 		},
 		{
 			"path": "pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckRuleBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿鐐规瑙勭▼"
+				"navigationBarTitleText": "鍣ㄥ叿鐐规瑙勭▼"
 			}
 		},
 		{
 			"path": "pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗曞垪琛�",
+				"navigationBarTitleText": "鍣ㄥ叿淇濆吇璁板綍鍗曞垪琛�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill",
 			"style": {
-				"navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗�"
+				"navigationBarTitleText": "鍣ㄥ叿淇濆吇璁板綍鍗�"
+			}
+		},
+		{
+			"path": "pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport",
+			"style": {
+				"navigationBarTitleText": "鍣ㄥ叿淇濆吇浠诲姟"
+			}
+		},
+		{
+			"path": "pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport",
+			"style": {
+				"navigationBarTitleText": "璁惧淇濆吇浠诲姟"
 			}
 		},
 		{
 			"path": "pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿淇濆吇瑙勭▼"
+				"navigationBarTitleText": "鍣ㄥ叿淇濆吇瑙勭▼"
 			}
 		},
 		{
@@ -1107,21 +1119,21 @@
 		{
 			"path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
 			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
+				"navigationBarTitleText": "鍣ㄥ叿棰嗙敤鍑哄簱鍗�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
+				"navigationBarTitleText": "鍣ㄥ叿棰嗙敤鍑哄簱鍗曞垪琛�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟",
+				"navigationBarTitleText": "鍣ㄥ叿棰嗙敤閫�搴撳崟",
 				"enablePullDownRefresh": true
 			}
 		},
@@ -1175,54 +1187,54 @@
 		{
 			"path": "pages/shoujishouming/table",
 			"style": {
-				"navigationBarTitleText": "妯″叿瀵垮懡璋冩暣鍗�",
+				"navigationBarTitleText": "鍣ㄥ叿瀵垮懡璋冩暣鍗�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/shoujishouming/form",
 			"style": {
-				"navigationBarTitleText": "妯″叿瀵垮懡璋冩暣鍗�",
+				"navigationBarTitleText": "鍣ㄥ叿瀵垮懡璋冩暣鍗�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
 			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�"
+				"navigationBarTitleText": "鍣ㄥ叿棰嗙敤鍑哄簱鍗�"
 			}
 		},
 		{
 			"path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
+				"navigationBarTitleText": "鍣ㄥ叿棰嗙敤鍑哄簱鍗曞垪琛�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟",
+				"navigationBarTitleText": "鍣ㄥ叿棰嗙敤閫�搴撳崟鍒楄〃",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill",
 			"style": {
-				"navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟"
+				"navigationBarTitleText": "鍣ㄥ叿棰嗙敤閫�搴撳崟"
 			}
 		},
 		{
 			"path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿璋冩嫧鍗�",
+				"navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBill",
 			"style": {
-				"navigationBarTitleText": "妯″叿璋冩嫧鍗�",
+				"navigationBarTitleText": "鍣ㄥ叿璋冩嫧鍗�",
 				"enablePullDownRefresh": true
 			}
 		},
@@ -1250,27 +1262,27 @@
 		{
 			"path": "pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿缁翠慨璁板綍鍗曞垪琛�",
+				"navigationBarTitleText": "鍣ㄥ叿缁翠慨璁板綍鍗曞垪琛�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill",
 			"style": {
-				"navigationBarTitleText": "妯″叿缁翠慨璁板綍鍗�"
+				"navigationBarTitleText": "鍣ㄥ叿缁翠慨璁板綍鍗�"
 			}
 		},
 		{
 			"path": "pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill",
 			"style": {
-				"navigationBarTitleText": "妯″叿鏁呴殰鐧昏鍗�"
+				"navigationBarTitleText": "鍣ㄥ叿鏁呴殰鐧昏鍗�"
 
 			}
 		},
 		{
 			"path": "pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿鏁呴殰鐧昏鍗曞垪琛�"
+				"navigationBarTitleText": "鍣ㄥ叿鏁呴殰鐧昏鍗曞垪琛�"
 			}
 		},
 		{
@@ -1422,7 +1434,7 @@
 		{
 			"path": "pages/MJGL/Gy_MouldFile/Gy_MouldFileList",
 			"style": {
-				"navigationBarTitleText": "妯″叿妗ｆ鏌ヨ",
+				"navigationBarTitleText": "鍣ㄥ叿妗ｆ鏌ヨ",
 				"enablePullDownRefresh": true
 			}
 		},
@@ -1442,13 +1454,13 @@
 		{
 			"path": "pages/MJGL/MouldScrapOutBill/MouldScrapOutBillList",
 			"style": {
-				"navigationBarTitleText": "妯″叿鎶ュ簾鍑哄簱鍗曞垪琛�"
+				"navigationBarTitleText": "鍣ㄥ叿鎶ュ簾鍑哄簱鍗曞垪琛�"
 			}
 		},
 		{
 			"path": "pages/MJGL/MouldScrapOutBill/MouldScrapOutBill",
 			"style": {
-				"navigationBarTitleText": "妯″叿鎶ュ簾鍑哄簱鍗�",
+				"navigationBarTitleText": "鍣ㄥ叿鎶ュ簾鍑哄簱鍗�",
 				"enablePullDownRefresh": true
 			}
 		},
diff --git a/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
index b62b164..4d08dea 100644
--- a/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
+++ b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
@@ -1,635 +1,718 @@
 <template>
-    <view>
-        <view class="tabs" id="tabs">
-            <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
-            <!-- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鏄庣粏淇℃伅</view> -->
-            <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
-            <!-- <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view> -->
-        </view>
-        <!-- 鍩烘湰淇℃伅 -->
-        <template v-if="tabs == 0">
-            <view class="form" :style="{
+	<view>
+		<view class="tabs" id="tabs">
+			<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+			<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
+		</view>
+		<!-- 鍩烘湰淇℃伅 -->
+		<template v-if="tabs == 0">
+			<view class="form" :style="{
                 height: containerHeight + 'px',
                 overflow: 'auto'
             }">
-                <view class="form-item">
-                    <view class="title">妯″叿鏉＄爜:</view>
-                    <view :class="enableEdit?'right':'righton'">
-                        <input v-model="hform.HBarCode" :disabled="!enableEdit"
-                            @confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)妯″叿鏉＄爜" />
-                    </view>
-                    <view class="icon-wrapper">
-                        <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鏈�缁堢粨璁�:</view>
-                    <view class="right none-border">
-                        <radio-group @change="radioChange" class="radio_Container">
-                            <label>
-                                <view>
-                                    <radio value="OK" :checked="hform.HCheckResult == 'OK'" />
-                                    <text>OK</text>
-                                </view>
-                            </label>
-                            </label>
-                            <view>
-                                <radio value="NG" :checked="hform.HCheckResult == 'NG'" />
-                                <text>NG</text>
-                            </view>
-                            </label>
-                        </radio-group>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">楠屾敹鍐呭:</view>
-                    <view class="right">
-                        <textarea v-model="hform.HRepairCheckMainContent" placeholder="璇疯緭鍏ラ獙鏀跺唴瀹�" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">婧愬崟绫诲瀷:</view>
-                    <zxz-uni-data-select class="right" :localdata="[
-                        {key: '鎵嬪伐褰曞叆', value: '-1'},
-                        {key: '妯″叿鏁呴殰鐧昏鍗�', value: '3815'}
-                        ]" dataKey="key" dataValue="value" v-model="hform.HMainSourceBillType">
+				<view class="form-item">
+					<view class="title">妯″叿鏉＄爜:</view>
+					<view :class="enableEdit?'right':'righton'">
+						<input v-model="hform.HBarCode" :disabled="!enableEdit"
+							@confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)妯″叿鏉＄爜" />
+					</view>
+					<view class="icon-wrapper">
+						<uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏈�缁堢粨璁�:</view>
+					<view class="right none-border">
+						<radio-group @change="radioChange" class="radio_Container">
+							<label>
+								<view>
+									<radio value="OK" :checked="hform.HCheckResult == 'OK'" />
+									<text>OK</text>
+								</view>
+							</label>
+							</label>
+							<view>
+								<radio value="NG" :checked="hform.HCheckResult == 'NG'" />
+								<text>NG</text>
+							</view>
+							</label>
+						</radio-group>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">楠屾敹鍐呭:</view>
+					<view class="right">
+						<textarea v-model="hform.HRepairCheckMainContent" placeholder="璇疯緭鍏ラ獙鏀跺唴瀹�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">婧愬崟绫诲瀷</view>
+					<view class="right" v-show="showHMainSourceBillType">
+						<picker :range="arrayHMainSourceBillType" @change="HMainSourceBillTypeChange">
 
-                    </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
-                </view>
-                <view class="form-item">
-                    <view class="title">婧愬崟鍙�:</view>
-                    <view class="right">
-                        <input v-model="hform.HMainSourceBillNo" />
-                    </view>
-                    <view class="icon-wrapper">
-                        <uni-icons type="search" size="20" @click="toCheckFile"></uni-icons>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍗曟嵁鍙�:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HBillNo" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍗曟嵁鏃ユ湡:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title required">閮ㄩ棬:</view>
-                    <zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
-                        dataValue="HItemID" v-model="hform.HDeptID">
+							<input disabled name="HMainSourceBillType" v-model="HMainSourceBillType"
+								placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+							<view class="picker-overlay"></view>
+						</picker>
+					</view>
+					<view class="righton" v-show="!showHMainSourceBillType">
+						<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+							placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title required">鏁呴殰鐧昏鍗�</view>
+					<view class="right" v-show="hform.HMainSourceBillType != 1">
+						<input type="text" name="HBarCode" v-model="hform.HMainSourceBillNo" />
+					</view>
+					<view class="icon-wrapper" v-show="hform.HMainSourceBillType != 1"
+						:disabled="hform.HMainSourceBillType == -1">
+						<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+					</view>
+					<view class="righton" v-show="hform.HMainSourceBillType == 1">
+						<input type="text" disabled name="HBarCode" v-model="hform.HMainSourceBillNo" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HBillNo" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鏃ユ湡:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title required">閮ㄩ棬:</view>
+					<zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
+						dataValue="HItemID" v-model="hform.HDeptID">
 
-                    </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
-                </view>
-                <view class="form-item">
-                    <view class="title required">楠屾敹浜�:</view>
-                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
-                        dataValue="HItemID" v-model="hform.HEmpID">
-
-                    </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
-                </view>
-                <view class="form-item">
-                    <view class="title required">楠屾敹椤圭洰:</view>
-                    <zxz-uni-data-select required class="right" :localdata="HRepairCheckList" dataKey="缁翠慨楠屾敹椤圭洰"
-                        dataValue="hitemid" v-model="hform.HRepairCheckMainID">
-
-                    </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
-                </view>
-                <view class="form-item">
-                    <view class="title required">璐熻矗浜�:</view>
-                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
-                        dataValue="HItemID" v-model="hform.HManagerID">
-
-                    </zxz-uni-data-select>
-                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
-                </view>
-                <!-- 鎵爜甯﹀嚭缁翠慨璁板綍 -->
-                <view class="form-item">
-                    <view class="title required">缁翠慨璁板綍:</view>
-                    <view class="right">
-                        <input type="text" value="" />
-                    </view>
-                    <view class="icon-wrapper">
-                        <uni-icons type="search" size="20" @click="toCheckFile"></uni-icons>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">妯″叿鍚嶇О:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMouldName" disabled />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">妯″叿瑙勬牸:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMouldSpec" disabled />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">妯″叿鍨嬪彿:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMouldModel" disabled />
-                    </view>
-                </view>
-            </view>
-        </template>
-        <!-- 鍏朵粬淇℃伅 -->
-        <template v-if="tabs == 2">
-            <view class="form" :style="{
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title required">楠屾敹浜�:</view>
+					<zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+						dataValue="HItemID" v-model="hform.HEmpID">
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title required">楠屾敹椤圭洰:</view>
+					<zxz-uni-data-select required class="right" :localdata="HRepairCheckList" dataKey="缁翠慨楠屾敹椤圭洰"
+						dataValue="hitemid" v-model="hform.HRepairCheckMainID">
+					</zxz-uni-data-select>
+				</view>
+				<view class="form-item">
+					<view class="title required">璐熻矗浜�:</view>
+					<zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+						dataValue="HItemID" v-model="hform.HManagerID">
+					</zxz-uni-data-select>
+				</view>
+				<!-- 鎵爜甯﹀嚭缁翠慨璁板綍 -->
+				<view class="form-item">
+					<view class="title required">缁翠慨璁板綍:</view>
+					<view class="right" v-show="hform.HMainSourceBillType != 1">
+						<input type="text" v-model="hform.HMouldRepairWorkName"
+							:disabled="hform.HMainSourceBillType == -1" placeholder="璇烽�夋嫨缁翠慨璁板綍" />
+					</view>
+					<view class="icon-wrapper" v-show="hform.HMainSourceBillType != 1"
+						:disabled="hform.HMainSourceBillType == -1">
+						<uni-icons type="search" size="20" @click="showRepairRecordList"></uni-icons>
+					</view>
+					<view class="righton" v-show="hform.HMainSourceBillType == 1">
+						<input type="text" disabled v-model="hform.HMouldRepairWorkName" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">妯″叿鍚嶇О:</view>
+					<view class="righton">
+						<input v-model="hform.HMouldName" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">妯″叿瑙勬牸:</view>
+					<view class="righton">
+						<input v-model="hform.HMouldSpec" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">妯″叿鍨嬪彿:</view>
+					<view class="righton">
+						<input v-model="hform.HMouldModel" disabled />
+					</view>
+				</view>
+			</view>
+		</template>
+		<!-- 鍏朵粬淇℃伅 -->
+		<template v-if="tabs == 2">
+			<view class="form" :style="{
                 height: containerHeight + 'px',
                 overflow: 'auto'
             }">
-                <view class="form-item">
-                    <view class="title">鍒涘缓浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMaker" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍒涘缓鏃ユ湡:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMakeDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">淇敼浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HUpDater" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">淇敼鏃ユ湡:</view>
-                    <view class="righton">
-                        <input v-model="hform.HUpDateDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">瀹℃牳浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HChecker" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">瀹℃牳鏃堕棿:</view>
-                    <view class="righton">
-                        <input v-model="hform.HCheckDate" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">浣滃簾浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HDeleteMan" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">浣滃簾鏃ユ湡:</view>
-                    <view class="righton">
-                        <input v-model="hform.HDeleteDate" />
-                    </view>
-                </view>
-            </view>
+				<view class="form-item">
+					<view class="title">鍒涘缓浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HMaker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒涘缓鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HMakeDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDater" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDateDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HChecker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳鏃堕棿:</view>
+					<view class="righton">
+						<input v-model="hform.HCheckDate" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteMan" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾鏃ユ湡:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteDate" />
+					</view>
+				</view>
+			</view>
 
-        </template>
-        <!-- 鎿嶄綔鎸夐挳 -->
-        <view class="buttons" id="buttons">
-            <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-            <view style="flex: 1;"></view>
-            <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
-            <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
-        </view>
-        <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
-    </view>
+		</template>
+		<!-- 鎿嶄綔鎸夐挳 -->
+		<view class="buttons" id="buttons">
+			<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			<view style="flex: 1;"></view>
+			<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+			<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+		</view>
+		<!-- 寮瑰嚭妯″叿鏁呴殰鐧昏鍗曠殑閫夋嫨鍒楄〃 -->
+		<BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType"
+			:HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
+		</BillListPopupMouldConkBookBillVue>
+		<!-- 寮瑰嚭妯″叿缁翠慨璁板綍鍗曠殑閫夋嫨鍒楄〃 -->
+		<RepairRecordPopup ref="repairRecordList" :HBillType="hform.HBillType" :HStockOrgID="hform.HStockOrgID">
+		</RepairRecordPopup>
+	</view>
 </template>
 
 <script>
-    import dayjs from "dayjs";
-    import {
-        CommonUtils
-    } from "@/utils/common";
-    import {
-        MpaasScan
-    } from "@/utils/mpaasScan.js"
-    import {
-        getUserInfo
-    } from "../../../utils/auth";
-    export default {
-        name: 'Sc_MouldRepairCheckBill',
-        data() {
-            return {
-                tabs: 0,
-                HMainSourceBillType: "",
-                btnTop: 0,
-                tabsBottom: 0,
-                HModName: "Sc_MouldRepairCheckBill",
-                HBillType: '3817',
-                operationType: 1,
-                uploadOptions: {},
-                enableEdit: true,
+	import dayjs from "dayjs";
+	import {
+		CommonUtils
+	} from "@/utils/common";
+	import {
+		MpaasScan
+	} from "@/utils/mpaasScan.js"
+	import {
+		getUserInfo
+	} from "../../../utils/auth";
+	import BillListPopupMouldConkBookBillVue from '../../../components/BillListPopup/BillListPopupMouldConkBookBill.vue';
+	import RepairRecordPopup from '../../../components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue';
 
-                HDeptList: [],
-                HRepairCheckList: [],
-                HEmpList: [],
+	export default {
+		components: {
+			BillListPopupMouldConkBookBillVue,
+			RepairRecordPopup
+		},
+		name: 'Sc_MouldRepairCheckBill',
+		data() {
+			return {
+				tabs: 0,
+				btnTop: 0,
+				tabsBottom: 0,
+				HModName: "Sc_MouldRepairCheckBill",
+				HBillType: '3817',
+				operationType: 1,
+				enableEdit: true,
 
-                hform: {
-                    "HBarCode": "",
-                    "HBillNo": "",
-                    "HInterID": 0,
-                    "HDate": dayjs(new Date()).format("YYYY-MM-DD"),
-                    "HInnerBillNo": "",
-                    "HMouldName": "",
-                    "HMouldSpec": "",
-                    "HMouldModel": "",
-                    "HMouldID": 0,
-                    "HMainSourceBillType": "-1",
-                    "HMainSourceInterID": 0,
-                    "HMainSourceEntryID": 0,
-                    "HCheckResult": "OK",
-                    "HEmpName": getUserInfo().HEmpName,
-                    "HEmpID": getUserInfo().HEmpID,
-                    "HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD"),
-                    "HDeptName": getUserInfo().HDeptName,
-                    "HDeptID": getUserInfo().HDeptID,
-                    "HMainSourceBillNo": "",
-                    "HManagerName": getUserInfo().HManagerName,
-                    "HManagerID": getUserInfo().HManagerID,
-                    "HMouldRepairWorkName": "",
-                    "HMouldRepairWorkID": 0,
-                    "HExplanation": "",
-                    "HRemark": "",
-                    "HOrgID": uni.getStorageSync("OrganizationID"),
-                    "HMaker": getUserInfo()["Czymc"],
-                    "HChecker": "",
-                    "HCloseMan": "",
-                    "HUpDater": "",
-                    "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD"),
-                    "HCheckDate": "",
-                    "HCloseDate": "",
-                    "HUpDateDate": "",
-                    "HDeleteMan": "",
-                    "HDeleteDate": "",
-                    "HRepairCheckMainID": 0,
-                    "HRepairCheckMainContent": "",
-                },
-                HBillSub: [{ // 鍚庣鎺ュ彛闇�瑕併�傚惁鍒欐暟鎹笉浼氭樉绀哄湪缂撳瓨涓�
-                    "HRepairCheckID": 0,
-                    "HRepairCheckCode": "",
-                    "HRepairCheckName": "",
-                    "HRepairCheckContent": "",
-                    "HManagerID": 0,
-                    "HManagerCode": "",
-                    "HManagerName": "",
-                    "HRemark": "",
-                    "LAY_TABLE_INDEX": 0
-                }]
-            };
-        },
-        computed: {
-            containerHeight: {
-                get() {
-                    return this.btnTop - this.tabsBottom - 5
-                }
-            },
-        },
-        methods: {
-            // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
-            ValidCheck() {
-                if (this.hform.HEquipID == 0) {
-                    return {
-                        Message: "鏈綍鍏ユā鍏蜂俊鎭紝璇峰厛褰曞叆妯″叿淇℃伅!",
-                        state: false
-                    }
-                }
-                if (this.hform.HDeptID == 0) {
-                    return {
-                        Message: "閮ㄩ棬涓嶅緱涓虹┖!",
-                        state: false
-                    }
-                }
-                if (this.hform.HEmpID == 0) {
-                    return {
-                        Message: "楠屾敹浜轰笉寰椾负绌�!",
-                        state: false
-                    }
-                }
-                if (this.hform.HRepairCheckMainID == 0) {
-                    return {
-                        Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
-                        state: false
-                    }
-                }
-                if (this.hform.HManagerID == 0) {
-                    return {
-                        Message: "璐熻矗浜轰笉寰椾负绌�!",
-                        state: false
-                    }
-                }
+				// 鎺у埗婧愬崟绫诲瀷鏄惁鍙紪杈�
+				showHMainSourceBillType: true,
+				HMainSourceBillType: '妯″叿鏁呴殰鐧昏鍗�',
+				arrayHMainSourceBillType: ['妯″叿鏁呴殰鐧昏鍗�'],
+				arrayHMainSourceBillTypeID: ['3815'],
 
-                return {
-                    Message: "",
-                    state: true
-                }
-            },
-            addNew() {
-                uni.redirectTo({
-                    url: './Sc_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
-                }
-            },
-            //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
-            async getHDeptList() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: '/Gy_Department/list',
-                        data: {
-                            sWhere: ` and HUSEORGID = ${uni.getStorageSync('OrganizationID')}`,
-                            user: uni.getStorageSync('HUserName'),
-                            Organization: uni.getStorageSync('Organization')
-                        }
-                    })
+				HDeptList: [],
+				HRepairCheckList: [],
+				HEmpList: [],
 
-                    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",
-                        }
-                    })
+				hform: {
+					"HBillType": 3817,
+					"HBarCode": "",
+					"HBillNo": "",
+					"HInterID": 0,
+					"HDate": dayjs(new Date()).format("YYYY-MM-DD"),
+					"HInnerBillNo": "",
+					"HMouldName": "",
+					"HMouldSpec": "",
+					"HMouldModel": "",
+					"HMouldID": 0,
+					"HMainSourceBillType": "3815",
+					"HMainSourceInterID": 0,
+					"HMainSourceEntryID": 0,
+					"HCheckResult": "OK",
+					"HEmpName": getUserInfo().HEmpName,
+					"HEmpID": getUserInfo().HEmpID,
+					"HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD"),
+					"HDeptName": getUserInfo().HDeptName,
+					"HDeptID": getUserInfo().HDeptID,
+					"HMainSourceBillNo": "",
+					"HManagerName": getUserInfo().HManagerName,
+					"HManagerID": getUserInfo().HManagerID,
+					"HMouldRepairWorkName": "",
+					"HMouldRepairWorkID": 0,
+					"HExplanation": "",
+					"HRemark": "",
+					"HOrgID": uni.getStorageSync("OrganizationID"),
+					"HStockOrgID": uni.getStorageSync("OrganizationID"),
+					"HMaker": getUserInfo()["Czymc"],
+					"HChecker": "",
+					"HCloseMan": "",
+					"HUpDater": "",
+					"HMakeDate": dayjs(new Date()).format("YYYY-MM-DD"),
+					"HCheckDate": "",
+					"HCloseDate": "",
+					"HUpDateDate": "",
+					"HDeleteMan": "",
+					"HDeleteDate": "",
+					"HRepairCheckMainID": 0,
+					"HRepairCheckMainContent": "",
+				},
+				HBillSub: [{ // 鍚庣鎺ュ彛闇�瑕併�傚惁鍒欐暟鎹笉浼氭樉绀哄湪缂撳瓨涓�
+					"HRepairCheckID": 0,
+					"HRepairCheckCode": "",
+					"HRepairCheckName": "",
+					"HRepairCheckContent": "",
+					"HManagerID": 0,
+					"HManagerCode": "",
+					"HManagerName": "",
+					"HRemark": "",
+					"LAY_TABLE_INDEX": 0
+				}]
+			};
+		},
+		computed: {
+			containerHeight: {
+				get() {
+					return this.btnTop - this.tabsBottom - 5
+				}
+			},
+		},
+		methods: {
+			// 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
+			ValidCheck() {
+				if (this.hform.HEquipID == 0) {
+					return {
+						Message: "鏈綍鍏ユā鍏蜂俊鎭紝璇峰厛褰曞叆妯″叿淇℃伅!",
+						state: false
+					}
+				}
+				if (this.hform.HDeptID == 0) {
+					return {
+						Message: "閮ㄩ棬涓嶅緱涓虹┖!",
+						state: false
+					}
+				}
+				if (this.hform.HEmpID == 0) {
+					return {
+						Message: "楠屾敹浜轰笉寰椾负绌�!",
+						state: false
+					}
+				}
+				if (this.hform.HRepairCheckMainID == 0) {
+					return {
+						Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
+						state: false
+					}
+				}
+				if (this.hform.HManagerID == 0) {
+					return {
+						Message: "璐熻矗浜轰笉寰椾负绌�!",
+						state: false
+					}
+				}
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        this.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'),
-                        }
-                    })
+				return {
+					Message: "",
+					state: true
+				}
+			},
+			addNew() {
+				uni.redirectTo({
+					url: './Sc_MouldRepairCheckBill?operationType=1'
+				})
+			},
+			goBack() {
+				uni.navigateBack()
+			},
+			showBillList() {
+				this.$refs.billList.showPopup()
+			},
+			showRepairRecordList() {
+				if (this.hform.HMouldID === 0) {
+					CommonUtils.showTips({
+						title: '鎻愮ず',
+						message: '璇峰厛閫夋嫨妯″叿'
+					});
+					return;
+				}
+				this.$refs.repairRecordList.showPopup(this.hform.HMouldID);
+			},
+			//閫夋嫨婧愬崟绫诲瀷
+			HMainSourceBillTypeChange(e) {
+				if (e.detail.value == -1 || e.detail.value == NaN) {
+					this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+					this.hform.HMainSourceBillType = -1
+					return
+				}
+				console.log(e.detail.value)
+				console.log(e)
+				this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+				this.hform.HMainSourceBillType = this.arrayHMainSourceBillTypeID[e.detail.value]
+				const pages = getCurrentPages()
+				// 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+				const currentPage = pages[pages.length - 1]
+				// 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
+				uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
+					HSourceBillTypeName: this.HMainSourceBillType,
+					HSourceBillType: this.hform.HMainSourceBillType
+				})
+			},
+			checkBoxChangeHandler(index, e) {
+				let cr = e.detail.value
+				if (cr.length == 0) {
+					this.HCheckFileList[index]["HDotCheckResult"] = false
+				} else {
+					this.HCheckFileList[index]["HDotCheckResult"] = true
+				}
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			async getHDeptList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Gy_Department/list',
+						data: {
+							sWhere: ` and HUSEORGID = ${uni.getStorageSync('OrganizationID')}`,
+							user: uni.getStorageSync('HUserName'),
+							Organization: uni.getStorageSync('Organization')
+						}
+					})
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        this.HRepairCheckList = data
-                    } else {
-                        CommonUtils.showTips({
-                            title: '娓╅Θ鎻愮ず',
-                            message: Message
-                        })
-                    }
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: '娓╅Θ鎻愮ず',
-                        message: err
-                    })
-                }
-            },
-            toScanCode() {
-                MpaasScan.scanCode(cb => {
-                    this.hfrom.HBarCode = cb
-                    this.GetMessageByBarCode(cb)
-                })
-            },
-            async GetMessageByBarCode(HBarCode) {
-                try {
-                    let res = await CommonUtils.doRequest2Sync({
-                        url: "/Sc_PDA_MouldRepairCheckBill/txtHBarCode_KeyDown_List",
-                        data: {
-                            HBarCode: HBarCode,
-                        },
-                    })
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.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
-                    }
+					if (!res) {
+						return
+					}
 
-                    let {
-                        data,
-                        count,
-                        Message
-                    } = res.data
+					let {
+						data,
+						count,
+						Message
+					} = res.data
 
-                    if (count == 1) {
-                        console.log('data: ', data);
-                        this.hform.HMouldID = data[0].hmainid
-                        this.hform.HMouldName = data[0].妯″叿鍚嶇О
-                        this.hform.HMouldSpec = data[0].妯″叿鍝佺被
-                        this.hform.HMouldModel = data[0].妯″叿鍨嬪彿
-                        this.hform.HQty = 1
+					if (count == 1) {
+						console.log('data: ', data);
+						this.hform.HMouldID = data[0].hmainid
+						this.hform.HMouldName = data[0].妯″叿鍚嶇О
+						this.hform.HMouldSpec = data[0].妯″叿鍝佺被
+						this.hform.HMouldModel = data[0].妯″叿鍨嬪彿
+						this.hform.HQty = 1
 
-                        this.enableEdit = false
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: Message
-                        })
-                    }
+						this.enableEdit = false
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: Message
+						})
+					}
 
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: err
-                    })
-                }
-            },         
-            radioChange({
-                detail: {
-                    value
-                }
-            }) {
-                this.hform.HCheckResult = value
-            },
-            async getMaxNum() {
-                try {
-                    let res = await CommonUtils.doRequest2Async({
-                        url: "/Web/GetMAXNum",
-                        data: {
-                            "HBillType": this.HBillType
-                        }
-                    })
+				} 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
-                }
+					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"
-                    })
+				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
-                    }
+					if (!res) {
+						return
+					}
 
-                    let {
-                        count,
-                        Message
-                    } = res.data
-                    if (count == 1) {
-                        uni.showModal({
-                            title: '鎻愮ず',
-                            content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
-                            success: (res) => {
-                                if (res.confirm) {
-                                    console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-                                    uni.redirectTo({
-                                        url: '/pages/MJGL/Sb_EquipRepairCheck/Sb_EquipRepairCheckBill?operationType=1'
-                                    })
-                                } else if (res.cancel) {
-                                    console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                                    setTimeout(() => {
-                                        uni.navigateBack();
-                                    }, 50)
-                                }
-                            }
-                        });
-                    } else {
-                        CommonUtils.showTips({
-                            title: "娓╅Θ鎻愮ず",
-                            message: "鎻愪氦鍗曟嵁澶辫触: " + Message
-                        })
-                    }
+					let {
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						uni.showModal({
+							title: '鎻愮ず',
+							content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+							success: (res) => {
+								if (res.confirm) {
+									console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+									uni.redirectTo({
+										url: '/pages/MJGL/Sb_EquipRepairCheck/Sb_EquipRepairCheckBill?operationType=1'
+									})
+								} else if (res.cancel) {
+									console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+									setTimeout(() => {
+										uni.navigateBack();
+									}, 50)
+								}
+							}
+						});
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+						})
+					}
 
 
-                } catch (err) {
-                    CommonUtils.showTips({
-                        title: "娓╅Θ鎻愮ず",
-                        message: "鎻愪氦鍗曟嵁澶辫触: " + err
-                    })
-                }
-            }
-        },
-        onLoad(e) {
-            console.log('e: ', e);
-            if (!e.operationType) {
-                this.operationType = 1
-            } else {
-                this.operationType = e.operationType
-            }
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鎻愪氦鍗曟嵁澶辫触: " + err
+					})
+				}
+			}
+		},
+		onLoad(e) {
+			console.log('e: ', e);
+			if (!e.operationType) {
+				this.operationType = 1
+			} else {
+				this.operationType = e.operationType
+			}
 
-            if (this.operationType == 1) {
-                // 鏂板
-                this.getMaxNum()
-            } else if (this.operationType == 2) {
-                // 澶嶅埗
-            } else if (this.operationType == 3) {
-                // 缂栬緫
+			if (this.operationType == 1) {
+				// 鏂板
+				this.getMaxNum()
+			} else if (this.operationType == 2) {
+				// 澶嶅埗
+			} else if (this.operationType == 3) {
+				// 缂栬緫
 
-            } else if (this.operationType == 4) {
-                // 娴忚
+			} else if (this.operationType == 4) {
+				// 娴忚
 
-            }
+			}
 
-            this.getHDeptList()
-            this.getEmpList()
-            this.getCheckProjList()
-        },
-        onReady() {
-            const query = uni.createSelectorQuery().in(this)
-            query.select("#buttons")
-                .boundingClientRect()
-                .select("#tabs")
-                .boundingClientRect()
-                .exec(res => {
-                    this.btnTop = Math.floor(res[0].top)
-                    this.tabsBottom = Math.ceil(res[1].bottom)
-                })
-        }
-    }
+			this.getHDeptList()
+			this.getEmpList()
+			this.getCheckProjList()
+			// 鐩戝惉鏁呴殰鐧昏鍗曢�夋嫨瀹屾垚浜嬩欢
+			uni.$on('BillSelectComplete', (e) => {
+				console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
+				this.hform.HMainSourceInterID = e.HInterID
+				this.hform.HMainSourceBillNo = e.HBillNo
+				this.hform.HMainSourceEntryID = e.HEntryID
+				this.hform.HMouldID = e.HMouldID
+				this.hform.HMouldName = e.HMouldName
+				this.hform.HMouldSpec = e.HMouldSpec
+				this.hform.HMouldModel = e.HMouldModel
+				this.$refs.billList.exit()
+			})
+			// 鐩戝惉缁翠慨璁板綍閫夋嫨瀹屾垚浜嬩欢
+			uni.$on('RepairRecordSelectComplete', (e) => {
+				console.log("鎺ユ敹鍒扮淮淇褰曢�夋嫨: ", e);
+				if (e.HInterID) {
+					this.hform.HMouldRepairWorkName = e.HBillNo;
+					this.hform.HMouldRepairWorkID = e.HInterID;
+					// 鍙互鏍规嵁闇�瑕佽缃叾浠栧瓧娈�
+				}
+				this.$refs.repairRecordList.exit();
+			});
+		},
+		onUnload() {
+			uni.$off('BillSelectComplete');
+			uni.$off('RepairRecordSelectComplete');
+		},
+		onReady() {
+			const query = uni.createSelectorQuery().in(this)
+			query.select("#buttons")
+				.boundingClientRect()
+				.select("#tabs")
+				.boundingClientRect()
+				.exec(res => {
+					this.btnTop = Math.floor(res[0].top)
+					this.tabsBottom = Math.ceil(res[1].bottom)
+				})
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-    @import "@/pages/MJGL/style/MJBillStyle.scss"
+	@import "@/pages/MJGL/style/MJBillStyle.scss"
 </style>
\ No newline at end of file
diff --git a/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue b/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
index 456f6a2..cf7c276 100644
--- a/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
+++ b/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
@@ -306,9 +306,9 @@
                 barCodeFocus: false,
 
                 tabs: 0,
-                HMainSourceBillType: '鎵嬪伐褰曞叆',
-                arrayHMainSourceBillType: ['鎵嬪伐褰曞叆', '妯″叿鏁呴殰鐧昏鍗�'],
-                arrayHMainSourceBillTypeID: ['1', '3815'],
+                HMainSourceBillType: '妯″叿鏁呴殰鐧昏鍗�',
+                arrayHMainSourceBillType: ['妯″叿鏁呴殰鐧昏鍗�'],
+                arrayHMainSourceBillTypeID: ['3815'],
                 arrayRepairType: ["鍐呴儴缁翠慨", "濮斿缁翠慨"],
 
                 linterid: '',
@@ -1081,13 +1081,13 @@
                                 if (res.confirm) {
                                     console.log('鐢ㄦ埛鐐瑰嚮纭畾');
                                     uni.redirectTo({
-                                        url: '/pages/weixiujilu/mouldRepairRecordBill?OperationType=1'
+                                        url: '/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill?OperationType=1'
                                     })
                                 } else if (res.cancel) {
                                     console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                                    // setTimeout(() => {
-                                    // 	uni.navigateBack();
-                                    // }, 50)
+                                    setTimeout(() => {
+                                    	uni.navigateBack();
+                                    }, 50)
                                 }
                             }
                         });
diff --git a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
index 90013e8..0b76675 100644
--- a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
+++ b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
@@ -38,16 +38,16 @@
 				</view>
 			</view>
 			<view class="form-item">
-				<view class="title">鍙戞枡:</view>
+				<view class="title">鍙戝嚭浜�:</view>
 				<view class="right">
-					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戞枡浜�" v-model="hform.HKeeperName"
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戝嚭浜�" v-model="hform.HKeeperName"
 						@input="HScatterUserChange"></uni-combox>
 				</view>
 			</view>
 			<view class="form-item">
-				<view class="title">棰嗘枡:</view>
+				<view class="title">棰嗙敤浜�:</view>
 				<view class="right">
-					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)棰嗘枡浜�" v-model="hform.HSecManagerName"
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)棰嗙敤浜�" v-model="hform.HSecManagerName"
 						@input="HCollectUserChange"></uni-combox>
 				</view>
 			</view>
@@ -239,8 +239,8 @@
 					HWHID: getUserInfo().HWhID,
 					HStockPlaceName: getUserInfo().HSPName,
 					HStockPlaceID: getUserInfo().HSPID,
-					HKeeperName: getUserInfo().HKeeperName,
-					HKeeperID: getUserInfo().HKeeperID, //鍙戞枡浜�
+					HKeeperName: getUserInfo().HEmpName,
+					HKeeperID: getUserInfo().HEmpID, //鍙戞枡浜�
 					HSecManagerName: getUserInfo().HEmpName,
 					HSecManagerID: getUserInfo().HEmpID, //棰嗘枡浜�
 					HDeptName: getUserInfo().HDeptName,
@@ -517,11 +517,6 @@
 							for (var i = 0; i < data.length; i++) {
 								this.arrayHWHName[i] = data[i]["HName"]
 							}
-						} else {
-							uni.showToast({
-								title: '浠撳簱鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
 						}
 					},
 				)
@@ -543,12 +538,7 @@
 							for (var i = 0; i < data.length; i++) {
 								this.arrayHStockPlaceName[i] = data[i]["HWhName"]
 							}
-						} else {
-							uni.showToast({
-								title: '浠撲綅鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
+						} 
 					},
 				)
 			},
diff --git a/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue b/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
index cc9117d..8ff0f39 100644
--- a/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
+++ b/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
@@ -38,16 +38,16 @@
                 </view>
             </view>
             <view class="form-item">
-                <view class="title">鍙戞枡:</view>
+                <view class="title">鍙戝嚭浜�:</view>
                 <view class="right">
-                    <uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戞枡浜�" v-model="hform.HKeeperName"
+                    <uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戝嚭浜�" v-model="hform.HKeeperName"
                         @input="HScatterUserChange"></uni-combox>
                 </view>
             </view>
             <view class="form-item">
-                <view class="title">棰嗘枡:</view>
+                <view class="title">棰嗙敤浜�:</view>
                 <view class="right">
-                    <uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)棰嗘枡浜�" v-model="hform.HSecManagerName"
+                    <uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)棰嗙敤浜�" v-model="hform.HSecManagerName"
                         @input="HCollectUserChange"></uni-combox>
                 </view>
             </view>
diff --git a/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue b/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
index fc363b2..5edebd6 100644
--- a/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
+++ b/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
@@ -268,7 +268,7 @@
 			let {
 				operationType
 			} = e
-			if (operationType == 0) {
+			if (operationType == 0 || operationType == 1) {
 				this.getMaxNum()
 				this.refSav = 'Add'
 			} else {
@@ -708,10 +708,23 @@
 							Message
 						} = res.data
 						if (count == 1) {
-							return uni.showToast({
-								icon: 'none',
-								title: "鎻愪氦鎴愬姛!"
-							})
+							uni.showModal({
+							    title: '鎻愮ず',
+							    content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵',
+							    success: (res) => {
+							        if (res.confirm) {
+							            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							            uni.redirectTo({
+							                url: '/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=1'
+							            })
+							        } else if (res.cancel) {
+							            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+							            setTimeout(() => {
+							            	uni.navigateBack();
+							            }, 50)
+							        }
+							    }
+							});
 						} else {
 							return uni.showToast({
 								icon: 'none',
@@ -723,7 +736,7 @@
 			},
 			onAddNewHandler() {
 				uni.redirectTo({
-					url: "/pages/quyangdan/TakeSampleCheckBillList?operationType=0"
+					url: "/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=1"
 				})
 			},
 			goBack() {
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index 173be65..f970074 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -257,28 +257,28 @@
 					},
 					{
 						"img": "../../static/icon/icon8.png",
-						"text": "妯″叿鎶ュ簾鍑哄簱鍗曞垪琛�",
+						"text": "鍣ㄥ叿鎶ュ簾鍑哄簱鍗曞垪琛�",
 						"url": "/pages/MJGL/MouldScrapOutBill/MouldScrapOutBillList",
 						"id": 29,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
-						"text": "妯″叿璋冩嫧鍗曞垪琛�",
+						"text": "鍣ㄥ叿璋冩嫧鍗曞垪琛�",
 						"url": "/pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
 						"id": 30,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
-						"text": "妯″叿棰嗙敤鍑哄簱鍗曞垪琛�",
+						"text": "鍣ㄥ叿棰嗙敤鍑哄簱鍗曞垪琛�",
 						"url": "/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList",
 						"id": 31,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
-						"text": "妯″叿棰嗙敤閫�搴撳崟鍒楄〃",
+						"text": "鍣ㄥ叿棰嗙敤閫�搴撳崟鍒楄〃",
 						"url": "/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
 						"id": 32,
 						"hidden": false
@@ -299,28 +299,28 @@
 					},
 					{
 						"img": "../../static/icon/icon5.png",
-						"text": "妯″叿鐐规璁板綍鍗曞垪琛�",
+						"text": "鍣ㄥ叿鐐规璁板綍鍗曞垪琛�",
 						"url": "/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBillList",
 						"id": 35,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon5.png",
-						"text": "妯″叿淇濆吇璁板綍鍗曞垪琛�",
+						"text": "鍣ㄥ叿淇濆吇璁板綍鍗曞垪琛�",
 						"url": "/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBillList",
 						"id": 36,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon13.png",
-						"text": "妯″叿鏁呴殰鐧昏鍒楄〃",
+						"text": "鍣ㄥ叿鏁呴殰鐧昏鍒楄〃",
 						"url": "/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList",
 						"id": 37,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
-						"text": "妯″叿缁翠慨娲惧伐鍗曞垪琛�",
+						"text": "鍣ㄥ叿缁翠慨娲惧伐鍗曞垪琛�",
 						"url": "/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBillList",
 						"id": 38,
 						"hidden": false
@@ -328,7 +328,7 @@
 
 					{
 						"img": "../../static/icon/icon13.png",
-						"text": "妯″叿缁翠慨璁板綍鍒楄〃",
+						"text": "鍣ㄥ叿缁翠慨璁板綍鍒楄〃",
 						"url": "/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBillList",
 						"id": 39,
 						"hidden": false
@@ -336,7 +336,7 @@
 
 					{
 						"img": "../../static/icon/icon8.png",
-						"text": "妯″叿缁翠慨楠屾敹鍗曞垪琛�",
+						"text": "鍣ㄥ叿缁翠慨楠屾敹鍗曞垪琛�",
 						"url": "/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList",
 						"id": 40,
 						"hidden": false
diff --git a/pages/index/tab3.vue b/pages/index/tab3.vue
index 05ea8d3..38ca54d 100644
--- a/pages/index/tab3.vue
+++ b/pages/index/tab3.vue
@@ -46,14 +46,14 @@
                 itemData: [
 					{
 					    img: '../../static/icon/icon8.png',
-					    text: '妯″叿妗ｆ鏌ヨ',
+					    text: '鍣ㄥ叿妗ｆ鏌ヨ',
 					    url: `/pages/MJGL/Gy_MouldFile/Gy_MouldFileList`,
 					    id: 1,
 					    hidden: false,
 					},
 					{
                         img: '../../static/icon/icon6.png',
-                        text: '妯″叿鐘舵�佸垎鏋�',
+                        text: '鍣ㄥ叿鐘舵�佸垎鏋�',
                         tip: '鏌ョ湅璇︽儏',
                         url: '/pages/mujvzhuangtai/mujvzhuangtai',
                         id: 2,
@@ -62,63 +62,63 @@
                     },
                     {
                         img: '../../static/icon/icon16.png',
-                        text: '妯″叿瀵垮懡',
+                        text: '鍣ㄥ叿瀵垮懡',
                         url: '/pages/shoujishouming/table',
                         id: 3,
                         hidden: false,
                     },
                     {
                         "img": "../../static/icon/icon13.png",
-                        "text": "妯″叿鏁呴殰鐧昏鍗�",
+                        "text": "鍣ㄥ叿鏁呴殰鐧昏鍗�",
                         "url": "/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill?operationType=1",
                         "id": 4,
                         "hidden": false
                     },
                     {
                         "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿缁翠慨娲惧伐鍗�",
+                        "text": "鍣ㄥ叿缁翠慨娲惧伐鍗�",
                         "url": "/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill",
                         "id": 5,
                         "hidden": false
                     },
                     {
                         "img": "../../static/icon/icon13.png",
-                        "text": "妯″叿缁翠慨璁板綍鍗�",
+                        "text": "鍣ㄥ叿缁翠慨璁板綍鍗�",
                         "url": "/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill",
                         "id": 6,
                         "hidden": false
                     },
                     {
                         "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿缁翠慨楠屾敹鍗�",
+                        "text": "鍣ㄥ叿缁翠慨楠屾敹鍗�",
                         "url": "/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill",
                         "id": 7,
                         "hidden": false
                     },
                     {
                         "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿鐐规璁板綍鍗�",
+                        "text": "鍣ㄥ叿鐐规璁板綍鍗�",
                         "url": "/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill",
                         "id": 8,
                         "hidden": false
                     },
                     {
                         "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿淇濆吇璁板綍鍗�",
+                        "text": "鍣ㄥ叿淇濆吇璁板綍鍗�",
                         "url": "/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill",
                         "id": 9,
                         "hidden": false
                     },
                     {
                         "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿棰嗙敤鍑哄簱鍗�",
+                        "text": "鍣ㄥ叿棰嗙敤鍑哄簱鍗�",
                         "url": "/pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
                         "id": 10,
                         "hidden": false
                     },
                     {
                         "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿棰嗙敤閫�搴撳崟",
+                        "text": "鍣ㄥ叿棰嗙敤閫�搴撳崟",
                         "url": "/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill",
                         "id": 11,
                         "hidden": false
@@ -139,7 +139,7 @@
                     },
                     {
                         "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿鎶ュ簾鍑哄簱鍗�",
+                        "text": "鍣ㄥ叿鎶ュ簾鍑哄簱鍗�",
                         "url": "/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill",
                         "id": 14,
                         "hidden": false
@@ -219,7 +219,7 @@
                     },
                     {
                         "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿淇濆吇浠诲姟",
+                        "text": "鍣ㄥ叿淇濆吇浠诲姟",
                         "url": "/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport",
                         "id": 25,
                         "hidden": false
@@ -233,7 +233,7 @@
                     },
                     {
                         "img": "../../static/icon/icon8.png",
-                        "text": "妯″叿缁翠慨浠诲姟",
+                        "text": "鍣ㄥ叿缁翠慨浠诲姟",
                         "url": "/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport",
                         "id": 27,
                         "hidden": false

--
Gitblit v1.9.1