From d80cdf423ff72f64fa030f584c87d0c854174cca Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 09 一月 2026 16:45:32 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList.vue  |  516 ++++++++
 pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBillList.vue     |   12 
 /dev/null                                                       |  351 -----
 pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue          |  872 ++++++++++++++
 pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue         |  954 +++++++++++++++
 pages/zutuo_xiaowei/form_xiaowei.vue                            |    2 
 pages/index/tab3.vue                                            |   73 
 pages.json                                                      |   56 
 pages/index/tab2.vue                                            |  126 +-
 pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBillList.vue      |   12 
 pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckRuleBillList.vue |  516 ++++++++
 pages/index/index.vue                                           |  224 ---
 12 files changed, 3,005 insertions(+), 709 deletions(-)

diff --git a/pages.json b/pages.json
index 420b181..d152131 100644
--- a/pages.json
+++ b/pages.json
@@ -549,59 +549,63 @@
             }
         },
         {
-            "path": "pages/MJGL/mujudianjianjiludan/MouldDotCheckPlanBillList",
+            "path": "pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBillList",
             "style": {
-                "navigationBarTitleText": "妯″叿鐐规璁板綍鍗�",
+                "navigationBarTitleText": "妯″叿鐐规璁板綍鍗曞垪琛�",
                 "enablePullDownRefresh": true
             }
         },
         {
-            "path": "pages/qitachukujiaoyan/qitachukujiaoyan",
-            "style": {
-                "navigationBarTitleText": "鍏朵粬鍑哄簱鏍￠獙",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/MJGL/mujudianjianjiludan/form",
+            "path": "pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill",
             "style": {
                 "navigationBarTitleText": "妯″叿鐐规璁板綍鍗�"
             }
         },
         {
-            "path": "pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList_son",
+            "path": "pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckRuleBillList",
             "style": {
-                "navigationBarTitleText": "妯″叿淇濆吇璁板綍瀛愯〃"
+                "navigationBarTitleText": "妯″叿鐐规瑙勭▼"
             }
         },
         {
-            "path": "pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList",
+            "path": "pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBillList",
             "style": {
-                "navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗�",
+                "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/MJGL/mujubaoyangjiludan/MouldMaintainBill",
-            "style": {
-                "navigationBarTitleText": "妯″叿淇濆吇璁板綍鍗�"
-            }
-        }, {
-            "path": "pages/MJGL/mujubaoyangjiludan/mouldMaintainRecordBillList_son",
-            "style": {
-                "navigationBarTitleText": "妯″叿淇濆吇璁板綍瀛愯〃"
-            }
-        }, {
+        }, 
+		{
             "path": "pages/qitachukujiaoyan/qitachukujiaoyan",
             "style": {
                 "navigationBarTitleText": "鍏朵粬鍑哄簱鏍￠獙",
                 "enablePullDownRefresh": true
             }
         },
+		{
+		    "path": "pages/qitachukujiaoyan/qitachukujiaoyan",
+		    "style": {
+		        "navigationBarTitleText": "鍏朵粬鍑哄簱鏍￠獙",
+		        "enablePullDownRefresh": true
+		    }
+		},
         {
             "path": "pages/qitachukujiaoyan/qitachukudanjiaoyan",
             "style": {
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, // 闇�纭鏄惁姝ｇ‘
+								"HSourceEntryID": item.HEntryID == null ? 0 : item.HEntryID, // 闇�纭鏄惁姝ｇ‘
+								"HSourceBillNo": item.鍗曟嵁鍙� // 闇�纭鏄惁姝ｇ‘
+
+							}
+						})
+
+					} 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
-						.浜у搧妯″叿 + '&浜у搧妯″叿浠ｇ爜=' + item.浜у搧妯″叿浠ｇ爜,
 				});
 			}
 		},
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/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">浠ｇ爜锛歿{infoData.浜у搧妯″叿浠ｇ爜}}</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>鍗曚綅浠ｇ爜锛�</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">浠ｇ爜锛歿{infoData.浜у搧妯″叿浠ｇ爜}}</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="璇疯緭鍏ラ噸澶у畨鍏ㄩ殣鎮ｈ褰�" />
+					</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.鐐规椤圭洰浠ｇ爜 || "",
+									"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 + '&浜у搧妯″叿浠ｇ爜=' + item
-						.浜у搧妯″叿浠ｇ爜 + '&浜у搧妯″叿=' + 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.鍗曟嵁鍙�,  
+					//妯″叿妗ｆ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="璇疯緭鍏ラ噸澶у畨鍏ㄩ殣鎮ｈ褰�"></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.浜у搧妯″叿浠ｇ爜,
-								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.浜у搧妯″叿浠ｇ爜">
-						<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_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/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: '璁惧妗ｆ',
-				// 		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..329edfb 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -220,7 +220,7 @@
 						img: '../../static/icon/icon16.png',
 						text: '鍒嗘寮忚皟鍏ュ崟缂撳瓨',
 						url: '/pages/fenbushidiaorudan/table',
-						id: 28,
+						id: 24,
 						hidden: false,
 					},
 					{
@@ -228,7 +228,7 @@
 						text: '宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�',
 						tip: '鏌ョ湅鍒楄〃',
 						url: '/pages/gongxuIn/Cj_StationInBillList',
-						id: 2,
+						id: 25,
 						hidden: false,
 					}, 
 					{
@@ -236,7 +236,7 @@
 						text: '宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�',
 						tip: '鏌ョ湅鍒楄〃',
 						url: '/pages/gongxuOut/Cj_StationOutBillList',
-						id: 4,
+						id: 26,
 						hidden: false,
 					}, 
 					{
@@ -244,7 +244,7 @@
 						text: '宸ュ簭濮斿鍙戝嚭鍗曞垪琛�',
 						tip: '鏌ョ湅鍒楄〃',
 						url: '/pages/weiwaigxIn/Cj_StationEntrustInBillList',
-						id: 6,
+						id: 27,
 						hidden: false,
 					}, 
 					{
@@ -252,105 +252,120 @@
 						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/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
+					},
+					
+					{
+						"img": "../../static/icon/icon13.png",
 						"text": "妯″叿缁翠慨璁板綍鍒楄〃",
 						"url": "/pages/weixiujilu/mouldRepairRecordBillList",
-						"id": 39,
+						"id": 37,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon13.png",
 						"text": "妯″叿鏁呴殰鐧昏鍒楄〃",
 						"url": "/pages/qijvguzhangdengji/mouldMistake",
-						"id": 37,
+						"id": 38,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon13.png",
 						"text": "棣栦欢妫�楠屽崟鍒楄〃",
 						"url": "/pages/ZLGL/shoujianjianyan/firstCheckBillList",
-						"id": 41,
+						"id": 39,
 						"hidden": false
 					},
 					{
 					    "img": "../../static/icon/icon8.png",
 					    "text": "宸℃妫�楠屽崟鍒楄〃",
 					    "url": "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList",
-					    "id": 43,
+					    "id": 40,
 					    "hidden": false
 					},
 					{
 					    "img": "../../static/icon/icon8.png",
 					    "text": "鏈欢妫�楠屽崟鍒楄〃",
 					    "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
-					    "id": 45,
+					    "id": 41,
 					    "hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "鏉ユ枡妫�楠屽垪琛�",
 						"url": "/pages/ZLGL/lailiaojianyan/POStockInCheckBillList",
-						"id": 54,
+						"id": 42,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "鍏ㄦ妫�楠屽崟鍒楄〃",
 						"url": "/pages/ZLGL/QualityReportStep/QualityReportStepBillList",
-						"id": 55,
+						"id": 43,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "杞﹂棿鑷鍗曞垪琛�",
 						"url": "/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBillList",
-						"id": 55,
+						"id": 44,
 						"hidden": false
 					},
 					// 鏍囩鏉＄爜鐩稿叧
@@ -361,21 +376,21 @@
 						"img": "../../static/icon/icon3.png",
 						"text": "璁惧淇濆吇璁板綍鍗曞垪琛�",
 						"url": "/pages/baoyangjilu/Sb_EquipMaintainRuleList",
-						"id": 27,
+						"id": 45,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon6.png",
 						"text": "璁惧鏁呴殰鐧昏琛ㄥ垪琛�",
 						"url": "/pages/guzhangdengji/EqpConkBookBillList",
-						"id": 28,
+						"id":46,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon7.png",
 						"text": "璁惧缁翠慨璁板綍鍗曞垪琛�",
 						"url": "/pages/shebeiweixiu/SbEqpMaintenanceBillList",
-						"id": 29,
+						"id": 47,
 						"hidden": false
 					},
 
@@ -383,19 +398,17 @@
 					{
 						"img": "../../static/icon/icon15.png",
 						"text": "寮傚父鍙嶉鍗曞垪琛�",
-						"url": "/pages/yichang/MESExecptFeedBackBillList",
-						"id": 30,
+						"url": "/pages/yichang/ErrMsgBackHandleBillList",
+						"id": 48,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon16.png",
 						"text": "寮傚父鍙嶉澶勭悊鍗曞垪琛�",
-						"url": "/pages/yichang/MESExecptFeedBackBillList",
-						"id": 31,
+						"url": "/pages/yichang/ErrMsgBackHandleBillList",
+						"id": 49,
 						"hidden": false
 					},
-
-					// 搴撳瓨鏌ヨ鐩稿叧
 					
 
 					// 鍙栨牱杩樻牱鐩稿叧
@@ -403,32 +416,19 @@
 						"img": "../../static/icon/icon8.png",
 						"text": "鍙栨牱鍗曞垪琛�",
 						"url": "/pages/quyangdan/TakeSampleCheckBillList",
-						"id": 33,
+						"id": 50,
 						"hidden": false
 					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "杩樻牱鍗曞垪琛�",
 						"url": "/pages/huanyangdan/BackSampleCheckBillList",
-						"id": 34,
+						"id": 51,
 						"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",
@@ -442,7 +442,7 @@
 					    "img": "../../static/icon/icon8.png",
 					    "text": "鍦ㄥ簱妫�楠屽崟缂撳瓨",
 					    "url": "/pages/ZLGL/zaikujianyandan/InStockCheckBillList",
-					    "id": 57,
+					    "id": 53,
 					    "hidden": false
 					}
                     
diff --git a/pages/index/tab3.vue b/pages/index/tab3.vue
index 98492f7..9d1350e 100644
--- a/pages/index/tab3.vue
+++ b/pages/index/tab3.vue
@@ -49,7 +49,7 @@
 						text: '妯″叿鐘舵�佸垎鏋�',
 						tip: '鏌ョ湅璇︽儏',
 						url: '/pages/mujvzhuangtai/mujvzhuangtai',
-						id: 15,
+						id: 1,
 						hidden: false,
 					
 					},
@@ -57,67 +57,92 @@
 						img: '../../static/icon/icon8.png',
 						text: '妯″叿妗ｆ鏌ヨ',
 						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/icon13.png",
 						"text": "妯″叿缁翠慨璁板綍鍗�",
 						"url": "/pages/weixiujilu/mouldRepairRecordBill",
-						"id": 40,
+						"id": 5,
 						"hidden": false
 					},
-					
-					
-					
+					{
+						"img": "../../static/icon/icon13.png",
+						"text": "妯″叿缁翠慨楠屾敹鍗�",
+						"url": "/pages/weixiujilu/mouldRepairRecordBill",
+						"id": 6,
+						"hidden": false
+					},
+					{
+					    "img": "../../static/icon/icon8.png",
+					    "text": "妯″叿鐐规璁板綍鍗�",
+					    "url": "/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill",
+					    "id": 7,
+					    "hidden": false
+					},
+					{
+					    "img":"../../static/icon/icon8.png",
+					    "text": "妯″叿淇濆吇璁板綍鍗�",
+					    "url": "/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill",
+					    "id": 8,
+					    "hidden": false
+					},
 					{
 						"img": "../../static/icon/icon8.png",
 						"text": "妯″叿棰嗙敤鍑哄簱鍗�",
 						"url": "/pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
-						"id": 49,
+						"id": 9,
 						"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": 10,
 						"hidden": false
 					},
 					{
 						img: '../../static/icon/icon8.png',
 						text: '涓婃ā鍗�',
 						url: `/pages/MJGL/shangmudan/MouldUpperBill`,
-						id: 37,
+						id: 11,
 						hidden: false,
+					},
+					{
+						img: '../../static/icon/icon8.png',
+						text: '涓嬫ā鍗�',
+						url: `/pages/MJGL/xiamodan/MouldLowerBill`,
+						id: 12,
+						hidden: false,
+					},
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "妯″叿鎶ュ簾鍑哄簱鍗�",
+						"url": "/pages/MJGL/MouldScrapOutBill/MouldScrapOutBill",
+						"id": 13,
+						"hidden": false
 					},
                     {
                     	img: '../../static/icon/icon1.png',
                     	text: '璁惧妗ｆ鏌ヨ',
                     	tip: '鏌ョ湅璇︽儏',
                     	url: '/pages/shebeidangan/Gy_EquipFileMainBillList',
-                    	id: 9,
+                    	id: 14,
                     	hidden: true,
                     }, 
 					{
@@ -125,7 +150,7 @@
                     	text: '璁惧灞ュ巻鏌ヨ',
                     	tip: '鏌ョ湅璇︽儏',
                     	url: '/pages/shebeilvli/EquipFileBillResume',
-                    	id: 10,
+                    	id: 15,
                     	hidden: true,
                     }, 
 					{
@@ -133,7 +158,7 @@
 						text: '璁惧杩愯鐘舵��',
 						tip: '鏌ョ湅璇︽儏',
 						url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
-						id: 14,
+						id: 16,
 						hidden: true,
 					}, 
                     {
@@ -147,7 +172,7 @@
                         "img": "../../static/icon/icon8.png",
                         "text": "璁惧淇濆吇璁板綍鍗�",
                         "url": "/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill",
-                        "id": 53,
+                        "id": 17,
                         "hidden": false
                     },
                     {
@@ -161,7 +186,7 @@
                         "img": "../../static/icon/icon8.png",
                         "text": "璁惧鐐规璁板綍鍗�",
                         "url": "/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill",
-                        "id": 55,
+                        "id": 18,
                         "hidden": false
                     },
                     {
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,

--
Gitblit v1.9.1