From ba04983aaf5cbb0d57c4ec3530ee1663f0f83115 Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期二, 15 七月 2025 17:16:02 +0800
Subject: [PATCH] 生产领料更新

---
 pages/shengchanruku/form.vue      |  726 +++++++-------------------------------------
 pages/shengchanlingliao/table.vue |   51 +-
 pages/shengchanlingliao/form.vue  |  161 ++-------
 3 files changed, 193 insertions(+), 745 deletions(-)

diff --git a/pages/shengchanlingliao/form.vue b/pages/shengchanlingliao/form.vue
index 38cd96b..c7185e4 100644
--- a/pages/shengchanlingliao/form.vue
+++ b/pages/shengchanlingliao/form.vue
@@ -1,14 +1,14 @@
 <template>
 	<view>
 		<view class="form">
-			<view class="form-item">
+<!-- 			<view class="form-item">
 				<view class="title">鏉＄爜:</view>
 				<view class="right" style="width: 380rpx;">
 					<input 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">
+			</view> -->
+<!-- 			<view class="form-item">
 				<view class="title">鏁伴噺:</view>
 				<view class="right">
 					<input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�"/>
@@ -26,7 +26,7 @@
 					<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" placeholder="涓嶅彲鎿嶄綔"/></view>
-			</view>
+			</view> -->
 			
 			<view class="tabs">
 				<!-- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view> -->
@@ -36,7 +36,14 @@
 			</view>
 			
 			<view v-if="tabs == 1">
-				<view class="form-item">
+				<view class="form-item" v-show="showHBillNo">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="right" style="width: 380rpx;">
+						<input name="HBillNo" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" @confirm="GetMeesageByBillNo(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" v-show="!showHBillNo">
 					<view class="title">鍗曟嵁鍙�:</view>
 					<view class="righton">
 						<input name="HBillNo" disabled v-model="hform.HBillNo" />
@@ -63,22 +70,16 @@
 			</view>
 			<view v-if="tabs == 2">
 				<view class="list" v-for="(item,index) in Materlist" :key="index">
-					<uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠ｇ爜" style="margin: 10px;" @tap="delMater(item)">
+					<uni-card :title="item.鐗╂枡鍚嶇О" :extra="'鏁伴噺:'+item.鏁伴噺" style="margin: 10px;">
 						<view class="card-detail">
 							<view class="detail">
-								<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
-							</view>
-							<view class="detail">
-								<text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
-							</view>
-							<view class="detail">
-								<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
-							</view>
-							<view class="detail">
-								<text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
+								<text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
 							</view>
 							<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
 								<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+							</view>
+							<view class="detail">
+								<text>鎵规锛�</text>{{item.鎵规}}
 							</view>
 							<view class="detail" v-if="item.杈呭姪灞炴��">
 								<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
@@ -164,9 +165,8 @@
 				HModName:'Kf_MateOutBill_Check_PDA',
 				ModRightName:'CE_MateOutCheck',
 				OperationType: 1,
-				HInterID_Temp:'',
 				
-				showHStockPlaceName:true,
+				showHBillNo:true,
 				tabs:1,
 				linterid:'',
 				HBillNo:'',
@@ -195,6 +195,8 @@
 					HStockOrgName:uni.getStorageSync('Organization'),
 					HStockOrgID:uni.getStorageSync('OrganizationID'),
 					HSourceBarCodeCtl:"N", //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
+					chkHBarflag:1,
+					HBarflag:'Y',
 
 					HBarCode_B:'',
 					HMaterName_B:'',
@@ -211,14 +213,13 @@
 		onLoad(e) {
 			console.log(e,this.userInfo)
 			this.OperationType = e.OperationType
-			if(e.HInterID){
-				this.HInterID_Temp = e.HInterID
+			if(e.HBillNo){
 				this.hform.HBillNo = e.HBillNo
-				this.GetMeesageByBillNo()
+				this.GetMeesageByBillNo(e.HBillNo)
 			}else{
 				// this.getNewData()
 			}
-			this.getHBaseList()
+			// this.getHBaseList()
 		},
         methods: {
 			//鎵爜
@@ -227,89 +228,36 @@
 				    onlyFromCamera: true,
 				    success: (res) => {
 				        console.log('鏉＄爜鍐呭锛�' + res.result);
-						if(this.hform.HBarCode == '*'){
-							this.hform.HBarCode = this.hform.HBarCode + res.result
-						}else{
-							this.hform.HBarCode = res.result
-						}
-						
-						this.getCode(this.hform.HBarCode)
+						// if(this.hform.HBarCode == '*'){
+						// 	this.hform.HBarCode = this.hform.HBarCode + res.result
+						// }else{
+						// 	this.hform.HBarCode = res.result
+						// }
+						this.hform.HBarCode = res.result
+						this.GetMeesageByBillNo(this.hform.HBarCode)
 				    }
 				});
 			},
 			//鎵弿鍗曟嵁鍙锋潯鐮�
-			GetMeesageByBillNo(){
+			GetMeesageByBillNo(e){
 				uni.request({
 					url: this.serverUrl + '/WEBSController/get_BillBarCode_BillCheck_Json', 
-					data: {HBillNo:this.hform.HBillNo,HBillType:this.hform.HBillType,HMaker:this.hform.HMaker,HStockOrgID:uni.getStorageSync('Organization')},
+					data: {HBillNo:this.hform.HBillNo,HBillType:this.hform.HBillType,HMaker:this.hform.HMaker,HStockOrgID:this.hform.HStockOrgID},
 					success: (res) => {
 						if(res.data.count == 1){
 							var data = res.data.data
 							console.log(data)
-							$('#HInterID').val(result.data.hInterIDField)
-							$('#HBillNo').val(result.data.hBillNoField)
-							$("#HBillNo").attr("disabled", "disabled");
-							$('#HBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
-							$('#cmdHBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
-							HInterID = $('#HInterID').val()
+							this.hform.HInterID = data.hInterIDField
+							this.hform.HBillNo = data.hBillNoField
+							this.showHBillNo = false
 							//鏉＄爜鏍稿鏍囪
-							if (result.data.hSourceBarCodeFlagField) {
-							    $("input[name='chkHBarflag'][value='" + result.data.hSourceBarCodeFlagField + "']").attr("checked", true);
-							    form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-							        "HBarflag": result.data
-							    });
-							    HSourceBarCodeCtl = "Y"
+							if (data.hSourceBarCodeFlagField) {
+								this.hform.HSourceBarCodeCtl = "Y"
+								this.hform.chkHBarflag = true
+								this.hform.HBarflag = data
 							}
-							element.tabChange('tab-Kf_MateOutBill_Check_PDA', '2');
-							$("#HBarCode").select();
-							$("#HBarCode").focus();
-							//鏄剧ず琛ㄤ綋鏄庣粏
-							DisBillEntryList();
-							
-							//宸插瓨鍦ㄦ壂鐮佽褰曚笖鍗曟嵁鍙戠敓鍙樻洿鍚庝袱杈规暟鎹笉涓�鑷存椂锛屾竻绌哄師鎵爜鏁版嵁
-							if (result.data.hBackField == '2') {
-							    playSound();
-							    layer.confirm(result.data.hRemarkField, {
-							        icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
-							        btn2: function () {
-							        }//鍏抽棴
-							    }
-							    , function () {
-							        $.ajax({
-							            type: "GET",
-							            url: GetWEBURL() + "/WEBSController/get_ClearBarCode_BillCheck_Json",
-							            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
-							            data: { "HInterID": HInterID, "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
-							            success: function (result) {
-							                if (result.count == 1) {
-							                    var data = result.data[0];
-							                    $('#HInterID').val(data.HInterID)
-							                    $('#HBillNo').val(data.HBillNo)
-							                    HInterID = $('#HInterID').val()
-							                    layer.closeAll();
-							                    //鏄剧ず琛ㄤ綋鏄庣粏
-							                    DisBillEntryList();
-							                }
-							                else {
-							                    playSound();
-							                    layer.msg(result.Message, {
-							                        icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
-							                    }, function () {
-							                        element.tabChange('tab-Kf_MateOutBill_Check_PDA', '1');
-							                        $("#HBillNo").select();
-							                        $("#HBillNo").focus();
-							                    });
-							                }
-							            },
-							            complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
-							            error: function (err) {
-							                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-							            }
-							        });
-							    });//娓呯┖
-							}
-							
-							this.DisBillEntryList()
+							this.tabs = 2
+							this.DisBillEntryList();
 						}else{
 							uni.showToast({
 								title:res.data.Message,
@@ -567,8 +515,8 @@
 			//鐗╂枡淇℃伅
 			DisBillEntryList(){
 				uni.request({
-				    url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json', 
-					data: { HInterID: this.hform.HInterID, HBillNo: this.hform.HBillNo, HBillType: this.hform.HBillType, HStockOrgID: this.hform.HStockOrgID },
+				    url: this.serverUrl + '/WEBSController/GetKf_PonderationBillMain_Temp_BillCheck_New_Json', 
+					data: { HInterID: this.hform.HInterID, HBillType: this.hform.HBillType, HSourceBarCodeCtl: this.hform.HSourceBarCodeCtl, sWhere: '' },
 				    success: (res) => {
 						console.log('鐗╂枡',res.data)
 						if(res.data.count == 1){
@@ -618,7 +566,7 @@
 				        if (res.confirm) {
 				            uni.request({
 				                url: this.serverUrl + '/WEBSController/set_DeleteBarCodeByEntryID_BillCheck_New_Json', 
-				            	data: { HInterID: this.hform.HInterID, HBillType: this.hform.HBillType },
+				            	data: { HInterID: this.hform.HInterID, HBillType: this.hform.HBillType,HSourceInterID:item.HSourceInterID,HSourceEntryID:item.HSourceEntryID,HSourceBarCodeCtl:this.hform.HSourceBarCodeCtl },
 				                success: (res) => {
 				            		if(res.data.count == 1){
 				            			this.DisBillEntryList()
@@ -642,28 +590,9 @@
 				});
 			},
             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:'鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+            			title:'娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忓崟鎹潯鐮侊紒',
             			icon:'none'
             		})
 				}else if(!this.hform.HBillNo){
diff --git a/pages/shengchanlingliao/table.vue b/pages/shengchanlingliao/table.vue
index 3174473..1126f17 100644
--- a/pages/shengchanlingliao/table.vue
+++ b/pages/shengchanlingliao/table.vue
@@ -262,32 +262,33 @@
 			//缂栬緫
 			edit(item){
 				console.log(item)
-				uni.request({
-				    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
-					data:{ "HInterID": item.HInterID, "HBillNo": item.鍗曟嵁鍙�, "HBillType": this.hform.HBillType },
-				    success: (res) => {
-				        console.log(1,res);
-						if(res.data.count == 1){
-							uni.navigateTo({
-								url:'./form?OperationType=2&HInterID=' + item.HInterID + '&HBillNo=' + item.HBillNo
-							})
-						}else{
-							uni.showToast({
-								title:res.data.Message,
-								icon:'none'
-							})
-						}
-	
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.hideLoading()
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
+				uni.navigateTo({
+					url:'./form?OperationType=2&HBillNo=' + item.HBillNo
 				})
+	// 			uni.request({
+	// 			    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
+	// 				data:{ "HInterID": item.HInterID, "HBillNo": item.鍗曟嵁鍙�, "HBillType": this.hform.HBillType },
+	// 			    success: (res) => {
+	// 			        console.log(1,res);
+	// 					if(res.data.count == 1){
+							
+	// 					}else{
+	// 						uni.showToast({
+	// 							title:res.data.Message,
+	// 							icon:'none'
+	// 						})
+	// 					}
+	
+	// 				},
+	// 				fail: (res) => {
+	// 					console.log(res);
+	// 					uni.hideLoading()
+	// 					uni.showToast({
+	// 						title:'鎺ュ彛璇锋眰澶辫触',
+	// 						icon:'none'
+	// 					})
+	// 				},
+	// 			})
 			},
 			//鍒犻櫎
 			del(item){
diff --git a/pages/shengchanruku/form.vue b/pages/shengchanruku/form.vue
index 32f4181..c7185e4 100644
--- a/pages/shengchanruku/form.vue
+++ b/pages/shengchanruku/form.vue
@@ -1,14 +1,14 @@
 <template>
 	<view>
 		<view class="form">
-			<view class="form-item">
+<!-- 			<view class="form-item">
 				<view class="title">鏉＄爜:</view>
 				<view class="right" style="width: 380rpx;">
 					<input 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">
+			</view> -->
+<!-- 			<view class="form-item">
 				<view class="title">鏁伴噺:</view>
 				<view class="right">
 					<input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�"/>
@@ -26,58 +26,24 @@
 					<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" placeholder="涓嶅彲鎿嶄綔"/></view>
-			</view>
+			</view> -->
 			
 			<view class="tabs">
-				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
+				<!-- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view> -->
 				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
 				<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
 				<view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鏉＄爜淇℃伅</view>
-				<view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">涓嬫灦淇℃伅</view>
 			</view>
 			
-			<view v-if="tabs == 0">
-				<view class="form-item">
-					<view class="title">婧愬崟绫诲瀷:</view>
-					<view class="right" v-show="showHMainSourceBillType">
-						<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType" @change="HMainSourceBillTypeChange">
-							<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
-						</picker>
+			<view v-if="tabs == 1">
+				<view class="form-item" v-show="showHBillNo">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="right" style="width: 380rpx;">
+						<input name="HBillNo" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" @confirm="GetMeesageByBillNo(hform.HBarCode)"/>
 					</view>
-					<view class="righton" v-show="!showHMainSourceBillType">
-						<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
-					</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">
-					<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>
-					</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="right">
-						<uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨" v-model="hform.HFIFOWHName" @input="HFIFOWHNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鏃ユ湡:</view>
-					<view class="right">
-						<picker mode="date" v-model="hform.HDate" @change="HDateChange">
-							<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
-						</picker>
-					</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="form-item" v-show="!showHBillNo">
 					<view class="title">鍗曟嵁鍙�:</view>
 					<view class="righton">
 						<input name="HBillNo" disabled v-model="hform.HBillNo" />
@@ -89,34 +55,10 @@
 						<input name="HInterID" disabled v-model="hform.HInterID" />
 					</view>
 				</view>
-			</view>
-			
-			<view v-if="tabs == 1">
 				<view class="form-item">
-					<view class="title">淇濈:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName" @input="HKeeperNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">楠屾敹:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName" @input="HSecManagerNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">閮ㄩ棬:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName" @input="HDeptNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">瀹㈡埛:</view>
-					<view class="right" v-show="showHSupName">
-						<uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨瀹㈡埛" v-model="hform.HSupName" @input="HSupNameChange"></uni-combox>
-					</view>
-					<view class="righton" v-show="!showHSupName">
-						<input name="HSupName" disabled v-model="hform.HSupName" placeholder="璇烽�夋嫨瀹㈡埛" />
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="righton">
+						<input name="HMaker" disabled v-model="hform.HMaker" />
 					</view>
 				</view>
 				<view class="form-item">
@@ -126,25 +68,18 @@
 					</view>
 				</view>
 			</view>
-			
 			<view v-if="tabs == 2">
 				<view class="list" v-for="(item,index) in Materlist" :key="index">
-					<uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠ｇ爜" style="margin: 10px;" @tap="delMater(item)">
+					<uni-card :title="item.鐗╂枡鍚嶇О" :extra="'鏁伴噺:'+item.鏁伴噺" style="margin: 10px;">
 						<view class="card-detail">
 							<view class="detail">
-								<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
-							</view>
-							<view class="detail">
-								<text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
-							</view>
-							<view class="detail">
-								<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
-							</view>
-							<view class="detail">
-								<text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
+								<text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
 							</view>
 							<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
 								<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+							</view>
+							<view class="detail">
+								<text>鎵规锛�</text>{{item.鎵规}}
 							</view>
 							<view class="detail" v-if="item.杈呭姪灞炴��">
 								<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
@@ -153,37 +88,6 @@
 					</uni-card>
 				</view>
 				<view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
-			</view>
-			
-			<view v-if="tabs == 4">
-				<view class="list" v-for="(item,index) in FIFOlist" :key="index">
-					<uni-card :title="item.HMaterName" :extra="item.HMaterNumber" style="margin: 10px;" @tap="delMater(item)">
-						<view class="card-detail">
-							<view class="detail">
-								<text>鏁伴噺锛�</text>{{item.HQty}}
-							</view>
-							<view class="detail">
-								<text>涓嬫灦鏁伴噺锛�</text>{{item.HQtyMust}}
-							</view>
-							<view class="detail">
-								<text>浠撳簱锛�</text>{{item.HWhName}}
-							</view>
-							<view class="detail">
-								<text>浠撲綅锛�</text>{{item.HSPName}}
-							</view>
-							<view class="detail">
-								<text>瑙勬牸鍨嬪彿锛�</text>{{item.HMaterModel}}
-							</view>
-							<view class="detail" v-if="item.HBatchNo">
-								<text>鎵瑰彿锛�</text>{{item.HBatchNo}}
-							</view>
-							<view class="detail" v-if="item.HAuxPropName">
-								<text>杈呭姪灞炴�э細</text>{{item.HAuxPropName}}
-							</view>
-						</view>
-					</uni-card>
-				</view>
-				<view class="over" v-if="FIFOlist.length == 0">鏆傛棤鏁版嵁</view>
 			</view>
 			
 			<view v-if="tabs == 3">
@@ -258,44 +162,23 @@
             return {
 				userInfo:getUserInfo(),
 				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
-				HModName:'Kf_SellOutBill_PDA',
-				ModRightName:'CE_SellOut',
+				HModName:'Kf_MateOutBill_Check_PDA',
+				ModRightName:'CE_MateOutCheck',
 				OperationType: 1,
-				HInterID_Temp:'',
 				
-				showHStockPlaceName:true,
-				showHMainSourceBillType:true,
-				showHSourceBillNo:true,
-				reHSourceBillNo:true,
-				showHSupName:true,
-				
-				tabs:0,
-				HMainSourceBillType:'鍙戣揣閫氱煡鍗�',
-				arrayHMainSourceBillType:['鍙戣揣閫氱煡鍗�','閿�鍞鍗�','鎵嬪伐褰曞叆'],
-				
+				showHBillNo:true,
+				tabs:1,
 				linterid:'',
 				HBillNo:'',
-				btnType:0,//0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
-				showmore: false,
 				
 				arrayHWHName:[],//浠撳簱
 				HWHNameList:[],
 				arrayHStockPlaceName:[],//浠撲綅
 				HStockPlaceNameList:[],
-				arrayHSourceBillNo:[],//鍘熷崟鍗曞彿
-				HSourceBillNoList:[],
-				
-				arrayHEmpName:[],//鎿嶄綔鍛�
-				HEmpNameList:[],
-				arrayHDeptName:[],//閮ㄩ棬
-				HDeptNameList:[],
-				arrayHSupName:[],//瀹㈡埛
-				HSupNameList:[],
 				
 				Materlist:[],
-				FIFOlist:[],
 				hform:{
-					HBillType:1205,
+					HBillType:1204,
 					HBillerID:uni.getStorageSync('HBillerID'),
 					HRedBlueFlag:false,
 					
@@ -306,25 +189,14 @@
 					HStockPlaceName:getUserInfo().HSPName,
 					HStockPlaceID:getUserInfo().HSPID,
 					
-					HMainSourceBillType:1402,
-					HSourceBillNo:'',//CGDD000200
-					HFIFOWHName:'',
-					HFIFOWHID:'',
-					HDate:getDateTime.dateTimeStr('y-m-d'),
-					HMaker:uni.getStorageSync('HUserName'),
 					HBillNo:'',
 					HInterID:'',
-					
-					HKeeperName:getUserInfo().HKeeper,
-					HKeeperID:getUserInfo().HKeeperID,
-					HSecManagerName:getUserInfo().HSecManager,
-					HSecManagerID:getUserInfo().HSecManagerID,
-					HDeptName:getUserInfo().HDept,
-					HDeptID:getUserInfo().HDeptID,
-					HSupName:'',
-					HSupID:'',
+					HMaker:uni.getStorageSync('HUserName'),
 					HStockOrgName:uni.getStorageSync('Organization'),
 					HStockOrgID:uni.getStorageSync('OrganizationID'),
+					HSourceBarCodeCtl:"N", //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
+					chkHBarflag:1,
+					HBarflag:'Y',
 
 					HBarCode_B:'',
 					HMaterName_B:'',
@@ -341,17 +213,13 @@
 		onLoad(e) {
 			console.log(e,this.userInfo)
 			this.OperationType = e.OperationType
-			if(e.HInterID){
-				this.HInterID_Temp = e.HInterID
-				// this.btnType = 1
-				this.RoadBillMain(e.HInterID)
+			if(e.HBillNo){
+				this.hform.HBillNo = e.HBillNo
+				this.GetMeesageByBillNo(e.HBillNo)
 			}else{
-				this.getNewData()
+				// this.getNewData()
 			}
-			this.getHBaseList()
-			this.getHSupList()
-			this.getHEmpList()
-			this.getHDeptList()
+			// this.getHBaseList()
 		},
         methods: {
 			//鎵爜
@@ -360,93 +228,52 @@
 				    onlyFromCamera: true,
 				    success: (res) => {
 				        console.log('鏉＄爜鍐呭锛�' + res.result);
-						if(this.hform.HBarCode == '*'){
-							this.hform.HBarCode = this.hform.HBarCode + res.result
-						}else{
-							this.hform.HBarCode = res.result
-						}
-						
-						this.getCode(this.hform.HBarCode)
+						// if(this.hform.HBarCode == '*'){
+						// 	this.hform.HBarCode = this.hform.HBarCode + res.result
+						// }else{
+						// 	this.hform.HBarCode = res.result
+						// }
+						this.hform.HBarCode = res.result
+						this.GetMeesageByBillNo(this.hform.HBarCode)
 				    }
 				});
 			},
-			//鎵叾浠�(浠撳簱锛屼粨浣�)
-			// toScanData(e){
-			// 	uni.scanCode({
-			// 	    onlyFromCamera: true,
-			// 	    success: (res) => {
-			// 	        console.log('鏉＄爜鍐呭锛�' + res.result);
-			// 			var code = res.result
-			// 			if(e == 1){
-			// 				uni.request({
-			// 					url: this.serverUrl + '/WEBSController/GetWarehouse_Json', 
-			// 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID')},
-			// 					success: (res) => {
-			// 						this.hform.HStockPlaceID = 0
-			// 						this.hform.HStockPlaceName = ''
-			// 						this.showHStockPlaceName = true
-			// 						if(res.data.count == 1){
-			// 							var data = res.data.data[0]
-			// 							this.hform.HWHID = data.HItemID
-			// 							this.hform.HWHName = data.HName
-			// 							if (data.HSPFlag == 0) {
-			// 							    this.showHStockPlaceName = false
-			// 							}
-			// 						}else{
-			// 							this.hform.HWHID = 0
-			// 							this.hform.HWHName = ''
-			// 							uni.showToast({
-			// 								title:res.data.Message,
-			// 								icon:'none'
-			// 							})
-			// 						}
-			// 					},
-			// 					fail: (res) => {
-			// 						console.log(res);
-			// 						uni.showToast({
-			// 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
-			// 							icon:'none'
-			// 						})
-			// 					},
-			// 				});
-			// 			}else if(e == 2){
-			// 				uni.request({
-			// 					url: this.serverUrl + '/WEBSController/GetStockPlace_Json', 
-			// 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID'),HWhID: this.hform.HWHID},
-			// 					success: (res) => {
-			// 						if(res.data.count == 1){
-			// 							var data = res.data.data[0]
-			// 							this.hform.HWHID = data.HWHID
-			// 							this.hform.HWHName = data.HWhName
-			// 							this.hform.HStockPlaceID = data.HItemID
-			// 							this.hform.HStockPlaceName = data.HName
-			// 						}else{
-			// 							this.hform.HWHID = 0
-			// 							this.hform.HWHName = ''
-			// 							this.hform.HStockPlaceID = 0
-			// 							this.hform.HStockPlaceName = ''
-			// 							uni.showToast({
-			// 								title:res.data.Message,
-			// 								icon:'none'
-			// 							})
-			// 						}
-			// 					},
-			// 					fail: (res) => {
-			// 						console.log(res);
-			// 						uni.showToast({
-			// 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
-			// 							icon:'none'
-			// 						})
-			// 					},
-			// 				});
-			// 			}
-			// 	    }
-			// 	});
-			// },
-			//鏃ユ湡
-			HDateChange(e){
-				console.log(e.detail.value)
-				this.hform.HDate = e.detail.value
+			//鎵弿鍗曟嵁鍙锋潯鐮�
+			GetMeesageByBillNo(e){
+				uni.request({
+					url: this.serverUrl + '/WEBSController/get_BillBarCode_BillCheck_Json', 
+					data: {HBillNo:this.hform.HBillNo,HBillType:this.hform.HBillType,HMaker:this.hform.HMaker,HStockOrgID:this.hform.HStockOrgID},
+					success: (res) => {
+						if(res.data.count == 1){
+							var data = res.data.data
+							console.log(data)
+							this.hform.HInterID = data.hInterIDField
+							this.hform.HBillNo = data.hBillNoField
+							this.showHBillNo = false
+							//鏉＄爜鏍稿鏍囪
+							if (data.hSourceBarCodeFlagField) {
+								this.hform.HSourceBarCodeCtl = "Y"
+								this.hform.chkHBarflag = true
+								this.hform.HBarflag = data
+							}
+							this.tabs = 2
+							this.DisBillEntryList();
+						}else{
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+							this.hform.HBillNo = ''
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
 			},
 			//鍩虹浠撳簱璧勬枡
 			getHBaseList(){
@@ -499,39 +326,6 @@
 						})
 					},
 				});
-				
-				this.getHYDList()
-			},
-			//婧愬崟璧勬枡
-			getHYDList(){
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetSourceBillList_Json', 
-					data: {HBillType:this.hform.HBillType,HSourceBillType:this.hform.HMainSourceBillType,HStockOrgID:this.hform.HStockOrgID,HSourceBillNo:"",HMater:"",HCustom:""},
-					success: (res) => {
-						if(res.data.count == 1){
-							this.HSourceBillNoList = res.data.data
-							for(var i=0;i<res.data.data.length;i++){
-								this.arrayHSourceBillNo[i] = res.data.data[i].鍗曟嵁鍙�
-							}
-							this.reHSourceBillNo = false
-							this.$nextTick(()=>{
-								this.reHSourceBillNo = true
-							})
-						}else{
-							uni.showToast({
-								title:'婧愬崟鏁版嵁璇锋眰澶辫触',
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
 			},
 			//閫夋嫨浠撳簱
 			HWHNameChange(e){
@@ -543,14 +337,6 @@
 					}
 				}
 			},
-			HFIFOWHNameChange(e){
-				for(var i=0;i<this.HWHNameList.length;i++){
-					if(this.HWHNameList[i].浠撳簱鍚嶇О == e){
-						this.hform.HFIFOWHName = this.HWHNameList[i].浠撳簱鍚嶇О
-						this.hform.HFIFOWHID = this.HWHNameList[i].HItemID
-					}
-				}
-			},
 			//閫夋嫨浠撲綅
 			HStockPlaceNameChange(e){
 				for(var i=0;i<this.HStockPlaceNameList.length;i++){
@@ -559,194 +345,6 @@
 						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
 					}
 				}
-			},
-			//閫夋嫨婧愬崟
-			HSourceBillNoChange(e){
-				this.hform.HSourceBillNo = e						
-				this.getHBarCodeData(e)
-				// for(var i=0;i<this.HSourceBillNoList.length;i++){
-				// 	if(this.HSourceBillNoList[i].鍗曟嵁鍙� == e){
-				// 		this.hform.HSourceBillNo = this.HSourceBillNoList[i].鍗曟嵁鍙�
-				// 	}
-				// }
-			},
-			//閫夋嫨婧愬崟绫诲瀷
-			HMainSourceBillTypeChange(e){
-				this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
-				if(this.HMainSourceBillType == '鍙戣揣閫氱煡鍗�'){
-					this.hform.HMainSourceBillType = 1402
-					this.getHYDList()
-				}else if(this.HMainSourceBillType == '閿�鍞鍗�'){
-					this.hform.HMainSourceBillType = 1401
-					this.getHYDList()
-				}else{
-					this.hform.HMainSourceBillType = -1
-					this.getHYDList()
-				}
-			},
-			
-			//鑾峰彇瀹㈡埛鏁版嵁
-			getHSupList(){
-				uni.request({
-				    url: this.serverUrl + '/Gy_Customer/list', 
-					data: {sWhere:"",user:uni.getStorageSync('HUserName'),Organization:uni.getStorageSync('Organization')},
-				    success: (res) => {
-						if(res.data.count == 1){
-							this.HSupNameList = res.data.data
-							for(var i=0;i<res.data.data.length;i++){
-								this.arrayHSupName[i] = res.data.data[i].瀹㈡埛鍚嶇О
-							}
-							this.$forceUpdate();
-						}else{
-							uni.showToast({
-								title:res.data.Message,
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'瀹㈡埛鏁版嵁璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨瀹㈡埛
-			HSupNameChange(e){
-				for(var i=0;i<this.HSupNameList.length;i++){
-					if(this.HSupNameList[i].瀹㈡埛鍚嶇О == e){
-						this.hform.HSupID = this.HSupNameList[i].HItemID
-						this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
-					}
-				}
-			},
-			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
-			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'
-						})
-					},
-				});
-			},
-			//閫夋嫨浣跨敤閮ㄩ棬
-			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].閮ㄩ棬鍚嶇О
-					}
-				}
-			},
-			//鎿嶄綔鍛�
-			getHEmpList(){
-				uni.request({
-					url: this.serverUrl + '/Web/GetEmployeeList_Json', 
-					data: { Employee: '',HGroupID:0 },
-					success: (res) => {
-						if(res.data.count == 1){
-							this.HEmpNameList = res.data.data
-							for(var i=0;i<res.data.data.length;i++){
-								this.arrayHEmpName[i] = res.data.data[i].HName
-							}
-							this.$forceUpdate();
-						}else{
-							uni.showToast({
-								title:'浜哄憳鏁版嵁璇锋眰澶辫触',
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-			},
-			//淇濈
-			HKeeperNameChange(e){
-				for(var i=0;i<this.HEmpNameList.length;i++){
-					if(this.HEmpNameList[i].HName == e){
-						console.log(this.HEmpNameList[i])
-						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
-						this.hform.HKeeperName = this.HEmpNameList[i].HName
-					}
-				}
-			},
-			//楠屾敹
-			HSecManagerNameChange(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
-					}
-				}
-			},
-			//閫変腑婧愬崟
-			getHBarCodeData(HBarCode){
-				if(!this.hform.HFIFOWHName){
-					this.hform.HFIFOWHID = 0
-				}
-				uni.request({
-				    url: this.serverUrl + '/WEBSController/get_SourceBarCode_SellOut_Json', 
-					data: { HInterID: this.hform.HInterID, HBillNo: this.hform.HBillNo, HBillType: this.hform.HBillType, HSourceBillNo: HBarCode, HSourceBillType: this.hform.HMainSourceBillType, HMaker: this.hform.HMaker, HOWNERID: this.hform.HStockOrgID,HFIFOWhID:this.hform.HFIFOWHID, },
-				    success: (res) => {
-						if(res.data.count == 1){
-							var data = res.data.data
-							console.log(2,data);
-							this.hform.HSupName = data.hSupNameField
-							this.hform.HSupID = data.hSupIDField
-							if (data.hDeptIDField != 0) {
-								this.hform.HDeptID = data.hDeptIDField
-								this.hform.HDeptName = data.hDeptNameField
-							}
-							this.hform.HSourceBillNo = data.hSourceBillNoField
-							this.showHMainSourceBillType = false
-							if(data.hMulSourceFlagField == 0){
-								this.showHSourceBillNo = false
-							}
-							this.tabs = 2
-							this.showHSupName = false
-							this.DisBillEntryList()
-						}else{
-							uni.showToast({
-								title:res.data.Message,
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
 			},
 			//鎵潯鐮佸鐞�
 			getCode(HBarCode){
@@ -771,7 +369,7 @@
                 if (HDeleteFlag == "*") {
                     if (sBarCode == "") {
                         uni.showToast({
-                        	title:'璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
+                        	title:'璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
 							icon:'none'
                         })
                     }else{
@@ -841,14 +439,13 @@
 								    }
 									this.hform.HSourceBillNo = data.hSourceBillNoField
 								    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-									this.hform.HMainSourceBillType = data.hSourceBillTypeField
-								    if (data.hSourceBillTypeField == "1402") {
-										this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
-										this.hform.HMainSourceBillType = 1402
+								    if (data.hSourceBillTypeField == "1103") {
+										this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
+										this.hform.HMainSourceBillType = 1103
 										this.showHMainSourceBillType = false
-								    }else if (data.hSourceBillTypeField == "1401") {
-										this.HMainSourceBillType = '閿�鍞鍗�'
-										this.hform.HMainSourceBillType = 1401
+								    }else if (data.hSourceBillTypeField == "1102") {
+										this.HMainSourceBillType = '閲囪喘璁㈠崟'
+										this.hform.HMainSourceBillType = 1102
 										this.showHMainSourceBillType = false
 								    }else {
 								        this.HMainSourceBillType = '鎵嬪伐褰曞叆'
@@ -858,16 +455,40 @@
 								    if (data.hMulSourceFlagField == 0) {
 										this.showHSourceBillNo = false
 								    }
-								    //瀹㈡埛涓嶅彲缂栬緫
+								    //渚涘簲鍟嗕笉鍙紪杈�
 									this.showHSupName = false
 									this.tabs = 2
 								}else {//鐗╂枡鏉＄爜
 									this.tabs = 2
 									if(!this.hform.HSourceBillNo){
-										this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-										this.hform.HMainSourceBillType = -1
-										this.showHMainSourceBillType = false
-										this.showHSourceBillNo = false
+										this.hform.HSupName = data.hSupNameField
+										this.hform.HSupID = data.hSupIDField
+										this.hform.HSourceBillNo = data.hSourceBillNoField
+										if (data.hDeptIDField != 0) {
+											this.hform.HDeptID = data.hDeptIDField
+											this.hform.HDeptName = data.hDeptNameField
+										}
+										console.log(data)
+										//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+										this.hform.HMainSourceBillType = data.hSourceBillTypeField
+										if (data.hSourceBillTypeField == "1103") {
+											this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
+											this.hform.HMainSourceBillType = 1103
+											this.showHMainSourceBillType = false
+										}else if (data.hSourceBillTypeField == "1102") {
+											this.HMainSourceBillType = '閲囪喘璁㈠崟'
+											this.hform.HMainSourceBillType = 1102
+											this.showHMainSourceBillType = false
+										}else {
+										    this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+											this.hform.HMainSourceBillType = -1
+										    this.showHMainSourceBillType = false
+										}
+										if (data.hMulSourceFlagField == 0) {
+											this.showHSourceBillNo = false
+										}
+										//渚涘簲鍟嗕笉鍙紪杈�
+										this.showHSupName = false
 									}
 								}
 								//鏄剧ず琛ㄤ綋鏄庣粏
@@ -894,18 +515,13 @@
 			//鐗╂枡淇℃伅
 			DisBillEntryList(){
 				uni.request({
-				    url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json', 
-					data: { HInterID: this.hform.HInterID, HBillNo: this.hform.HBillNo, HBillType: this.hform.HBillType, HStockOrgID: this.hform.HStockOrgID },
+				    url: this.serverUrl + '/WEBSController/GetKf_PonderationBillMain_Temp_BillCheck_New_Json', 
+					data: { HInterID: this.hform.HInterID, HBillType: this.hform.HBillType, HSourceBarCodeCtl: this.hform.HSourceBarCodeCtl, sWhere: '' },
 				    success: (res) => {
 						console.log('鐗╂枡',res.data)
 						if(res.data.count == 1){
 							var data = res.data.data
 							this.Materlist = data.Materlist
-							if (data.FIFOlist.length != 0) {
-							    if (data.FIFOlist[0].HMaterID != 0) {
-							       this.FIFOlist = data.FIFOlist
-							    }
-							}
 							if(!data.BarCodeDetailslist[0].HBarCode){
 								this.hform.HMaterName_B = ''
 								this.hform.HMaterModel_B = ''
@@ -949,8 +565,8 @@
 				    success: (res) => {
 				        if (res.confirm) {
 				            uni.request({
-				                url: this.serverUrl + '/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json', 
-				            	data: { HInterID: this.hform.HInterID, HMaterID: item.HMaterID, HAuxPropID: item.HAuxPropID, HMTONo: item.HMTONo, HSourceInterID: item.HSourceInterID, HSourceEntryID: item.HSourceEntryID, HBillType: this.hform.HBillType },
+				                url: this.serverUrl + '/WEBSController/set_DeleteBarCodeByEntryID_BillCheck_New_Json', 
+				            	data: { HInterID: this.hform.HInterID, HBillType: this.hform.HBillType,HSourceInterID:item.HSourceInterID,HSourceEntryID:item.HSourceEntryID,HSourceBarCodeCtl:this.hform.HSourceBarCodeCtl },
 				                success: (res) => {
 				            		if(res.data.count == 1){
 				            			this.DisBillEntryList()
@@ -973,108 +589,10 @@
 				    }
 				});
 			},
-			//鏂板
-			getNewData(){
-				uni.request({
-				    url: this.serverUrl + '/WEBSController/GetMaxBillNoAndID_Json', 
-					data: { HBillType: this.hform.HBillType },
-				    success: (res) => {
-						// console.log(res.data)
-						if(res.data.count == 1){
-							this.hform.HInterID = res.data.data[0].HInterID
-							this.hform.HBillNo = res.data.data[0].HBillNo
-						}else{
-							uni.showToast({
-								title:res.data.Message,
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-			},
-			//淇敼鍥炲～鏁版嵁
-			RoadBillMain(HInterID){
-				uni.request({
-				    url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json', 
-					data: {HInterID: HInterID,HBillType:this.hform.HBillType},
-				    success: (res) => {
-				        console.log(33,res.data.data[0]);
-						if(res.data.count == 1){
-							var data = res.data.data[0]
-							this.hform.HInterID = data.HInterID
-							this.hform.HBillNo = data.HBillNo
-							this.hform.HMainSourceBillType = data.HSourceBillType
-							this.hform.HSourceBillNo = data.HSourceBillNo
-							if(data.HSourceBillType == 1402){
-								this.hform.HMainSourceBillType = 1402
-								this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
-								this.showHSupName = false
-							}else if(data.HSourceBillType == 1401){
-								this.hform.HMainSourceBillType = 1401
-								this.HMainSourceBillType = '閿�鍞鍗�'
-								this.showHSupName = false
-							}else{
-								this.hform.HMainSourceBillType = -1
-								this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-							}
-							this.showHMainSourceBillType = false
-							
-							//闈炲婧愬崟妯″紡
-							if (data.HMulSourceBill == 0) {
-								this.showHSourceBillNo = false
-							}
-							this.hform.HDeptID = data.HDeptID
-							this.hform.HDeptName = data.HDeptName
-							this.hform.HSupID = data.HCusID
-							this.hform.HSupName = data.HCusName
-							this.DisBillEntryList()
-							this.tabs = 2
-						}else{
-							uni.showToast({
-								title:'鑾峰彇鏁版嵁鍥炲～澶辫触',
-								icon:'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
-						})
-					},
-				});
-			},
             submit() {
-				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佸鎴锋枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
-				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:'鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+            			title:'娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忓崟鎹潯鐮侊紒',
             			icon:'none'
             		})
 				}else if(!this.hform.HBillNo){
@@ -1105,7 +623,7 @@
 						})
 						var sMainStr = JSON.stringify(this.hform);
 						uni.request({
-						    url: this.serverUrl + '/WEBSController/set_SaveSellOutBill_Json',
+						    url: this.serverUrl + '/WEBSController/set_SaveMateOutBill_BillCheck_Json',
 							method:'POST',
 							dataType:"json",
 							data:{ oMain: sMainStr },
@@ -1120,13 +638,13 @@
 									        if (res.confirm) {
 									            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
 												uni.redirectTo({
-													url:'/pages/xiaoshouchuku/form?OperationType=1'
+													url:'/pages/shengchanlingliao/form?OperationType=1'
 												})
 									        } else if (res.cancel) {
 									            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
 												setTimeout(()=>{
 													uni.navigateBack();
-												},500)
+												},50)
 									        }
 									    }
 									});
@@ -1157,7 +675,7 @@
 				        if (res.confirm) {
 				            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
 							uni.redirectTo({
-								url:'/pages/xiaoshouchuku/table'
+								url:'/pages/caigouruku/table'
 							})
 				        } else if (res.cancel) {
 				            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');

--
Gitblit v1.9.1