From 2e80bd4afd3c499c80a6ec57869b054537ea1bb2 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 02 三月 2026 14:38:06 +0800
Subject: [PATCH] 器具维修入库/出库单

---
 pages/MJGL/qijuweixiuchukudan/Sc_MouldRepairOutBillList.vue |  484 +++++++
 pages/MJGL/qijuweixiurukudan/Sc_MouldRepairInBillList.vue   |  484 +++++++
 pages.json                                                  |   31 
 pages/index/tab2.vue                                        |   16 
 pages/MJGL/qijuweixiurukudan/Sc_MouldRepairInBill.vue       | 1295 +++++++++++++++++++++
 pages/MJGL/qijuweixiuchukudan/Sc_MouldRepairOutBill.vue     | 1295 +++++++++++++++++++++
 6 files changed, 3,602 insertions(+), 3 deletions(-)

diff --git a/pages.json b/pages.json
index fbdb99f..8b642b1 100644
--- a/pages.json
+++ b/pages.json
@@ -1873,8 +1873,35 @@
             {
                 "navigationBarTitleText" : "鍣ㄥ叿鐧昏鏁呴殰璺熻釜"
             }
-        }
-
+        },
+		{
+		    "path" : "pages/MJGL/qijuweixiuchukudan/Sc_MouldRepairOutBillList",
+		    "style" : 
+		    {
+		        "navigationBarTitleText" : "鍣ㄥ叿缁翠慨鍑哄簱鍗曞垪琛�"
+		    }
+		},
+		{
+		    "path" : "pages/MJGL/qijuweixiuchukudan/Sc_MouldRepairOutBill",
+		    "style" : 
+		    {
+		        "navigationBarTitleText" : "鍣ㄥ叿缁翠慨鍑哄簱鍗�"
+		    }
+		},
+{
+		    "path" : "pages/MJGL/qijuweixiurukudan/Sc_MouldRepairInBillList",
+		    "style" : 
+		    {
+		        "navigationBarTitleText" : "鍣ㄥ叿缁翠慨鍏ュ簱鍗曞垪琛�"
+		    }
+		},
+		{
+		    "path" : "pages/MJGL/qijuweixiurukudan/Sc_MouldRepairInBill",
+		    "style" : 
+		    {
+		        "navigationBarTitleText" : "鍣ㄥ叿缁翠慨鍏ュ簱鍗�"
+		    }
+		}
     ],
     "tabBar": {
         "color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
diff --git a/pages/MJGL/qijuweixiuchukudan/Sc_MouldRepairOutBill.vue b/pages/MJGL/qijuweixiuchukudan/Sc_MouldRepairOutBill.vue
new file mode 100644
index 0000000..7092b8f
--- /dev/null
+++ b/pages/MJGL/qijuweixiuchukudan/Sc_MouldRepairOutBill.vue
@@ -0,0 +1,1295 @@
+<template>
+	<view>
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鏉$爜</view>
+				<view class="right" style="width: 350rpx;">
+					<input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜"
+						@confirm="getCode(hform.HBarCode)" />
+				</view>
+				<uni-icons type="scan"
+					style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+					size="20" @click="toScanCode"></uni-icons>
+			</view>
+			<view class="form-item" @click="searchModule">
+				<view class="title">妯″叿</view>
+				<view class="righton" style="width: 350rpx;">
+					<input placeholder="璇烽�夋嫨妯″叿" />
+				</view>
+				<uni-icons type="search"
+					style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+					size="20"></uni-icons>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>浠撳簱:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+						@input="HWHNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>浠撲綅:</view>
+				<view class="right" v-show="showHStockPlaceName">
+					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+						v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
+				</view>
+				<view class="righton" v-show="!showHStockPlaceName">
+					<input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="涓嶅彲鎿嶄綔" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>鍙戝嚭浜�:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戝嚭浜�" v-model="hform.HKeeperName"
+						@input="HScatterUserChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>棰嗙敤浜�:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)棰嗙敤浜�" v-model="hform.HSecManagerName"
+						@input="HCollectUserChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>閮ㄩ棬:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+						@input="HDeptNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">寰�鏉ョ被鍨�:</view>
+				<view class="right" v-show="showHSourceBillNo">
+					<uni-combox :candidates="['渚涘簲鍟�','瀹㈡埛','閮ㄩ棬']" placeholder="璇烽�夋嫨绫诲瀷" v-model="hform.TypeName"
+						@input="HSelectTypeChange"></uni-combox>
+				</view>
+				<view class="right" v-show="!showHSourceBillNo">
+					<input name="TypeName" disabled v-model="hform.TypeName" placeholder="" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">寰�鏉ュ崟浣�:</view>
+				<view class="right" v-show="showHSourceBillNo">
+					<uni-combox :candidates="arrayHSelectType" placeholder="璇烽�夋嫨" v-model="hform.HSupName"
+						@input="HSupNameChange"></uni-combox>
+				</view>
+				<view class="right" v-show="!showHSourceBillNo">
+					<input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
+				</view>
+			</view>
+			<view class="tabs">
+				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">琛ㄥご淇℃伅</view>
+				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">妯″叿淇℃伅</view>
+			</view>
+			<view v-if="tabs == 0">
+				<view class="form-item">
+					<view class="title">鏃ユ湡:</view>
+					<view class="right">
+						<picker mode="date" v-model="hform.HDate" @change="HDateChange">
+							<view class="picker-overlay"></view>
+							<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+						</picker>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">婧愬崟绫诲瀷:</view>
+					<view class="right" v-show="showHMainSourceBillType">
+						<picker :range="arrayHMainSourceBillType" @change="HMainSourceBillTypeChange">
+							<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+								placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+							<view class="picker-overlay"></view>
+						</picker>
+					</view>
+					<view class="righton" v-show="!showHMainSourceBillType">
+						<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+							placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+					</view>
+				</view>
+				<view class="form-item" v-if="HMainSourceBillType==-1">
+					<view class="title">婧愬崟鍗曞彿:</view>
+					<view class="right" v-show="showHSourceBillNo">
+						<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
+                            v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
+						<input :focus="HSourceBillNoFocus" type="text" name="HSourceBillNo"
+							v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+
+					</view>
+					<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+						<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+					</view>
+
+					<view class="righton" v-show="!showHSourceBillNo">
+						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+					</view>
+					<!-- <view class="right" v-show="showHSourceBillNo">
+                        <uni-combox ref="uniComboxSourceBill" :isFocus="HSourceBillNoFocus"
+                            :confirm-call="onSourceBillBlurHandler" v-if="reHSourceBillNo"
+                            :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" v-model="hform.HSourceBillNo"
+                            @input="HSourceBillNoChange"></uni-combox>
+                    </view>
+                    <view class="righton" v-show="!showHSourceBillNo">
+                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+                    </view> -->
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="righton">
+						<input name="HMaker" disabled v-model="hform.HMaker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input name="HBillNo" disabled v-model="hform.HBillNo" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁ID:</view>
+					<view class="righton">
+						<input name="HInterID" disabled v-model="hform.HInterID" />
+					</view>
+				</view>
+			</view>
+			<view v-if="tabs==1">
+				<view class="list" v-for="(item,index) in HMouldList" :key="index">
+					<uni-card :title="item.鍣ㄥ叿鍚嶇О" style="margin: 10px;" @tap="delMater(item, $event)">
+						<!-- 鍣ㄥ叿浠g爜浣滀负鍙偣鍑婚摼鎺� -->
+						<view class="card-header">
+							<text class="link-text">鍣ㄥ叿鍙凤細{{item.鍣ㄥ叿鍙穧}</text>
+						</view>
+
+						<view class="card-detail">
+							<view class="detail">
+								<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+							</view>
+							<view class="detail">
+								<text>妯″叿鏉$爜锛�</text>{{item.鍣ㄥ叿鏉$爜}}
+							</view>
+						</view>
+					</uni-card>
+				</view>
+				<view class="over" v-if="HMouldList.length == 0">鏆傛棤鏁版嵁</view>
+			</view>
+			<view class="bottom-btn">
+				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+				<button v-if="btnType == 1 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+				<!-- <button v-if="btnType != 1 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button> -->
+				<button v-if="btnType != 1 " class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			</view>
+		</view>
+		<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
+			:HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
+		<BillListPopupMouldVue @BillSelectComplete="MouldBillHandler" ref="billListMould"></BillListPopupMouldVue>
+	</view>
+</template>
+
+<script>
+	import getDateTime from '@/utils/getdateTime.js';
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
+	import {
+		CommonUtils
+	} from '@/utils/common';
+	import BillListPopupVue from '../../../components/BillListPopup/BillListPopup.vue';
+	import BillListPopupMouldVue from '../../../components/BillListPopup/BillListPopup_Mould.vue';
+	export default {
+		data() {
+			return {
+				HSourceBillNoFocus: false,
+				barCodeFocus: true, //鏉$爜鍏夋爣
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				tabs: 0,
+				btnType: 1, //1鏂板锛�3淇敼
+				linterid: '',
+				arrayHEmpName: [],
+				HEmpNameList: [],
+				arrayHWHName: [], //浠撳簱
+				HWHNameList: [],
+				arrayHStockPlaceName: [], //浠撲綅
+				HStockPlaceNameList: [],
+				arrayHDeptName: [], //閮ㄩ棬
+				HDeptNameList: [],
+				arrayHCusName: [], //瀹㈡埛
+				HCusNameList: [],
+				arrayHSupplierName: [], //渚涘簲鍟�
+				HSuplierList: [],
+				linterid: '',
+				HBillNo: '',
+				arrayHSelectType: [], // 寰�鏉ュ崟浣嶄笅鎷夊垪琛�
+				HSelectTypeList: [], // 寰�鏉ュ崟浣嶅畬鏁存暟鎹垪琛�
+				showHStockPlaceName: true,
+				HMouldList: [],
+				isEdit: false,
+
+				showHMainSourceBillType: true,
+				showHSourceBillNo: true,
+				HMainSourceBillType: uni.getStorageSync('billTypeName_3802') ? uni.getStorageSync('billTypeName_3802') :
+					'棰嗙敤鐢宠鍗�',
+				arrayHMainSourceBillType: [ '鎵嬪伐褰曞叆'],
+				arrayHMainSourceBillValue: [ '-1'],
+
+				hform: {
+					HBarCode: '',
+					HInterID: '',
+					HBillType: 3825,
+					HWHName: getUserInfo().HWhName,
+					HWHID: getUserInfo().HWhID,
+					HStockPlaceName: getUserInfo().HSPName,
+					HStockPlaceID: getUserInfo().HSPID,
+					HKeeperName: getUserInfo().HEmpName,
+					HKeeperID: getUserInfo().HEmpID, //鍙戞枡浜�
+					HSecManagerName: getUserInfo().HEmpName,
+					HSecManagerID: getUserInfo().HEmpID, //棰嗘枡浜�
+					HDeptName: getUserInfo().HDeptName,
+					HDeptID: getUserInfo().HDeptID,
+					//婧愬崟淇℃伅
+					HMainSourceBillType: uni.getStorageSync('billType_3802') ? uni.getStorageSync('billType_3802') : 3825,
+					HSourceBillNo: '', //CGDD000200
+					//寰�鏉ョ被鍨�
+					TypeName: uni.getStorageSync('typeName_3802'),
+					HSupName: '', // 寰�鏉ュ崟浣嶉�変腑鐨勫��
+					HSupID: '', // 寰�鏉ュ崟浣嶅搴旂殑ID
+					HSupTypeID: uni.getStorageSync('typeID_3802') ? uni.getStorageSync('typeID_3802') : 0,
+					HDate: getDateTime.dateTimeStr('y-m-d'),
+					HMaker: uni.getStorageSync('HUserName'),
+
+					HRedBlueFlag: 'false',
+					HStockOrgName: uni.getStorageSync('Organization'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+					HStockOutOrgID: uni.getStorageSync('OrganizationID'),
+					HBarCode_B: '',
+					HMouldName_B: '',
+					HMouldID_B: '',
+					HMouldCount_B: '',
+				}
+			}
+		},
+		components: {
+			BillListPopupVue,
+			BillListPopupMouldVue
+		},
+		methods: {
+			searchModule() {
+				this.$refs['billListMould'].showPopup()
+			},
+			MouldBillHandler(mould) {
+				if (!mould.enableMultiSourceBill) {
+					let val = mould.val[0]
+					this.hform.HBarCode = val['鏉$爜缂栧彿']
+					this.getCode(this.hform.HBarCode)
+				}
+				this.$refs['billListMould'].exit()
+			},
+			HSupNameChange(e) {
+				let index = this.arrayHSelectType.findIndex(el => el == e)
+				let HSupInfo = this.HSelectTypeList[index]
+				console.log('HSupInfo: ', HSupInfo);
+
+				this.hform.HSupID = HSupInfo.HItemID
+				this.hform.HSupName = HSupInfo['閮ㄩ棬鍚嶇О'] || HSupInfo['瀹㈡埛鍚嶇О'] || HSupInfo['渚涘簲鍟嗗悕绉�']
+
+				const pages = getCurrentPages()
+				// 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+				const currentPage = pages[pages.length - 1]
+				// 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
+				uni.setStorageSync(`${currentPage.route.split("/").pop()}_${this.hform.HBillType}`, {
+					HSupName: HSupInfo['閮ㄩ棬鍚嶇О'] || HSupInfo['瀹㈡埛鍚嶇О'] || HSupInfo['渚涘簲鍟嗗悕绉�'],
+					HSupID: HSupInfo.HItemID
+				})
+			},
+			loadCache() {
+				const pages = getCurrentPages()
+				// 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+				const currentPage = pages[pages.length - 1]
+				// 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
+				let cache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_${this.hform.HBillType}`)
+
+				this.hform.HSupID = cache.HSupID
+				this.hform.HSupName = cache.HSupName
+			},
+			//鎵爜
+			toScanCode() {
+				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+				mpaasScanModule.mpaasScan({
+					'hideAlbum': true,
+					'timeoutInterval': '10', //瓒呮椂鏃堕棿
+					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+				}, (ret) => {
+					console.log(ret.resp_result)
+					if (this.hform.HBarCode == '*') {
+						this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+					} else {
+						this.hform.HBarCode = ret.resp_result
+					}
+
+					this.getCode(this.hform.HBarCode)
+				})
+			},
+			getNewData() {
+				CommonUtils.doRequest("/WEBSController/GetMaxBillNoAndID_Json", {
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						let res1 = res.data;
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.hform.HInterID = data[0].HInterID
+							this.hform.HBillNo = data[0].HBillNo
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					})
+			},
+			async getCode(HBarCode) {
+				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				var sHWHID = this.hform.HWHID
+				var sHSPID = this.hform.HStockPlaceID
+				var sOldBarCode = HBarCode;
+				var HDeleteFlag = sOldBarCode.substring(0, 1); //鍙栨潯鐮佺涓�涓瓧绗�
+				var sBarCode = sOldBarCode.slice(1); //鑾峰彇绗竴涓瓧绗︿互澶栫殑鍏ㄩ儴瀛楃
+				var sSourceBillNo = this.hform.HSourceBillNo
+				var sSourceBillType = this.hform.HMainSourceBillType
+				if (sSourceBillType != -1 && sSourceBillNo == "") {
+
+					uni.showToast({
+						title: "璇峰厛閫夋嫨婧愬崟",
+						icon: 'none'
+					})
+					return
+				}
+				if (HDeleteFlag == '*') {
+					if (sBarCode == "") {
+						uni.showToast({
+							title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
+							icon: 'none'
+						});
+					} else {
+						try {
+							let res = await CommonUtils.doRequest2Sync({
+								url: '/MouldController/set_DelMouldStockBillMain_Temp_Json',
+								data: {
+									HInterID: this.hform.HInterID,
+									HBillType: this.hform.HBillType,
+									HBarCode: sBarCode
+								},
+							})
+
+							if (!res) {
+								return
+							}
+
+							console.log('鍒犻櫎鏉$爜', res.data);
+							this.hform.HBarCode = '';
+							if (res.data.count == 1) {
+								this.hform.HQty = ''
+							} else {
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+
+
+						} catch (err) {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					}
+				} else {
+					var sBarCode = this.hform.HBarCode
+					try {
+						let res = await CommonUtils.doRequest2Sync({
+							url: '/MouldController/Get_CheckTypeByMouldBarCode_Json',
+							data: {
+								sBarCode: sBarCode,
+								HInterID: this.hform.HInterID,
+								HBillType: this.hform.HBillType,
+								HBillNo: this.hform.HBillNo,
+								HMaker: this.hform.HMaker,
+								HWhID: sHWHID,
+								HSPID: sHSPID,
+								HSCWhID: 0,
+								HSCSPID: 0,
+								HRedBlueFlag: this.hform.HRedBlueFlag,
+								HSourceBillNo: sSourceBillNo,
+								HSourceBillType: sSourceBillType,
+								HStockOrgID: this.hform.HStockOrgID,
+								HStockOutOrgID: this.hform.HStockOutOrgID,
+							},
+						})
+
+						if (!res) {
+							return
+						}
+
+						console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
+						this.hform.HBarCode = ''
+						if (res.data.count == 1) {
+							this.tabs = 1
+							this.DisBillEntryList()
+							this.showHMainSourceBillType = false
+							this.showHSourceBillNo = false
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+
+
+					} catch (err) {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					}
+				}
+			},
+			//浠撳簱鐩戝惉浜嬩欢
+			HWHNameChange(e) {
+                console.log('e: ',e);
+				for (var i = 0; i < this.HWHNameList.length; i++) {
+					if (this.HWHNameList[i]["HName"] == e) {
+						this.hform.HWHName = this.HWHNameList[i]["HName"]
+						this.hform.HWHID = this.HWHNameList[i].HItemID
+
+						this.showHStockPlaceName = this.HWHNameList[i].HIsStockMgr
+					}
+				}
+			},
+			HStockPlaceNameChange(e) {
+				for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+					if (this.HStockPlaceNameList[i]["HWhName"] == e) {
+						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+						this.hform.HStockPlaceName = this.HStockPlaceNameList[i]["HWhName"]
+					}
+				}
+			},
+			HScatterUserChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+						this.hform.HKeeperName = this.HEmpNameList[i].HName
+					}
+				}
+			},
+			HCollectUserChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
+						this.hform.HSecManagerName = this.HEmpNameList[i].HName
+					}
+				}
+			},
+			/* #region 浠撳簱浠撲綅鑾峰彇涓嬫媺妗� */
+			getHBaseList() {
+				CommonUtils.doRequest(
+					"/Web/GetWarehouseList_Json_MJ", {
+						Warehouse: "",
+						HOrgID: uni.getStorageSync('OrganizationID')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HWHNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHWHName[i] = data[i]["HName"]
+							}
+                            this.HWHNameChange(data[0]['HName'])
+						}
+					},
+				)
+				CommonUtils.doRequest(
+					"/WEBSController/GetStockPlaceList_Json", {
+						StockPlace: '',
+						HWhID: this.hform.HWHID,
+						HStockOrgID: uni.getStorageSync('OrganizationID')
+					},
+					(res) => {
+						let res1 = res.data
+						console.log(res1)
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HStockPlaceNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHStockPlaceName[i] = data[i]["HWhName"]
+							}
+						} 
+					},
+				)
+			},
+			/* #endregion */
+			getHEmpList() {
+				CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
+						Employee: '',
+						HGroupID: 0
+					},
+					(res) => {
+						if (res.data.count == 1) {
+							this.HEmpNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHEmpName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '浜哄憳鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			getHDeptList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Department/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HDeptNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			getHCusList() {
+				CommonUtils.doRequest(
+					"/Gy_Customer/list", {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HCusNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHCusName[i] = data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					}
+				)
+			},
+			getHSupList() {
+				CommonUtils.doRequest(
+					"/Gy_Supplier/list", {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HSuplierList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHSupplierName[i] = data[i].渚涘簲鍟嗗悕绉�
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					}
+				)
+			},
+			//閫夋嫨浣跨敤閮ㄩ棬
+			HDeptNameChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HDeptID = this.HDeptNameList[i].HItemID
+						this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
+					}
+				}
+			},
+			HDateChange(e) {
+				console.log(e.detail.value)
+				this.hform.HDate = e.detail.value
+			},
+			HSelectTypeChange(e) {
+				this.hform.TypeName = e;
+				this.hform.HSupName = ''; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
+				this.hform.HSupID = '';
+				uni.setStorageSync("typeName_3802", e);
+				if (e == '閮ㄩ棬') {
+					this.hform.HSupTypeID = 3;
+					uni.setStorageSync("typeID_3802", 3);
+					this.arrayHSelectType = this.arrayHDeptName;
+					this.HSelectTypeList = this.HDeptNameList;
+				} else if (e === '渚涘簲鍟�') {
+					this.hform.HSupTypeID = 1;
+					uni.setStorageSync("typeID_3802", 1);
+					this.arrayHSelectType = this.arrayHSupplierName;
+					this.HSelectTypeList = this.HSuplierList;
+				} else if (e === '瀹㈡埛') {
+					// 瀹㈡埛鏁版嵁 - 杩欓噷鐣欑┖锛屽悗缁坊鍔犺幏鍙栧鎴锋暟鎹殑閫昏緫
+					this.hform.HSupTypeID = 2;
+					uni.setStorageSync("typeID_3802", 2);
+					this.arrayHSelectType = this.arrayHCusName;
+					this.HSelectTypeList = this.HCusNameList;
+				} else {
+					uni.setStorageSync("typeID_3802", 0);
+					this.arrayHSelectType = [];
+					this.HSelectTypeList = [];
+				}
+			},
+			//鍣ㄥ叿淇℃伅
+			DisBillEntryList() {
+				CommonUtils.doRequest(
+					"/MouldController/GetMouldBillEntryTmpList_Json", {
+						HInterID: this.hform.HInterID,
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						console.log('鍣ㄥ叿', res.data)
+						var data = res.data.data
+						this.HMouldList = data;
+						if (res.data.count == 0) {
+							this.HMouldList = [];
+							this.hform.HMouldCount_B = ''
+							this.hform.HMouldID_B = ''
+							this.hform.HMouldName_B = ''
+
+						} else {
+							this.hform.HMouldCount_B = data[0].HQty
+							this.hform.HMouldID_B = data[0].HMouldID
+							this.hform.HMouldName_B = data[0].HMouldName
+							this.hform.HBarCode_B = data[0].HBarCode
+						}
+					},
+
+				)
+			},
+			goBack() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.redirectTo({
+								url: '/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList'
+							})
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			},
+			ifEdit() {
+				this.isEdit = true
+				this.hform.eventType = 'Modify'
+			},
+			//缂栬緫鍥炴樉
+			getEditData(linterid, HBillNo) {
+				//涓昏〃
+				var sWhere = " and hmainid='" + linterid + "'";
+				uni.request({
+					url: this.serverUrl + '/Sc_MouldProdOutBill/list_byPage',
+					data: {
+						sWhere: this.sWhere,
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization'),
+						page: 1,
+						size: 100
+					},
+					success: (res) => {
+						console.log(1, res.data.data[0]);
+						if (res.data.code == 1) {
+							var data = res.data.data[0]
+							this.btnType = 3
+							this.hform.HInterID = data.hmainid
+							this.hform.HBillNo = data.鍗曟嵁鍙�
+							// this.hform.HBarCode= data.鏉″舰鐮� 瑙嗗浘涓病鏈夎瀛楁
+							this.hform.HDeptID = data.HDeptID
+							this.hform.HDeptName = data.閮ㄩ棬
+							this.hform.HSecManagerName = data.棰嗘枡浜�
+							this.hform.HSecManagerID = data.hsecmanagerid
+							this.hform.HKeeperID = data.hkeeperid
+							this.hform.HKeeperName = data.鍙戞枡浜�
+							// this.hform.HRemark= data.琛ㄥご澶囨敞                        
+							this.hform.HDate = data.鏃ユ湡.substr(0, 10)
+
+							this.hform.HWHID = data.HWHID,
+								this.hform.HWHName = data.浠撳簱,
+								this.hform.HStockPlaceID = data.HSPID,
+								this.hform.HStockPlaceName = data.浠撲綅,
+
+								this.hform.HSupName = data.寰�鏉ュ崟浣�,
+								this.hform.HSupID = data.HSupID,
+								this.hform.TypeName = data.寰�鏉ョ被鍨嬪悕绉�,
+								this.hform.HSupTypeID = data.寰�鏉ョ被鍨�,
+
+								this.hform.HMouldID_B = data.hmaterid,
+								// this.hform.HMouldID_B=data.妯″叿浠g爜,
+								this.hform.HMouldName_B = data.妯″叿鍚嶇О,
+								// this.hform.HMouldModel=data.妯″叿瑙勬牸,
+								this.hform.HMouldCount_B = 1,
+								this.hform.HRedBlueFlag = data.绾㈣摑鍗曟爣璁� == '钃濆瓧' ? false : true,
+
+
+								this.hform.HStockOrgID = data.HStockOrgID,
+								this.hform.HStockOrgName = data.搴撳瓨缁勭粐,
+								// this.hform.HICMOEntryID=data.HICMOEntryID,
+								// this.hform.HProcExchBillNo=data.HProcExchBillNo,
+								// this.hform.HProcExchInterID=data.HProcExchInterID,
+								// this.hform.HProcExchEntryID=data.HProcExchEntryID,
+								// this.hform.HOrgID=data.HOrgID,
+
+								this.hform.HMaker = data.鍒跺崟浜�
+							//this.hform.HMakeDate= data.鍒跺崟鏃ユ湡
+							//this.hform.HUpDater= data.淇敼浜�
+							//this.hform.HUpDateDate= data.淇敼鏃ユ湡
+							// this.hform.HChecker= data.瀹℃牳浜�
+							// this.hform.HCheckDate= data.瀹℃牳鏃ユ湡                            
+							// this.hform.HDeleteMan= data.浣滃簾浜�
+							// this.hform.HDeleteDate= data.浣滃簾鏃ユ湡
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			async submit() {
+				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				if (!this.hform.HKeeperName) {
+					this.hform.HKeeperID = 0
+				}
+
+				if (!this.hform.HSecManagerName) {
+					this.hform.HSecManagerID = 0
+				}
+
+				if (!this.hform.HDeptName) {
+					this.hform.HDeptID = 0
+				}
+				if (!this.hform.HSupName) {
+					this.hform.HSupID = 0
+				}
+				if (this.hform.HInterID == 0 || !this.hform.HInterID) {
+					uni.showToast({
+						title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+						icon: 'none'
+					})
+				} else if (!this.hform.HBillNo) {
+					uni.showToast({
+						title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+						icon: 'none'
+					})
+				} else {
+					if (this.hform.HMouldID_B == 0 || this.hform.HMouldID_B == null) {
+						uni.showToast({
+							title: '娌℃湁鎵弿鍣ㄥ叿鏉$爜锛岃鍏堟壂鎻忓櫒鍏锋潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+							icon: 'none'
+						})
+					} else {
+						uni.showLoading({
+							title: '璇风◢鍊�'
+						})
+
+
+						let sMainStr = JSON.stringify(this.hform);
+						console.log("涓昏〃锛�" + sMainStr)
+						try {
+							let res = await CommonUtils.doRequest2Sync({
+								url: '/MouldController/set_SaveMouldRepairOutBill_Json',
+								method: 'POST',
+								data: {
+									oMain: sMainStr
+								},
+							})
+
+							if (!res) {
+								return
+							}
+
+							console.log(1, res);
+							uni.hideLoading()
+							if (res.data.count == 1) {
+								uni.showModal({
+									title: '鎻愮ず',
+									content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+									success: (res) => {
+										if (res.confirm) {
+											console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+											uni.redirectTo({
+												url: '/pages/MJGL/qijuweixiuchukudan/Sc_MouldRepairOutBill'
+											})
+										} else if (res.cancel) {
+											console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+											setTimeout(() => {
+												uni.navigateBack();
+											}, 50)
+										}
+									}
+								});
+							} else {
+								uni.showModal({
+									content: res.data.Message,
+									showCancel: false,
+									complete() {
+										uni.hideLoading()
+									}
+								})
+							}
+						} catch (err) {
+							console.warn(err);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触:' + err,
+								icon: 'none'
+							})
+						}
+					}
+				}
+			},
+			showBillList() {
+				this.$refs.billList.showPopup()
+			},
+			//閫夋嫨婧愬崟绫诲瀷
+			HMainSourceBillTypeChange(e) {
+				this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+
+				let index = this.arrayHMainSourceBillType.findIndex(e => e == this.HMainSourceBillType)
+				if (index != -1) {
+					this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[index]
+					// this.getHYDList()
+				}
+				console.log(this.hform.HMainSourceBillType)
+				uni.setStorageSync("billType_3802", this.hform.HMainSourceBillType);
+				uni.setStorageSync("billTypeName_3802", this.HMainSourceBillType);
+			},
+			//閫変腑婧愬崟
+			getHBarCodeData(HBarCode) {
+				uni.request({
+					url: this.serverUrl + '/MouldController/Get_SourceBarCode_ProdOut_Json',
+					data: {
+						HInterID: this.hform.HInterID,
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.hform.HBillType,
+						HSourceBillNo: HBarCode,
+						HSourceBillType: this.hform.HMainSourceBillType,
+						HMaker: this.hform.HMaker,
+						HStockOrgID: this.hform.HStockOrgID
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							var data = res.data.data[0]
+							console.log(2, data);
+
+							this.hform.HSourceBillNo = data.HSourceBillNo
+							this.showHMainSourceBillType = false
+							//榛樿闈炲婧愬崟
+							this.showHSourceBillNo = false
+							//璁剧疆寰�鏉ュ崟浣�
+							this.hform.HSupTypeID = data.HCorrespondentTypeID
+							this.hform.HSupID = data.HCorrespondentID
+							this.hform.HSupName = data.HCorrespondentName
+							if (data.HCorrespondentTypeID == 1) {
+								this.hform.TypeName = "渚涘簲鍟�"
+							} else if (data.HCorrespondentTypeID == 2) {
+								this.hform.TypeName = "瀹㈡埛"
+							} else {
+								this.hform.TypeName = "閮ㄩ棬"
+							}
+
+
+							this.tabs = 1
+							CommonUtils.playSound(1)
+							//鍏夋爣瀵瑰噯鏉$爜
+							this.refreshBarCodeState()
+							this.DisBillEntryList()
+						} else {
+							console.log('res.data.Message: ', res.data.Message);
+							CommonUtils.playSound(0)
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						CommonUtils.playSound(0)
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			async refreshBarCodeState() {
+				this.barCodeFocus = false
+				await this.$nextTick(() => {
+					this.barCodeFocus = true
+					this.hform.HBarCode = ""
+				})
+			},
+
+			delMater(item) {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕佸垹闄� "' + item.鍣ㄥ叿鍙� + '" 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+					success: (res) => {
+						if (res.confirm) {
+							uni.request({
+								url: this.serverUrl +
+									'/MouldController/set_DelMouldStockBillMain_Temp_Json',
+								data: {
+									HInterID: this.hform.HInterID,
+									HBarCode: item.HBarCode,
+									HBillType: this.hform.HBillType
+								},
+								success: (res) => {
+									if (res.data.count == 1) {
+										this.DisBillEntryList()
+									} else {
+										uni.showToast({
+											title: res.data.Message,
+											icon: 'none'
+										})
+									}
+								},
+								fail: (res) => {
+									console.log(res);
+									uni.showToast({
+										title: '鎺ュ彛璇锋眰澶辫触',
+										icon: 'none'
+									})
+								}
+							});
+						}
+					}
+				});
+			},
+			onLoad(e) {
+				console.log(e, this.userInfo)
+				console.log(getUserInfo().HEmpName)
+				if (e.linterid) {
+					this.btnType = 3
+					this.linterid = e.linterid
+					this.HBillNo = e.HBillNo
+					this.getEditData(e.linterid, e.HBillNo)
+				} else {
+					this.getNewData()
+				}
+				if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
+					this.HSourceBillType = "鎵嬪伐褰曞叆"; // 鏄剧ず鍚嶇О
+					this.hform.HSourceBillType = "-1"; // 瀵瑰簲鐨勫��
+				}
+				this.getHBaseList()
+				this.getHCusList()
+				this.getHEmpList()
+				this.getHDeptList()
+				this.getHSupList()
+
+				setTimeout(() => {
+					this.HSelectTypeChange(this.hform.TypeName)
+					//鍒濆鍖栧線鏉ュ崟浣�
+					if (this.hform.TypeName == '閮ㄩ棬') {
+						this.hform.HSupName = getUserInfo().HDept; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
+						this.hform.HSupID = getUserInfo().HDeptID;
+					} else if (this.hform.TypeName === '渚涘簲鍟�') {
+						this.hform.HSupName = getUserInfo().HSupName; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
+						this.hform.HSupID = getUserInfo().HSupID;
+					} else if (this.hform.TypeName === '瀹㈡埛') {
+
+					}
+					this.$nextTick(() => {
+						this.loadCache()
+					})
+
+				}, 300);
+				uni.$on('BillSelectComplete', (e) => {
+					console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
+					this.getHBarCodeData(e.HBillNo)
+					this.$refs.billList.exit()
+				})
+				//this.getHEmpList()
+			},
+			//閲嶈閫夋嫨婧愬崟蹇呴』娣诲姞杩欎釜鍚﹀垯鍑虹幇涓ラ噸bug
+			onUnload() {
+				uni.$off('BillSelectComplete')
+			},
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.form {
+		width: 668rpx;
+		margin: 20rpx auto;
+		padding-bottom: 240rpx;
+	}
+
+	.tab_area {
+		width: 100%;
+		height: 50rpx;
+	}
+
+	.other {
+		margin-top: 8rpx;
+		text-align: center;
+		font-size: 28rpx;
+		padding: 4rpx 18rpx;
+		color: #1890FF;
+	}
+
+	.tabs {
+		width: 100%;
+		display: flex;
+		border-bottom: 1px solid #ddd;
+		margin: 20rpx 0;
+
+		view {
+			width: 25%;
+			font-size: 30rpx;
+			color: #555;
+			text-align: center;
+			padding: 16rpx 0;
+		}
+
+		.on {
+			color: #3a78ff;
+			font-weight: bold;
+			border-bottom: 3px solid #3a78ff;
+		}
+	}
+
+	.form-item {
+		display: flex;
+		align-items: center;
+		font-size: 30rpx;
+		padding: 6rpx 0;
+		gap: 12rpx;
+
+		.title {
+			width: 208rpx;
+			flex-shrink: 0;
+
+			text {
+				color: red;
+				font-weight: bold;
+			}
+		}
+
+		.right {
+			// width: 450rpx;
+			flex: 1;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+			position: relative;
+			display: flex;
+
+			picker {
+				width: 100%;
+			}
+
+			.uni-combox {
+				width: 100%;
+			}
+		}
+
+		.righton {
+			// width: 450rpx;
+			flex: 1;
+			border-radius: 22rpx;
+			border: 1px solid #e4e4e4;
+			background-color: #e4e4e4;
+			position: relative;
+			display: flex;
+		}
+
+		input {
+			width: 100%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
+
+		textarea {
+			width: 98%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
+
+		.icon-wrapper {
+			background-color: #3A78FF;
+			border-radius: 100%;
+			width: 52rpx;
+			height: 52rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			flex-shrink: 0;
+
+			.uni-icons {
+				color: #fff !important;
+			}
+		}
+
+		.icon-wrapper[disabled] {
+			background-color: rgba(228, 228, 228, 1);
+			pointer-events: none;
+			touch-action: none;
+		}
+	}
+
+	.bottom-btn {
+		width: 100%;
+		box-sizing: border-box;
+		// height: 120rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background-color: #fff;
+		box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+		padding: 30rpx 40rpx 40rpx 40rpx;
+		display: flex;
+		flex-direction: row;
+		gap: 10rpx;
+
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
+
+		.btn-a {
+			background-color: #3A78FF;
+			color: #fff;
+		}
+
+		.btn-b {
+			background-color: #41a863;
+			color: #fff;
+		}
+
+		.btn-c {
+			background-color: #acacac;
+			color: #fff;
+			// position: absolute;
+			// right: 120rpx;
+		}
+
+		.btn-d {
+			background-color: #ff8901;
+			color: #fff;
+		}
+	}
+
+	.list {
+		width: 100%;
+
+		.card-detail {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			line-height: 120%;
+
+			.detail {
+				// width: 50%;
+				font-size: 26rpx;
+				margin-bottom: 12rpx;
+				color: #555;
+				margin-right: 20rpx;
+
+				text {
+					color: #999;
+					font-size: 26rpx;
+				}
+			}
+		}
+
+		.more {
+			color: #888;
+			font-size: 24rpx;
+			display: flex;
+			border-top: 1px solid #eee;
+			padding-top: 20rpx;
+
+			.part {
+				width: 50%;
+				text-align: center;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/qijuweixiuchukudan/Sc_MouldRepairOutBillList.vue b/pages/MJGL/qijuweixiuchukudan/Sc_MouldRepairOutBillList.vue
new file mode 100644
index 0000000..6c747a3
--- /dev/null
+++ b/pages/MJGL/qijuweixiuchukudan/Sc_MouldRepairOutBillList.vue
@@ -0,0 +1,484 @@
+<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="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+				<button class="btn-b" size="mini" type="default" @tap="creat">鏂板</button>
+				<button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+			</view>
+		</view>
+		
+		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+		
+		<view class="list" v-for="(item,index) in showList" :key="index">
+			<uni-card :title="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+				<view class="detail" v-if="item.妯″叿浠g爜">
+					<text>妯″叿浠g爜锛�</text>{{item.妯″叿浠g爜}}
+				</view>
+				<view class="detail" v-if="item.妯″叿鍚嶇О">
+					<text>妯″叿鍚嶇О锛�</text>{{item.妯″叿鍚嶇О}}
+				</view>
+				<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+					<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+				</view>
+				<view class="detail" v-if="item.鍙戞枡浜�">
+					<text>鍙戞枡浜猴細</text>{{item.鍙戞枡浜簘}
+				</view>
+				<view class="detail" v-if="item.棰嗘枡浜�">
+					<text>棰嗘枡浜猴細</text>{{item.棰嗘枡浜簘}
+				</view>
+				<view class="detail" v-if="item.閮ㄩ棬">
+					<text>閮ㄩ棬锛�</text>{{item.閮ㄩ棬}}
+				</view>
+				<view class="detail" v-if="item.寰�鏉ョ被鍨嬪悕绉�">
+					<text>寰�鏉ョ被鍨嬪悕绉帮細</text>{{item.寰�鏉ョ被鍨嬪悕绉皚}
+				</view>
+				<view class="detail" v-if="item.寰�鏉ュ崟浣�">
+					<text>寰�鏉ュ崟浣嶏細</text>{{item.寰�鏉ュ崟浣峿}
+				</view>
+				<view class="detail" v-if="item.鍣ㄥ叿浠撳簱">
+					<text>鍣ㄥ叿浠撳簱锛�</text>{{item.鍣ㄥ叿浠撳簱}}
+				</view>
+				<view class="detail" v-if="item.绾㈣摑鍗曟爣璁�">
+					<text>绾㈣摑鍗曟爣璁帮細</text>{{item.绾㈣摑鍗曟爣璁皚}
+				</view>
+				<view class="detail" v-if="item.寮�濮嬫棩鏈�">
+					<text>寮�濮嬫棩鏈燂細</text>{{item.寮�濮嬫棩鏈�.substr(0,10)}}
+				</view>
+				<view class="detail" v-if="item.缁撴潫鏃ユ湡">
+					<text>缁撴潫鏃ユ湡锛�</text>{{item.缁撴潫鏃ユ湡.substr(0,10)}}
+				</view>
+				<view class="detail" v-if="item.琛ㄤ綋澶囨敞">
+					<text>琛ㄤ綋澶囨敞锛�</text>{{item.琛ㄤ綋澶囨敞}}
+				</view>
+				<view class="detail" v-if="item.鍏抽棴绫诲瀷">
+					<text>鍏抽棴绫诲瀷锛�</text>{{item.鍏抽棴绫诲瀷}}
+				</view>
+
+				<view class="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 class="detail" v-if="item.浣滃簾浜�">
+						<text>浣滃簾浜猴細</text>{{item.浣滃簾浜簘}
+					</view>
+					<view class="detail" v-if="item.浣滃簾鏃ユ湡">
+						<text>浣滃簾鏃ユ湡锛�</text>{{item.浣滃簾鏃ユ湡.substr(0,10)}}
+					</view>
+					<view class="detail" v-if="item.婧愬崟鍗曞彿">
+						<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+					</view>
+					<view class="detail" v-if="item.婧愬崟绫诲瀷">
+						<text>婧愬崟绫诲瀷锛�</text>{{item.婧愬崟绫诲瀷}}
+					</view>
+					<view class="detail" v-if="item.hbilltype">
+						<text>hbilltype锛�</text>{{item.hbilltype}}
+					</view>
+					<view class="detail" v-if="item.鎽樿">
+						<text>鎽樿锛�</text>{{item.鎽樿}}
+					</view>
+				</view>
+				<view class="more" v-if="showDetail == index && operations != index">
+					<view class="part" style="border-right: 1px solid #eee;">
+						<uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+					</view>
+					<view class="part" @tap.stop="operations = operations==index?-1:index">
+						<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+					</view>
+				</view>
+				<view class="more" v-if="showDetail != index && operations != index">
+					<view class="part" style="border-right: 1px solid #eee;">
+						<uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+					</view>
+					<view class="part" @tap.stop="operations = operations==index?-1:index">
+						<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+					</view>
+				</view>
+				
+				<view class="op" v-if="operations == index">
+					<!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+					<!-- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button> -->
+					<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+				</view>
+			</uni-card>
+		</view>
+		
+		<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+		<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
+		<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+	</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:[],
+				showList:[],
+				showDetail:-1,
+				operations:-1,
+				
+				page:1,
+				size:100
+	        }
+	    },
+		onLoad() {
+			this.getList()
+			console.log(this.userInfo,uni.getStorageSync('HUserName'))
+		},
+		onReachBottom: function() {
+			this.page++
+			setTimeout(() => {
+				this.showList = this.showList.concat(this.getPage(this.page,this.listData))
+			}, 100)
+		},
+		onPullDownRefresh: function() {
+			this.clear()
+			setTimeout(()=>{
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+	    methods: {
+			getPage(page,list){
+				let sindex = (parseInt(page) - 1) * 20
+				let eindex = parseInt(page) * 20
+				let newList = list.slice(sindex,eindex)
+				return newList
+			},
+			getList(){
+				console.log(this.sWhere)
+				uni.showLoading({
+					title:'鍔犺浇涓�...'
+				})
+				uni.request({
+				    url: this.serverUrl + '/Sc_MouldRepairOutBill/Get_MouldRepairOutBillList',
+					data:{ 
+						sWhere: this.sWhere,
+						user: uni.getStorageSync('HUserName'),
+						Organization:uni.getStorageSync('Organization'),
+						
+					},
+				    success: (res) => {
+						console.log(1,uni.getStorageSync('Organization'));
+				        console.log(1,res);
+						if(res.data.code ==1){
+							this.listData = res.data.data
+							this.showList = this.getPage(this.page,this.listData)
+							
+							setTimeout(()=>{
+							     uni.hideLoading()
+							}, 1000)
+						}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 = ''
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				console.log(this.hform)
+				if (this.hform.HBillNo) {
+				    this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+				}
+				if (this.hform.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()
+			},
+			creat(){
+				uni.navigateTo({
+					url:'/pages/MJGL/qijuweixiuchukudan/Sc_MouldRepairOutBill'
+				})
+			},
+			clear(){
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				this.sWhere = ''
+				this.showDetail = -1,
+				this.operations = -1,
+				this.hform = {
+					HBillNo:'',
+					HCreateBy:'',
+					BenginHCreateDate:'',
+					EndHCreateDate:'',
+				}
+				this.getList()
+			},
+			//TODO   瀛愯〃鍒楄〃
+			// toSon(item){
+			// 	uni.navigateTo({
+			// 		url:'/pages/baoyangjilu/Sb_EquipMaintainRuleList_son?HInterID=' + item.hmainid 
+			// 		+ '&璁惧鍚嶇О=' + item.璁惧鍚嶇О 
+			// 		+ '&璁惧浠g爜=' + item.璁惧浠g爜,
+			// 	})
+			// },
+			
+			//缂栬緫
+			edit(item){
+				console.log(item)
+				uni.navigateTo({
+					url:'/pages/MJGL/qijuweixiuchukudan/Sc_MouldRepairOutBill?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+				})
+			},
+			//鍒犻櫎
+			del(item){
+				console.log(item)
+				uni.showModal({
+				    title: '鎻愮ず',
+				    content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
+				    success: (res) => {
+				        if (res.confirm) {
+				            console.log('鐢ㄦ埛鐐瑰嚮纭畾',);
+							uni.request({
+							    url: this.serverUrl + '/Sc_MouldScrapOutHouseBill/DeltetMouldScrapOutHouseBill',
+								data:{ 
+									HInterID: item.hmainid,
+									user: uni.getStorageSync('HUserName')
+								},
+							    success: (res) => {
+							        console.log(1,res);
+									if(res.data.count == 1){
+										this.clear()
+									}
+									uni.showToast({
+										title:res.data.Message,
+										icon:'none'
+									})
+								},
+								fail: (res) => {
+									console.log(res);
+									uni.showToast({
+										title:'鎺ュ彛璇锋眰澶辫触',
+										icon:'none'
+									})
+								},
+							});
+				        } else if (res.cancel) {
+				            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+				        }
+				    }
+				});
+			},
+	    }
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form{
+		width: 640rpx;
+		margin: 20rpx auto;
+	}
+    .form-item{
+		display: flex;
+		align-items: center;
+		font-size: 28rpx;
+		padding: 6rpx 0;
+		.title{
+			width: 180rpx;
+			text{
+				color: red;
+				font-weight: bold;
+			}
+		}
+		.right{
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+		}
+		.righton{
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #e4e4e4;
+			background-color: #e4e4e4;
+		}
+		input{
+			width: 100%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
+	}
+	.buttons{
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		margin-top: 20rpx;
+		button{
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
+		.btn-a{
+			background-color: #acacac;
+			color: #fff;
+		}
+		.btn-b{
+			background-color: #41a863;
+			color: #fff;
+		}
+		.btn-c{
+			background-color: #3a78ff;
+			color: #fff;
+		}
+	}
+	
+	.list{
+		width: 100%;
+		.card-detail{
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			line-height: 120%;
+			.detail{
+				// width: 50%;
+				font-size: 26rpx;
+				margin-bottom: 12rpx;
+				color: #555;
+				margin-right: 20rpx;
+				text{
+					color: #999;
+					font-size: 26rpx;
+				}
+			}
+		}
+		.more{
+			color: #888;
+			font-size: 24rpx;
+			display: flex;
+			border-top: 1px solid #eee;
+			padding-top: 20rpx;
+			.part{
+				width: 50%;
+				text-align: center;
+			}
+		}
+		.op{
+			display: flex;
+			justify-content: space-around;
+			margin-top: 20rpx;
+			button{
+				padding: 0;
+				width: 130rpx;
+				font-size: 25rpx;
+			}
+			.op1{
+				border: 1px solid #41a863;
+				color: #41a863;
+			}
+			.op2{
+				border: 1px solid #d98d00;
+				color: #d98d00;
+			}
+			.op3{
+				border: 1px solid #3a78ff;
+				color: #3a78ff;
+			}
+			.op4{
+				border: 1px solid #da0000;
+				color: #da0000;
+			}
+			.op5{
+				border: 1px solid #888;
+				color: #888;
+			}
+		}
+	}
+
+</style>
diff --git a/pages/MJGL/qijuweixiurukudan/Sc_MouldRepairInBill.vue b/pages/MJGL/qijuweixiurukudan/Sc_MouldRepairInBill.vue
new file mode 100644
index 0000000..5ff1c76
--- /dev/null
+++ b/pages/MJGL/qijuweixiurukudan/Sc_MouldRepairInBill.vue
@@ -0,0 +1,1295 @@
+<template>
+	<view>
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鏉$爜</view>
+				<view class="right" style="width: 350rpx;">
+					<input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜"
+						@confirm="getCode(hform.HBarCode)" />
+				</view>
+				<uni-icons type="scan"
+					style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+					size="20" @click="toScanCode"></uni-icons>
+			</view>
+			<view class="form-item" @click="searchModule">
+				<view class="title">妯″叿</view>
+				<view class="righton" style="width: 350rpx;">
+					<input placeholder="璇烽�夋嫨妯″叿" />
+				</view>
+				<uni-icons type="search"
+					style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+					size="20"></uni-icons>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>浠撳簱:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+						@input="HWHNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>浠撲綅:</view>
+				<view class="right" v-show="showHStockPlaceName">
+					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+						v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
+				</view>
+				<view class="righton" v-show="!showHStockPlaceName">
+					<input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="涓嶅彲鎿嶄綔" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>鍙戝嚭浜�:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戝嚭浜�" v-model="hform.HKeeperName"
+						@input="HScatterUserChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>棰嗙敤浜�:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)棰嗙敤浜�" v-model="hform.HSecManagerName"
+						@input="HCollectUserChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>閮ㄩ棬:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+						@input="HDeptNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">寰�鏉ョ被鍨�:</view>
+				<view class="right" v-show="showHSourceBillNo">
+					<uni-combox :candidates="['渚涘簲鍟�','瀹㈡埛','閮ㄩ棬']" placeholder="璇烽�夋嫨绫诲瀷" v-model="hform.TypeName"
+						@input="HSelectTypeChange"></uni-combox>
+				</view>
+				<view class="right" v-show="!showHSourceBillNo">
+					<input name="TypeName" disabled v-model="hform.TypeName" placeholder="" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">寰�鏉ュ崟浣�:</view>
+				<view class="right" v-show="showHSourceBillNo">
+					<uni-combox :candidates="arrayHSelectType" placeholder="璇烽�夋嫨" v-model="hform.HSupName"
+						@input="HSupNameChange"></uni-combox>
+				</view>
+				<view class="right" v-show="!showHSourceBillNo">
+					<input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
+				</view>
+			</view>
+			<view class="tabs">
+				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">琛ㄥご淇℃伅</view>
+				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">妯″叿淇℃伅</view>
+			</view>
+			<view v-if="tabs == 0">
+				<view class="form-item">
+					<view class="title">鏃ユ湡:</view>
+					<view class="right">
+						<picker mode="date" v-model="hform.HDate" @change="HDateChange">
+							<view class="picker-overlay"></view>
+							<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+						</picker>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">婧愬崟绫诲瀷:</view>
+					<view class="right" v-show="showHMainSourceBillType">
+						<picker :range="arrayHMainSourceBillType" @change="HMainSourceBillTypeChange">
+							<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+								placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+							<view class="picker-overlay"></view>
+						</picker>
+					</view>
+					<view class="righton" v-show="!showHMainSourceBillType">
+						<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+							placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+					</view>
+				</view>
+				<view class="form-item" v-if="HMainSourceBillType==-1">
+					<view class="title">婧愬崟鍗曞彿:</view>
+					<view class="right" v-show="showHSourceBillNo">
+						<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
+                            v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
+						<input :focus="HSourceBillNoFocus" type="text" name="HSourceBillNo"
+							v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+
+					</view>
+					<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+						<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+					</view>
+
+					<view class="righton" v-show="!showHSourceBillNo">
+						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+					</view>
+					<!-- <view class="right" v-show="showHSourceBillNo">
+                        <uni-combox ref="uniComboxSourceBill" :isFocus="HSourceBillNoFocus"
+                            :confirm-call="onSourceBillBlurHandler" v-if="reHSourceBillNo"
+                            :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" v-model="hform.HSourceBillNo"
+                            @input="HSourceBillNoChange"></uni-combox>
+                    </view>
+                    <view class="righton" v-show="!showHSourceBillNo">
+                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+                    </view> -->
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="righton">
+						<input name="HMaker" disabled v-model="hform.HMaker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input name="HBillNo" disabled v-model="hform.HBillNo" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁ID:</view>
+					<view class="righton">
+						<input name="HInterID" disabled v-model="hform.HInterID" />
+					</view>
+				</view>
+			</view>
+			<view v-if="tabs==1">
+				<view class="list" v-for="(item,index) in HMouldList" :key="index">
+					<uni-card :title="item.鍣ㄥ叿鍚嶇О" style="margin: 10px;" @tap="delMater(item, $event)">
+						<!-- 鍣ㄥ叿浠g爜浣滀负鍙偣鍑婚摼鎺� -->
+						<view class="card-header">
+							<text class="link-text">鍣ㄥ叿鍙凤細{{item.鍣ㄥ叿鍙穧}</text>
+						</view>
+
+						<view class="card-detail">
+							<view class="detail">
+								<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+							</view>
+							<view class="detail">
+								<text>妯″叿鏉$爜锛�</text>{{item.鍣ㄥ叿鏉$爜}}
+							</view>
+						</view>
+					</uni-card>
+				</view>
+				<view class="over" v-if="HMouldList.length == 0">鏆傛棤鏁版嵁</view>
+			</view>
+			<view class="bottom-btn">
+				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+				<button v-if="btnType == 1 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+				<!-- <button v-if="btnType != 1 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button> -->
+				<button v-if="btnType != 1 " class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			</view>
+		</view>
+		<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
+			:HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
+		<BillListPopupMouldVue @BillSelectComplete="MouldBillHandler" ref="billListMould"></BillListPopupMouldVue>
+	</view>
+</template>
+
+<script>
+	import getDateTime from '@/utils/getdateTime.js';
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
+	import {
+		CommonUtils
+	} from '@/utils/common';
+	import BillListPopupVue from '../../../components/BillListPopup/BillListPopup.vue';
+	import BillListPopupMouldVue from '../../../components/BillListPopup/BillListPopup_Mould.vue';
+	export default {
+		data() {
+			return {
+				HSourceBillNoFocus: false,
+				barCodeFocus: true, //鏉$爜鍏夋爣
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				tabs: 0,
+				btnType: 1, //1鏂板锛�3淇敼
+				linterid: '',
+				arrayHEmpName: [],
+				HEmpNameList: [],
+				arrayHWHName: [], //浠撳簱
+				HWHNameList: [],
+				arrayHStockPlaceName: [], //浠撲綅
+				HStockPlaceNameList: [],
+				arrayHDeptName: [], //閮ㄩ棬
+				HDeptNameList: [],
+				arrayHCusName: [], //瀹㈡埛
+				HCusNameList: [],
+				arrayHSupplierName: [], //渚涘簲鍟�
+				HSuplierList: [],
+				linterid: '',
+				HBillNo: '',
+				arrayHSelectType: [], // 寰�鏉ュ崟浣嶄笅鎷夊垪琛�
+				HSelectTypeList: [], // 寰�鏉ュ崟浣嶅畬鏁存暟鎹垪琛�
+				showHStockPlaceName: true,
+				HMouldList: [],
+				isEdit: false,
+
+				showHMainSourceBillType: true,
+				showHSourceBillNo: true,
+				HMainSourceBillType: uni.getStorageSync('billTypeName_3802') ? uni.getStorageSync('billTypeName_3802') :
+					'棰嗙敤鐢宠鍗�',
+				arrayHMainSourceBillType: [ '鎵嬪伐褰曞叆'],
+				arrayHMainSourceBillValue: [ '-1'],
+
+				hform: {
+					HBarCode: '',
+					HInterID: '',
+					HBillType: 3826,
+					HWHName: getUserInfo().HWhName,
+					HWHID: getUserInfo().HWhID,
+					HStockPlaceName: getUserInfo().HSPName,
+					HStockPlaceID: getUserInfo().HSPID,
+					HKeeperName: getUserInfo().HEmpName,
+					HKeeperID: getUserInfo().HEmpID, //鍙戞枡浜�
+					HSecManagerName: getUserInfo().HEmpName,
+					HSecManagerID: getUserInfo().HEmpID, //棰嗘枡浜�
+					HDeptName: getUserInfo().HDeptName,
+					HDeptID: getUserInfo().HDeptID,
+					//婧愬崟淇℃伅
+					HMainSourceBillType: uni.getStorageSync('billType_3802') ? uni.getStorageSync('billType_3802') : 3826,
+					HSourceBillNo: '', //CGDD000200
+					//寰�鏉ョ被鍨�
+					TypeName: uni.getStorageSync('typeName_3802'),
+					HSupName: '', // 寰�鏉ュ崟浣嶉�変腑鐨勫��
+					HSupID: '', // 寰�鏉ュ崟浣嶅搴旂殑ID
+					HSupTypeID: uni.getStorageSync('typeID_3802') ? uni.getStorageSync('typeID_3802') : 0,
+					HDate: getDateTime.dateTimeStr('y-m-d'),
+					HMaker: uni.getStorageSync('HUserName'),
+
+					HRedBlueFlag: 'false',
+					HStockOrgName: uni.getStorageSync('Organization'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+					HStockOutOrgID: uni.getStorageSync('OrganizationID'),
+					HBarCode_B: '',
+					HMouldName_B: '',
+					HMouldID_B: '',
+					HMouldCount_B: '',
+				}
+			}
+		},
+		components: {
+			BillListPopupVue,
+			BillListPopupMouldVue
+		},
+		methods: {
+			searchModule() {
+				this.$refs['billListMould'].showPopup()
+			},
+			MouldBillHandler(mould) {
+				if (!mould.enableMultiSourceBill) {
+					let val = mould.val[0]
+					this.hform.HBarCode = val['鏉$爜缂栧彿']
+					this.getCode(this.hform.HBarCode)
+				}
+				this.$refs['billListMould'].exit()
+			},
+			HSupNameChange(e) {
+				let index = this.arrayHSelectType.findIndex(el => el == e)
+				let HSupInfo = this.HSelectTypeList[index]
+				console.log('HSupInfo: ', HSupInfo);
+
+				this.hform.HSupID = HSupInfo.HItemID
+				this.hform.HSupName = HSupInfo['閮ㄩ棬鍚嶇О'] || HSupInfo['瀹㈡埛鍚嶇О'] || HSupInfo['渚涘簲鍟嗗悕绉�']
+
+				const pages = getCurrentPages()
+				// 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+				const currentPage = pages[pages.length - 1]
+				// 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
+				uni.setStorageSync(`${currentPage.route.split("/").pop()}_${this.hform.HBillType}`, {
+					HSupName: HSupInfo['閮ㄩ棬鍚嶇О'] || HSupInfo['瀹㈡埛鍚嶇О'] || HSupInfo['渚涘簲鍟嗗悕绉�'],
+					HSupID: HSupInfo.HItemID
+				})
+			},
+			loadCache() {
+				const pages = getCurrentPages()
+				// 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+				const currentPage = pages[pages.length - 1]
+				// 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
+				let cache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_${this.hform.HBillType}`)
+
+				this.hform.HSupID = cache.HSupID
+				this.hform.HSupName = cache.HSupName
+			},
+			//鎵爜
+			toScanCode() {
+				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+				mpaasScanModule.mpaasScan({
+					'hideAlbum': true,
+					'timeoutInterval': '10', //瓒呮椂鏃堕棿
+					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+				}, (ret) => {
+					console.log(ret.resp_result)
+					if (this.hform.HBarCode == '*') {
+						this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+					} else {
+						this.hform.HBarCode = ret.resp_result
+					}
+
+					this.getCode(this.hform.HBarCode)
+				})
+			},
+			getNewData() {
+				CommonUtils.doRequest("/WEBSController/GetMaxBillNoAndID_Json", {
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						let res1 = res.data;
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.hform.HInterID = data[0].HInterID
+							this.hform.HBillNo = data[0].HBillNo
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					})
+			},
+			async getCode(HBarCode) {
+				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				var sHWHID = this.hform.HWHID
+				var sHSPID = this.hform.HStockPlaceID
+				var sOldBarCode = HBarCode;
+				var HDeleteFlag = sOldBarCode.substring(0, 1); //鍙栨潯鐮佺涓�涓瓧绗�
+				var sBarCode = sOldBarCode.slice(1); //鑾峰彇绗竴涓瓧绗︿互澶栫殑鍏ㄩ儴瀛楃
+				var sSourceBillNo = this.hform.HSourceBillNo
+				var sSourceBillType = this.hform.HMainSourceBillType
+				if (sSourceBillType != -1 && sSourceBillNo == "") {
+
+					uni.showToast({
+						title: "璇峰厛閫夋嫨婧愬崟",
+						icon: 'none'
+					})
+					return
+				}
+				if (HDeleteFlag == '*') {
+					if (sBarCode == "") {
+						uni.showToast({
+							title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
+							icon: 'none'
+						});
+					} else {
+						try {
+							let res = await CommonUtils.doRequest2Sync({
+								url: '/MouldController/set_DelMouldStockBillMain_Temp_Json',
+								data: {
+									HInterID: this.hform.HInterID,
+									HBillType: this.hform.HBillType,
+									HBarCode: sBarCode
+								},
+							})
+
+							if (!res) {
+								return
+							}
+
+							console.log('鍒犻櫎鏉$爜', res.data);
+							this.hform.HBarCode = '';
+							if (res.data.count == 1) {
+								this.hform.HQty = ''
+							} else {
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+
+
+						} catch (err) {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					}
+				} else {
+					var sBarCode = this.hform.HBarCode
+					try {
+						let res = await CommonUtils.doRequest2Sync({
+							url: '/MouldController/Get_CheckTypeByMouldBarCode_Json',
+							data: {
+								sBarCode: sBarCode,
+								HInterID: this.hform.HInterID,
+								HBillType: this.hform.HBillType,
+								HBillNo: this.hform.HBillNo,
+								HMaker: this.hform.HMaker,
+								HWhID: sHWHID,
+								HSPID: sHSPID,
+								HSCWhID: 0,
+								HSCSPID: 0,
+								HRedBlueFlag: this.hform.HRedBlueFlag,
+								HSourceBillNo: sSourceBillNo,
+								HSourceBillType: sSourceBillType,
+								HStockOrgID: this.hform.HStockOrgID,
+								HStockOutOrgID: this.hform.HStockOutOrgID,
+							},
+						})
+
+						if (!res) {
+							return
+						}
+
+						console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
+						this.hform.HBarCode = ''
+						if (res.data.count == 1) {
+							this.tabs = 1
+							this.DisBillEntryList()
+							this.showHMainSourceBillType = false
+							this.showHSourceBillNo = false
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+
+
+					} catch (err) {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					}
+				}
+			},
+			//浠撳簱鐩戝惉浜嬩欢
+			HWHNameChange(e) {
+                console.log('e: ',e);
+				for (var i = 0; i < this.HWHNameList.length; i++) {
+					if (this.HWHNameList[i]["HName"] == e) {
+						this.hform.HWHName = this.HWHNameList[i]["HName"]
+						this.hform.HWHID = this.HWHNameList[i].HItemID
+
+						this.showHStockPlaceName = this.HWHNameList[i].HIsStockMgr
+					}
+				}
+			},
+			HStockPlaceNameChange(e) {
+				for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+					if (this.HStockPlaceNameList[i]["HWhName"] == e) {
+						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+						this.hform.HStockPlaceName = this.HStockPlaceNameList[i]["HWhName"]
+					}
+				}
+			},
+			HScatterUserChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+						this.hform.HKeeperName = this.HEmpNameList[i].HName
+					}
+				}
+			},
+			HCollectUserChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
+						this.hform.HSecManagerName = this.HEmpNameList[i].HName
+					}
+				}
+			},
+			/* #region 浠撳簱浠撲綅鑾峰彇涓嬫媺妗� */
+			getHBaseList() {
+				CommonUtils.doRequest(
+					"/Web/GetWarehouseList_Json_MJ", {
+						Warehouse: "",
+						HOrgID: uni.getStorageSync('OrganizationID')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HWHNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHWHName[i] = data[i]["HName"]
+							}
+                            this.HWHNameChange(data[0]['HName'])
+						}
+					},
+				)
+				CommonUtils.doRequest(
+					"/WEBSController/GetStockPlaceList_Json", {
+						StockPlace: '',
+						HWhID: this.hform.HWHID,
+						HStockOrgID: uni.getStorageSync('OrganizationID')
+					},
+					(res) => {
+						let res1 = res.data
+						console.log(res1)
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HStockPlaceNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHStockPlaceName[i] = data[i]["HWhName"]
+							}
+						} 
+					},
+				)
+			},
+			/* #endregion */
+			getHEmpList() {
+				CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
+						Employee: '',
+						HGroupID: 0
+					},
+					(res) => {
+						if (res.data.count == 1) {
+							this.HEmpNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHEmpName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '浜哄憳鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			getHDeptList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Department/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HDeptNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			getHCusList() {
+				CommonUtils.doRequest(
+					"/Gy_Customer/list", {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HCusNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHCusName[i] = data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					}
+				)
+			},
+			getHSupList() {
+				CommonUtils.doRequest(
+					"/Gy_Supplier/list", {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HSuplierList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHSupplierName[i] = data[i].渚涘簲鍟嗗悕绉�
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					}
+				)
+			},
+			//閫夋嫨浣跨敤閮ㄩ棬
+			HDeptNameChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HDeptID = this.HDeptNameList[i].HItemID
+						this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
+					}
+				}
+			},
+			HDateChange(e) {
+				console.log(e.detail.value)
+				this.hform.HDate = e.detail.value
+			},
+			HSelectTypeChange(e) {
+				this.hform.TypeName = e;
+				this.hform.HSupName = ''; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
+				this.hform.HSupID = '';
+				uni.setStorageSync("typeName_3802", e);
+				if (e == '閮ㄩ棬') {
+					this.hform.HSupTypeID = 3;
+					uni.setStorageSync("typeID_3802", 3);
+					this.arrayHSelectType = this.arrayHDeptName;
+					this.HSelectTypeList = this.HDeptNameList;
+				} else if (e === '渚涘簲鍟�') {
+					this.hform.HSupTypeID = 1;
+					uni.setStorageSync("typeID_3802", 1);
+					this.arrayHSelectType = this.arrayHSupplierName;
+					this.HSelectTypeList = this.HSuplierList;
+				} else if (e === '瀹㈡埛') {
+					// 瀹㈡埛鏁版嵁 - 杩欓噷鐣欑┖锛屽悗缁坊鍔犺幏鍙栧鎴锋暟鎹殑閫昏緫
+					this.hform.HSupTypeID = 2;
+					uni.setStorageSync("typeID_3802", 2);
+					this.arrayHSelectType = this.arrayHCusName;
+					this.HSelectTypeList = this.HCusNameList;
+				} else {
+					uni.setStorageSync("typeID_3802", 0);
+					this.arrayHSelectType = [];
+					this.HSelectTypeList = [];
+				}
+			},
+			//鍣ㄥ叿淇℃伅
+			DisBillEntryList() {
+				CommonUtils.doRequest(
+					"/MouldController/GetMouldBillEntryTmpList_Json", {
+						HInterID: this.hform.HInterID,
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						console.log('鍣ㄥ叿', res.data)
+						var data = res.data.data
+						this.HMouldList = data;
+						if (res.data.count == 0) {
+							this.HMouldList = [];
+							this.hform.HMouldCount_B = ''
+							this.hform.HMouldID_B = ''
+							this.hform.HMouldName_B = ''
+
+						} else {
+							this.hform.HMouldCount_B = data[0].HQty
+							this.hform.HMouldID_B = data[0].HMouldID
+							this.hform.HMouldName_B = data[0].HMouldName
+							this.hform.HBarCode_B = data[0].HBarCode
+						}
+					},
+
+				)
+			},
+			goBack() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.redirectTo({
+								url: '/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList'
+							})
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			},
+			ifEdit() {
+				this.isEdit = true
+				this.hform.eventType = 'Modify'
+			},
+			//缂栬緫鍥炴樉
+			getEditData(linterid, HBillNo) {
+				//涓昏〃
+				var sWhere = " and hmainid='" + linterid + "'";
+				uni.request({
+					url: this.serverUrl + '/Sc_MouldProdOutBill/list_byPage',
+					data: {
+						sWhere: this.sWhere,
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization'),
+						page: 1,
+						size: 100
+					},
+					success: (res) => {
+						console.log(1, res.data.data[0]);
+						if (res.data.code == 1) {
+							var data = res.data.data[0]
+							this.btnType = 3
+							this.hform.HInterID = data.hmainid
+							this.hform.HBillNo = data.鍗曟嵁鍙�
+							// this.hform.HBarCode= data.鏉″舰鐮� 瑙嗗浘涓病鏈夎瀛楁
+							this.hform.HDeptID = data.HDeptID
+							this.hform.HDeptName = data.閮ㄩ棬
+							this.hform.HSecManagerName = data.棰嗘枡浜�
+							this.hform.HSecManagerID = data.hsecmanagerid
+							this.hform.HKeeperID = data.hkeeperid
+							this.hform.HKeeperName = data.鍙戞枡浜�
+							// this.hform.HRemark= data.琛ㄥご澶囨敞                        
+							this.hform.HDate = data.鏃ユ湡.substr(0, 10)
+
+							this.hform.HWHID = data.HWHID,
+								this.hform.HWHName = data.浠撳簱,
+								this.hform.HStockPlaceID = data.HSPID,
+								this.hform.HStockPlaceName = data.浠撲綅,
+
+								this.hform.HSupName = data.寰�鏉ュ崟浣�,
+								this.hform.HSupID = data.HSupID,
+								this.hform.TypeName = data.寰�鏉ョ被鍨嬪悕绉�,
+								this.hform.HSupTypeID = data.寰�鏉ョ被鍨�,
+
+								this.hform.HMouldID_B = data.hmaterid,
+								// this.hform.HMouldID_B=data.妯″叿浠g爜,
+								this.hform.HMouldName_B = data.妯″叿鍚嶇О,
+								// this.hform.HMouldModel=data.妯″叿瑙勬牸,
+								this.hform.HMouldCount_B = 1,
+								this.hform.HRedBlueFlag = data.绾㈣摑鍗曟爣璁� == '钃濆瓧' ? false : true,
+
+
+								this.hform.HStockOrgID = data.HStockOrgID,
+								this.hform.HStockOrgName = data.搴撳瓨缁勭粐,
+								// this.hform.HICMOEntryID=data.HICMOEntryID,
+								// this.hform.HProcExchBillNo=data.HProcExchBillNo,
+								// this.hform.HProcExchInterID=data.HProcExchInterID,
+								// this.hform.HProcExchEntryID=data.HProcExchEntryID,
+								// this.hform.HOrgID=data.HOrgID,
+
+								this.hform.HMaker = data.鍒跺崟浜�
+							//this.hform.HMakeDate= data.鍒跺崟鏃ユ湡
+							//this.hform.HUpDater= data.淇敼浜�
+							//this.hform.HUpDateDate= data.淇敼鏃ユ湡
+							// this.hform.HChecker= data.瀹℃牳浜�
+							// this.hform.HCheckDate= data.瀹℃牳鏃ユ湡                            
+							// this.hform.HDeleteMan= data.浣滃簾浜�
+							// this.hform.HDeleteDate= data.浣滃簾鏃ユ湡
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			async submit() {
+				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				if (!this.hform.HKeeperName) {
+					this.hform.HKeeperID = 0
+				}
+
+				if (!this.hform.HSecManagerName) {
+					this.hform.HSecManagerID = 0
+				}
+
+				if (!this.hform.HDeptName) {
+					this.hform.HDeptID = 0
+				}
+				if (!this.hform.HSupName) {
+					this.hform.HSupID = 0
+				}
+				if (this.hform.HInterID == 0 || !this.hform.HInterID) {
+					uni.showToast({
+						title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+						icon: 'none'
+					})
+				} else if (!this.hform.HBillNo) {
+					uni.showToast({
+						title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+						icon: 'none'
+					})
+				} else {
+					if (this.hform.HMouldID_B == 0 || this.hform.HMouldID_B == null) {
+						uni.showToast({
+							title: '娌℃湁鎵弿鍣ㄥ叿鏉$爜锛岃鍏堟壂鎻忓櫒鍏锋潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+							icon: 'none'
+						})
+					} else {
+						uni.showLoading({
+							title: '璇风◢鍊�'
+						})
+
+
+						let sMainStr = JSON.stringify(this.hform);
+						console.log("涓昏〃锛�" + sMainStr)
+						try {
+							let res = await CommonUtils.doRequest2Sync({
+								url: '/MouldController/set_SaveMouldRepairInBill_Json',
+								method: 'POST',
+								data: {
+									oMain: sMainStr
+								},
+							})
+
+							if (!res) {
+								return
+							}
+
+							console.log(1, res);
+							uni.hideLoading()
+							if (res.data.count == 1) {
+								uni.showModal({
+									title: '鎻愮ず',
+									content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+									success: (res) => {
+										if (res.confirm) {
+											console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+											uni.redirectTo({
+												url: '/pages/MJGL/qijuweixiurukudan/Sc_MouldRepairInBill'
+											})
+										} else if (res.cancel) {
+											console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+											setTimeout(() => {
+												uni.navigateBack();
+											}, 50)
+										}
+									}
+								});
+							} else {
+								uni.showModal({
+									content: res.data.Message,
+									showCancel: false,
+									complete() {
+										uni.hideLoading()
+									}
+								})
+							}
+						} catch (err) {
+							console.warn(err);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触:' + err,
+								icon: 'none'
+							})
+						}
+					}
+				}
+			},
+			showBillList() {
+				this.$refs.billList.showPopup()
+			},
+			//閫夋嫨婧愬崟绫诲瀷
+			HMainSourceBillTypeChange(e) {
+				this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+
+				let index = this.arrayHMainSourceBillType.findIndex(e => e == this.HMainSourceBillType)
+				if (index != -1) {
+					this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[index]
+					// this.getHYDList()
+				}
+				console.log(this.hform.HMainSourceBillType)
+				uni.setStorageSync("billType_3802", this.hform.HMainSourceBillType);
+				uni.setStorageSync("billTypeName_3802", this.HMainSourceBillType);
+			},
+			//閫変腑婧愬崟
+			getHBarCodeData(HBarCode) {
+				uni.request({
+					url: this.serverUrl + '/MouldController/Get_SourceBarCode_ProdOut_Json',
+					data: {
+						HInterID: this.hform.HInterID,
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.hform.HBillType,
+						HSourceBillNo: HBarCode,
+						HSourceBillType: this.hform.HMainSourceBillType,
+						HMaker: this.hform.HMaker,
+						HStockOrgID: this.hform.HStockOrgID
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							var data = res.data.data[0]
+							console.log(2, data);
+
+							this.hform.HSourceBillNo = data.HSourceBillNo
+							this.showHMainSourceBillType = false
+							//榛樿闈炲婧愬崟
+							this.showHSourceBillNo = false
+							//璁剧疆寰�鏉ュ崟浣�
+							this.hform.HSupTypeID = data.HCorrespondentTypeID
+							this.hform.HSupID = data.HCorrespondentID
+							this.hform.HSupName = data.HCorrespondentName
+							if (data.HCorrespondentTypeID == 1) {
+								this.hform.TypeName = "渚涘簲鍟�"
+							} else if (data.HCorrespondentTypeID == 2) {
+								this.hform.TypeName = "瀹㈡埛"
+							} else {
+								this.hform.TypeName = "閮ㄩ棬"
+							}
+
+
+							this.tabs = 1
+							CommonUtils.playSound(1)
+							//鍏夋爣瀵瑰噯鏉$爜
+							this.refreshBarCodeState()
+							this.DisBillEntryList()
+						} else {
+							console.log('res.data.Message: ', res.data.Message);
+							CommonUtils.playSound(0)
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						CommonUtils.playSound(0)
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			async refreshBarCodeState() {
+				this.barCodeFocus = false
+				await this.$nextTick(() => {
+					this.barCodeFocus = true
+					this.hform.HBarCode = ""
+				})
+			},
+
+			delMater(item) {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕佸垹闄� "' + item.鍣ㄥ叿鍙� + '" 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+					success: (res) => {
+						if (res.confirm) {
+							uni.request({
+								url: this.serverUrl +
+									'/MouldController/set_DelMouldStockBillMain_Temp_Json',
+								data: {
+									HInterID: this.hform.HInterID,
+									HBarCode: item.HBarCode,
+									HBillType: this.hform.HBillType
+								},
+								success: (res) => {
+									if (res.data.count == 1) {
+										this.DisBillEntryList()
+									} else {
+										uni.showToast({
+											title: res.data.Message,
+											icon: 'none'
+										})
+									}
+								},
+								fail: (res) => {
+									console.log(res);
+									uni.showToast({
+										title: '鎺ュ彛璇锋眰澶辫触',
+										icon: 'none'
+									})
+								}
+							});
+						}
+					}
+				});
+			},
+			onLoad(e) {
+				console.log(e, this.userInfo)
+				console.log(getUserInfo().HEmpName)
+				if (e.linterid) {
+					this.btnType = 3
+					this.linterid = e.linterid
+					this.HBillNo = e.HBillNo
+					this.getEditData(e.linterid, e.HBillNo)
+				} else {
+					this.getNewData()
+				}
+				if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
+					this.HSourceBillType = "鎵嬪伐褰曞叆"; // 鏄剧ず鍚嶇О
+					this.hform.HSourceBillType = "-1"; // 瀵瑰簲鐨勫��
+				}
+				this.getHBaseList()
+				this.getHCusList()
+				this.getHEmpList()
+				this.getHDeptList()
+				this.getHSupList()
+
+				setTimeout(() => {
+					this.HSelectTypeChange(this.hform.TypeName)
+					//鍒濆鍖栧線鏉ュ崟浣�
+					if (this.hform.TypeName == '閮ㄩ棬') {
+						this.hform.HSupName = getUserInfo().HDept; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
+						this.hform.HSupID = getUserInfo().HDeptID;
+					} else if (this.hform.TypeName === '渚涘簲鍟�') {
+						this.hform.HSupName = getUserInfo().HSupName; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
+						this.hform.HSupID = getUserInfo().HSupID;
+					} else if (this.hform.TypeName === '瀹㈡埛') {
+
+					}
+					this.$nextTick(() => {
+						this.loadCache()
+					})
+
+				}, 300);
+				uni.$on('BillSelectComplete', (e) => {
+					console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
+					this.getHBarCodeData(e.HBillNo)
+					this.$refs.billList.exit()
+				})
+				//this.getHEmpList()
+			},
+			//閲嶈閫夋嫨婧愬崟蹇呴』娣诲姞杩欎釜鍚﹀垯鍑虹幇涓ラ噸bug
+			onUnload() {
+				uni.$off('BillSelectComplete')
+			},
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.form {
+		width: 668rpx;
+		margin: 20rpx auto;
+		padding-bottom: 240rpx;
+	}
+
+	.tab_area {
+		width: 100%;
+		height: 50rpx;
+	}
+
+	.other {
+		margin-top: 8rpx;
+		text-align: center;
+		font-size: 28rpx;
+		padding: 4rpx 18rpx;
+		color: #1890FF;
+	}
+
+	.tabs {
+		width: 100%;
+		display: flex;
+		border-bottom: 1px solid #ddd;
+		margin: 20rpx 0;
+
+		view {
+			width: 25%;
+			font-size: 30rpx;
+			color: #555;
+			text-align: center;
+			padding: 16rpx 0;
+		}
+
+		.on {
+			color: #3a78ff;
+			font-weight: bold;
+			border-bottom: 3px solid #3a78ff;
+		}
+	}
+
+	.form-item {
+		display: flex;
+		align-items: center;
+		font-size: 30rpx;
+		padding: 6rpx 0;
+		gap: 12rpx;
+
+		.title {
+			width: 208rpx;
+			flex-shrink: 0;
+
+			text {
+				color: red;
+				font-weight: bold;
+			}
+		}
+
+		.right {
+			// width: 450rpx;
+			flex: 1;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+			position: relative;
+			display: flex;
+
+			picker {
+				width: 100%;
+			}
+
+			.uni-combox {
+				width: 100%;
+			}
+		}
+
+		.righton {
+			// width: 450rpx;
+			flex: 1;
+			border-radius: 22rpx;
+			border: 1px solid #e4e4e4;
+			background-color: #e4e4e4;
+			position: relative;
+			display: flex;
+		}
+
+		input {
+			width: 100%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
+
+		textarea {
+			width: 98%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
+
+		.icon-wrapper {
+			background-color: #3A78FF;
+			border-radius: 100%;
+			width: 52rpx;
+			height: 52rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			flex-shrink: 0;
+
+			.uni-icons {
+				color: #fff !important;
+			}
+		}
+
+		.icon-wrapper[disabled] {
+			background-color: rgba(228, 228, 228, 1);
+			pointer-events: none;
+			touch-action: none;
+		}
+	}
+
+	.bottom-btn {
+		width: 100%;
+		box-sizing: border-box;
+		// height: 120rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background-color: #fff;
+		box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+		padding: 30rpx 40rpx 40rpx 40rpx;
+		display: flex;
+		flex-direction: row;
+		gap: 10rpx;
+
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
+
+		.btn-a {
+			background-color: #3A78FF;
+			color: #fff;
+		}
+
+		.btn-b {
+			background-color: #41a863;
+			color: #fff;
+		}
+
+		.btn-c {
+			background-color: #acacac;
+			color: #fff;
+			// position: absolute;
+			// right: 120rpx;
+		}
+
+		.btn-d {
+			background-color: #ff8901;
+			color: #fff;
+		}
+	}
+
+	.list {
+		width: 100%;
+
+		.card-detail {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			line-height: 120%;
+
+			.detail {
+				// width: 50%;
+				font-size: 26rpx;
+				margin-bottom: 12rpx;
+				color: #555;
+				margin-right: 20rpx;
+
+				text {
+					color: #999;
+					font-size: 26rpx;
+				}
+			}
+		}
+
+		.more {
+			color: #888;
+			font-size: 24rpx;
+			display: flex;
+			border-top: 1px solid #eee;
+			padding-top: 20rpx;
+
+			.part {
+				width: 50%;
+				text-align: center;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/qijuweixiurukudan/Sc_MouldRepairInBillList.vue b/pages/MJGL/qijuweixiurukudan/Sc_MouldRepairInBillList.vue
new file mode 100644
index 0000000..6b31de2
--- /dev/null
+++ b/pages/MJGL/qijuweixiurukudan/Sc_MouldRepairInBillList.vue
@@ -0,0 +1,484 @@
+<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="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+				<button class="btn-b" size="mini" type="default" @tap="creat">鏂板</button>
+				<button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+			</view>
+		</view>
+		
+		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+		
+		<view class="list" v-for="(item,index) in showList" :key="index">
+			<uni-card :title="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+				<view class="detail" v-if="item.妯″叿浠g爜">
+					<text>妯″叿浠g爜锛�</text>{{item.妯″叿浠g爜}}
+				</view>
+				<view class="detail" v-if="item.妯″叿鍚嶇О">
+					<text>妯″叿鍚嶇О锛�</text>{{item.妯″叿鍚嶇О}}
+				</view>
+				<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+					<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+				</view>
+				<view class="detail" v-if="item.鍙戞枡浜�">
+					<text>鍙戞枡浜猴細</text>{{item.鍙戞枡浜簘}
+				</view>
+				<view class="detail" v-if="item.棰嗘枡浜�">
+					<text>棰嗘枡浜猴細</text>{{item.棰嗘枡浜簘}
+				</view>
+				<view class="detail" v-if="item.閮ㄩ棬">
+					<text>閮ㄩ棬锛�</text>{{item.閮ㄩ棬}}
+				</view>
+				<view class="detail" v-if="item.寰�鏉ョ被鍨嬪悕绉�">
+					<text>寰�鏉ョ被鍨嬪悕绉帮細</text>{{item.寰�鏉ョ被鍨嬪悕绉皚}
+				</view>
+				<view class="detail" v-if="item.寰�鏉ュ崟浣�">
+					<text>寰�鏉ュ崟浣嶏細</text>{{item.寰�鏉ュ崟浣峿}
+				</view>
+				<view class="detail" v-if="item.鍣ㄥ叿浠撳簱">
+					<text>鍣ㄥ叿浠撳簱锛�</text>{{item.鍣ㄥ叿浠撳簱}}
+				</view>
+				<view class="detail" v-if="item.绾㈣摑鍗曟爣璁�">
+					<text>绾㈣摑鍗曟爣璁帮細</text>{{item.绾㈣摑鍗曟爣璁皚}
+				</view>
+				<view class="detail" v-if="item.寮�濮嬫棩鏈�">
+					<text>寮�濮嬫棩鏈燂細</text>{{item.寮�濮嬫棩鏈�.substr(0,10)}}
+				</view>
+				<view class="detail" v-if="item.缁撴潫鏃ユ湡">
+					<text>缁撴潫鏃ユ湡锛�</text>{{item.缁撴潫鏃ユ湡.substr(0,10)}}
+				</view>
+				<view class="detail" v-if="item.琛ㄤ綋澶囨敞">
+					<text>琛ㄤ綋澶囨敞锛�</text>{{item.琛ㄤ綋澶囨敞}}
+				</view>
+				<view class="detail" v-if="item.鍏抽棴绫诲瀷">
+					<text>鍏抽棴绫诲瀷锛�</text>{{item.鍏抽棴绫诲瀷}}
+				</view>
+
+				<view class="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 class="detail" v-if="item.浣滃簾浜�">
+						<text>浣滃簾浜猴細</text>{{item.浣滃簾浜簘}
+					</view>
+					<view class="detail" v-if="item.浣滃簾鏃ユ湡">
+						<text>浣滃簾鏃ユ湡锛�</text>{{item.浣滃簾鏃ユ湡.substr(0,10)}}
+					</view>
+					<view class="detail" v-if="item.婧愬崟鍗曞彿">
+						<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+					</view>
+					<view class="detail" v-if="item.婧愬崟绫诲瀷">
+						<text>婧愬崟绫诲瀷锛�</text>{{item.婧愬崟绫诲瀷}}
+					</view>
+					<view class="detail" v-if="item.hbilltype">
+						<text>hbilltype锛�</text>{{item.hbilltype}}
+					</view>
+					<view class="detail" v-if="item.鎽樿">
+						<text>鎽樿锛�</text>{{item.鎽樿}}
+					</view>
+				</view>
+				<view class="more" v-if="showDetail == index && operations != index">
+					<view class="part" style="border-right: 1px solid #eee;">
+						<uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+					</view>
+					<view class="part" @tap.stop="operations = operations==index?-1:index">
+						<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+					</view>
+				</view>
+				<view class="more" v-if="showDetail != index && operations != index">
+					<view class="part" style="border-right: 1px solid #eee;">
+						<uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+					</view>
+					<view class="part" @tap.stop="operations = operations==index?-1:index">
+						<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+					</view>
+				</view>
+				
+				<view class="op" v-if="operations == index">
+					<!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+					<!-- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button> -->
+					<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+				</view>
+			</uni-card>
+		</view>
+		
+		<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+		<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
+		<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+	</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:[],
+				showList:[],
+				showDetail:-1,
+				operations:-1,
+				
+				page:1,
+				size:100
+	        }
+	    },
+		onLoad() {
+			this.getList()
+			console.log(this.userInfo,uni.getStorageSync('HUserName'))
+		},
+		onReachBottom: function() {
+			this.page++
+			setTimeout(() => {
+				this.showList = this.showList.concat(this.getPage(this.page,this.listData))
+			}, 100)
+		},
+		onPullDownRefresh: function() {
+			this.clear()
+			setTimeout(()=>{
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+	    methods: {
+			getPage(page,list){
+				let sindex = (parseInt(page) - 1) * 20
+				let eindex = parseInt(page) * 20
+				let newList = list.slice(sindex,eindex)
+				return newList
+			},
+			getList(){
+				console.log(this.sWhere)
+				uni.showLoading({
+					title:'鍔犺浇涓�...'
+				})
+				uni.request({
+				    url: this.serverUrl + '/Sc_CheckToolsRepairWorkBillList/GetMouldRepairInBillList',
+					data:{ 
+						sWhere: this.sWhere,
+						user: uni.getStorageSync('HUserName'),
+						Organization:uni.getStorageSync('Organization'),
+						
+					},
+				    success: (res) => {
+						console.log(1,uni.getStorageSync('Organization'));
+				        console.log(1,res);
+						if(res.data.code ==1){
+							this.listData = res.data.data
+							this.showList = this.getPage(this.page,this.listData)
+							
+							setTimeout(()=>{
+							     uni.hideLoading()
+							}, 1000)
+						}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 = ''
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				console.log(this.hform)
+				if (this.hform.HBillNo) {
+				    this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+				}
+				if (this.hform.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()
+			},
+			creat(){
+				uni.navigateTo({
+					url:'/pages/MJGL/qijuweixiurukudan/Sc_MouldRepairInBill'
+				})
+			},
+			clear(){
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				this.sWhere = ''
+				this.showDetail = -1,
+				this.operations = -1,
+				this.hform = {
+					HBillNo:'',
+					HCreateBy:'',
+					BenginHCreateDate:'',
+					EndHCreateDate:'',
+				}
+				this.getList()
+			},
+			//TODO   瀛愯〃鍒楄〃
+			// toSon(item){
+			// 	uni.navigateTo({
+			// 		url:'/pages/baoyangjilu/Sb_EquipMaintainRuleList_son?HInterID=' + item.hmainid 
+			// 		+ '&璁惧鍚嶇О=' + item.璁惧鍚嶇О 
+			// 		+ '&璁惧浠g爜=' + item.璁惧浠g爜,
+			// 	})
+			// },
+			
+			//缂栬緫
+			edit(item){
+				console.log(item)
+				uni.navigateTo({
+					url:'/pages/MJGL/qijuweixiuchukudan/Sc_MouldRepairOutBill?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+				})
+			},
+			//鍒犻櫎
+			del(item){
+				console.log(item)
+				uni.showModal({
+				    title: '鎻愮ず',
+				    content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
+				    success: (res) => {
+				        if (res.confirm) {
+				            console.log('鐢ㄦ埛鐐瑰嚮纭畾',);
+							uni.request({
+							    url: this.serverUrl + '/Sc_MouldScrapOutHouseBill/DeltetMouldScrapOutHouseBill',
+								data:{ 
+									HInterID: item.hmainid,
+									user: uni.getStorageSync('HUserName')
+								},
+							    success: (res) => {
+							        console.log(1,res);
+									if(res.data.count == 1){
+										this.clear()
+									}
+									uni.showToast({
+										title:res.data.Message,
+										icon:'none'
+									})
+								},
+								fail: (res) => {
+									console.log(res);
+									uni.showToast({
+										title:'鎺ュ彛璇锋眰澶辫触',
+										icon:'none'
+									})
+								},
+							});
+				        } else if (res.cancel) {
+				            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+				        }
+				    }
+				});
+			},
+	    }
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form{
+		width: 640rpx;
+		margin: 20rpx auto;
+	}
+    .form-item{
+		display: flex;
+		align-items: center;
+		font-size: 28rpx;
+		padding: 6rpx 0;
+		.title{
+			width: 180rpx;
+			text{
+				color: red;
+				font-weight: bold;
+			}
+		}
+		.right{
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+		}
+		.righton{
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #e4e4e4;
+			background-color: #e4e4e4;
+		}
+		input{
+			width: 100%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
+	}
+	.buttons{
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		margin-top: 20rpx;
+		button{
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
+		.btn-a{
+			background-color: #acacac;
+			color: #fff;
+		}
+		.btn-b{
+			background-color: #41a863;
+			color: #fff;
+		}
+		.btn-c{
+			background-color: #3a78ff;
+			color: #fff;
+		}
+	}
+	
+	.list{
+		width: 100%;
+		.card-detail{
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			line-height: 120%;
+			.detail{
+				// width: 50%;
+				font-size: 26rpx;
+				margin-bottom: 12rpx;
+				color: #555;
+				margin-right: 20rpx;
+				text{
+					color: #999;
+					font-size: 26rpx;
+				}
+			}
+		}
+		.more{
+			color: #888;
+			font-size: 24rpx;
+			display: flex;
+			border-top: 1px solid #eee;
+			padding-top: 20rpx;
+			.part{
+				width: 50%;
+				text-align: center;
+			}
+		}
+		.op{
+			display: flex;
+			justify-content: space-around;
+			margin-top: 20rpx;
+			button{
+				padding: 0;
+				width: 130rpx;
+				font-size: 25rpx;
+			}
+			.op1{
+				border: 1px solid #41a863;
+				color: #41a863;
+			}
+			.op2{
+				border: 1px solid #d98d00;
+				color: #d98d00;
+			}
+			.op3{
+				border: 1px solid #3a78ff;
+				color: #3a78ff;
+			}
+			.op4{
+				border: 1px solid #da0000;
+				color: #da0000;
+			}
+			.op5{
+				border: 1px solid #888;
+				color: #888;
+			}
+		}
+	}
+
+</style>
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index b16e3d1..56ce8f4 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -582,7 +582,21 @@
                         "url": "/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_FastList",
                         "id": 73,
                         "hidden": false
-                    }
+                    },
+					{
+					    "img": "../../static/icon/icon17.png",
+					    "text": "鍣ㄥ叿缁翠慨鍑哄簱鍒楄〃",
+					    "url": "/pages/MJGL/qijuweixiuchukudan/Sc_MouldRepairOutBillList",
+					    "id": 74,
+					    "hidden": false
+					},
+					{
+					    "img": "../../static/icon/icon17.png",
+					    "text": "鍣ㄥ叿缁翠慨鍏ュ簱鍒楄〃",
+					    "url": "/pages/MJGL/qijuweixiurukudan/Sc_MouldRepairInBillList",
+					    "id": 75,
+					    "hidden": false
+					}
                 ]
             }
         },

--
Gitblit v1.9.1