From eee0fa628f3aa19a572ebbb9c725513bff74f544 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 18 七月 2025 15:02:15 +0800
Subject: [PATCH] 完成 委外领料校验 采购入库校验 其他入库校验 委外补料校验

---
 pages/caigourukujiaoyan/form.vue      |   33 ++-
 pages/qitarukujiaoyan/table.vue       |    5 
 pages/qitachukujiaoyan/detail.vue     |   12 +
 pages/xiaoshouchukujiaoyan/form.vue   |   10 +
 pages/qitarukujiaoyan/form.vue        |   31 ++-
 pages/weiwailingliaojiaoyan/form.vue  |   13 +
 pages/shengchanbuliaojiaoyan/form.vue |   12 +
 pages/weiwaibuliaojiaoyan/table.vue   |  355 +++++++++++++++++++++-----------------
 pages/weiwaibuliaojiaoyan/form.vue    |   38 ++-
 9 files changed, 309 insertions(+), 200 deletions(-)

diff --git a/pages/caigourukujiaoyan/form.vue b/pages/caigourukujiaoyan/form.vue
index 201f4ad..e302f62 100644
--- a/pages/caigourukujiaoyan/form.vue
+++ b/pages/caigourukujiaoyan/form.vue
@@ -75,6 +75,9 @@
 						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
 					</view>
 				</view>
+				<label class="checkbox" style="float: right;">
+					<checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc"/>鏉$爜鏍稿
+				</label>
 			</view>
 			<view v-if="tabs == 2">
 				<view class="list" v-for="(item,index) in Materlist" :key="index">
@@ -200,7 +203,7 @@
 
 				Materlist: [],
 				hform: {
-					HBillType: 1206,
+					HBillType: 1201,
 					HBillerID: uni.getStorageSync('HBillerID'),
 					HRedBlueFlag: false,
 
@@ -217,7 +220,7 @@
 					HStockOrgName: uni.getStorageSync('Organization'),
 					HStockOrgID: uni.getStorageSync('OrganizationID'),
 					HSourceBarCodeCtl: "N", //鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
-					chkHBarflag: 1,
+					chkHBarflag: false,
 					HBarflag: 'Y',
 
 					HBarCode_B: '',
@@ -458,25 +461,26 @@
 					if (sHQty == "") {
 						sHQty = 0;
 					}
+					console.log("鍗曟嵁淇℃伅: ", this.hform)
 					uni.request({
-						url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
+						url: this.serverUrl + '/WEBSController/get_CheckTypeByBarCode_BillCheck_Json',
 						data: {
 							sBarCode: sBarCode,
-							HInterID: this.hform.HInterID,
+							HBillID: this.hform.HInterID || 0,
 							HBillType: this.hform.HBillType,
 							HBillNo: this.hform.HBillNo,
 							HMaker: this.hform.HMaker,
 							HWhID: sHWHID,
 							HSPID: sHSPID,
 							HQty: sHQty,
-							HRedBlueFlag: this.hform.HRedBlueFlag,
-							SourceFlag: HSourceFlag,
-							HSourceBillNo: sSourceBillNo,
-							HSourceBillType: sSourceBillType,
+							// HRedBlueFlag: this.hform.HRedBlueFlag,
+							// SourceFlag: HSourceFlag,
+							// HSourceBillNo: sSourceBillNo,
+							// HSourceBillType: sSourceBillType,
 							HStockOrgID: this.hform.HStockOrgID,
-							HScanStyle: "",
-							HCustom1: "",
-							HCustom2: ""
+							// HScanStyle: "",
+							// HCustom1: "",
+							// HCustom2: ""
 						},
 						success: (res) => {
 							console.log('鎵爜杩斿洖', res.data);
@@ -943,5 +947,12 @@
 				text-align: center;
 			}
 		}
+		
+		.checkbox{
+			color: #888;
+			font-size: 28rpx;
+			margin-top: 30rpx;
+			float: right;
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/qitachukujiaoyan/detail.vue b/pages/qitachukujiaoyan/detail.vue
index dd953a7..0650255 100644
--- a/pages/qitachukujiaoyan/detail.vue
+++ b/pages/qitachukujiaoyan/detail.vue
@@ -75,6 +75,9 @@
 						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
 					</view>
 				</view>
+				<label class="checkbox" style="float: right;">
+					<checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc"/>鏉$爜鏍稿
+				</label>
 			</view>
 			<view v-if="tabs == 2">
 				<view class="list" v-for="(item,index) in Materlist" :key="index">
@@ -217,7 +220,7 @@
 					HStockOrgName: uni.getStorageSync('Organization'),
 					HStockOrgID: uni.getStorageSync('OrganizationID'),
 					HSourceBarCodeCtl: "N", //鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
-					chkHBarflag: 1,
+					chkHBarflag: false,
 					HBarflag: 'Y',
 
 					HBarCode_B: '',
@@ -943,5 +946,12 @@
 				text-align: center;
 			}
 		}
+		
+		.checkbox{
+			color: #888;
+			font-size: 28rpx;
+			margin-top: 30rpx;
+			float: right;
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/qitarukujiaoyan/form.vue b/pages/qitarukujiaoyan/form.vue
index ed02be9..7192c13 100644
--- a/pages/qitarukujiaoyan/form.vue
+++ b/pages/qitarukujiaoyan/form.vue
@@ -75,6 +75,9 @@
 						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
 					</view>
 				</view>
+				<label class="checkbox" style="float: right;">
+					<checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc"/>鏉$爜鏍稿
+				</label>
 			</view>
 			<view v-if="tabs == 2">
 				<view class="list" v-for="(item,index) in Materlist" :key="index">
@@ -208,7 +211,7 @@
 					HStockOrgName: uni.getStorageSync('Organization'),
 					HStockOrgID: uni.getStorageSync('OrganizationID'),
 					HSourceBarCodeCtl: "N", //鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
-					chkHBarflag: 1,
+					chkHBarflag: false,
 					HBarflag: 'Y',
 
 					HBarCode_B: '',
@@ -450,24 +453,24 @@
 						sHQty = 0;
 					}
 					uni.request({
-						url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
+						url: this.serverUrl + '/WEBSController/get_CheckTypeByBarCode_BillCheck_Json',
 						data: {
 							sBarCode: sBarCode,
-							HInterID: this.hform.HInterID,
+							HBillID: this.hform.HInterID || 0,
 							HBillType: this.hform.HBillType,
 							HBillNo: this.hform.HBillNo,
 							HMaker: this.hform.HMaker,
 							HWhID: sHWHID,
 							HSPID: sHSPID,
 							HQty: sHQty,
-							HRedBlueFlag: this.hform.HRedBlueFlag,
-							SourceFlag: HSourceFlag,
-							HSourceBillNo: sSourceBillNo,
-							HSourceBillType: sSourceBillType,
+							// HRedBlueFlag: this.hform.HRedBlueFlag,
+							// SourceFlag: HSourceFlag,
+							// HSourceBillNo: sSourceBillNo,
+							// HSourceBillType: sSourceBillType,
 							HStockOrgID: this.hform.HStockOrgID,
-							HScanStyle: "",
-							HCustom1: "",
-							HCustom2: ""
+							// HScanStyle: "",
+							// HCustom1: "",
+							// HCustom2: ""
 						},
 						success: (res) => {
 							console.log('鎵爜杩斿洖', res.data);
@@ -758,7 +761,7 @@
 					success: (res) => {
 						if (res.confirm) {
 							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-							uni.redirectTo({
+							uni.navigateBack({
 								url: '/pages/qitaruku/table'
 							})
 						} else if (res.cancel) {
@@ -934,5 +937,11 @@
 				text-align: center;
 			}
 		}
+		.checkbox{
+			color: #888;
+			font-size: 28rpx;
+			margin-top: 30rpx;
+			float: right;
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/qitarukujiaoyan/table.vue b/pages/qitarukujiaoyan/table.vue
index 3b2acc6..03ebec4 100644
--- a/pages/qitarukujiaoyan/table.vue
+++ b/pages/qitarukujiaoyan/table.vue
@@ -134,6 +134,11 @@
 			this.changeTab(0)
 			console.log(this.userInfo,uni.getStorageSync('HUserName'))
 		},
+		onShow() {
+			this.CheckModRight()
+			this.changeTab(0)
+			console.log(this.userInfo,uni.getStorageSync('HUserName'))
+		},
 		onReachBottom: function() {
 			this.page++
 			setTimeout(() => {
diff --git a/pages/shengchanbuliaojiaoyan/form.vue b/pages/shengchanbuliaojiaoyan/form.vue
index 4acdf5a..cff3e7a 100644
--- a/pages/shengchanbuliaojiaoyan/form.vue
+++ b/pages/shengchanbuliaojiaoyan/form.vue
@@ -70,6 +70,9 @@
 						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
 					</view>
 				</view>
+				<label class="checkbox" style="float: right;">
+					<checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc"/>鏉$爜鏍稿
+				</label>
 			</view>
 			<view v-if="tabs == 2">
 				<view class="list" v-for="(item,index) in Materlist" :key="index">
@@ -209,7 +212,7 @@
 					HStockOrgName: uni.getStorageSync('Organization'),
 					HStockOrgID: uni.getStorageSync('OrganizationID'),
 					HSourceBarCodeCtl: "N", //鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
-					chkHBarflag: 1,
+					chkHBarflag: false,
 					HBarflag: 'Y',
 
 					HBarCode_B: '',
@@ -935,5 +938,12 @@
 				text-align: center;
 			}
 		}
+		
+		.checkbox{
+			color: #888;
+			font-size: 28rpx;
+			margin-top: 30rpx;
+			float: right;
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/weiwaibuliaojiaoyan/form.vue b/pages/weiwaibuliaojiaoyan/form.vue
index f079ba4..6b9fbc0 100644
--- a/pages/weiwaibuliaojiaoyan/form.vue
+++ b/pages/weiwaibuliaojiaoyan/form.vue
@@ -75,6 +75,9 @@
 						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
 					</view>
 				</view>
+				<label class="checkbox" style="float: right;">
+					<checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc"/>鏉$爜鏍稿
+				</label>
 			</view>
 			<view v-if="tabs == 2">
 				<view class="list" v-for="(item,index) in Materlist" :key="index">
@@ -208,7 +211,7 @@
 					HStockOrgName: uni.getStorageSync('Organization'),
 					HStockOrgID: uni.getStorageSync('OrganizationID'),
 					HSourceBarCodeCtl: "N", //鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
-					chkHBarflag: 1,
+					chkHBarflag: false,
 					HBarflag: 'Y',
 
 					HBarCode_B: '',
@@ -450,24 +453,24 @@
 						sHQty = 0;
 					}
 					uni.request({
-						url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
+						url: this.serverUrl + '/WEBSController/get_CheckTypeByBarCode_BillCheck_Json',
 						data: {
 							sBarCode: sBarCode,
-							HInterID: this.hform.HInterID,
+							HBillID: this.hform.HInterID || 0,
 							HBillType: this.hform.HBillType,
 							HBillNo: this.hform.HBillNo,
 							HMaker: this.hform.HMaker,
 							HWhID: sHWHID,
 							HSPID: sHSPID,
 							HQty: sHQty,
-							HRedBlueFlag: this.hform.HRedBlueFlag,
-							SourceFlag: HSourceFlag,
-							HSourceBillNo: sSourceBillNo,
-							HSourceBillType: sSourceBillType,
+							// HRedBlueFlag: this.hform.HRedBlueFlag,
+							// SourceFlag: HSourceFlag,
+							// HSourceBillNo: sSourceBillNo,
+							// HSourceBillType: sSourceBillType,
 							HStockOrgID: this.hform.HStockOrgID,
-							HScanStyle: "",
-							HCustom1: "",
-							HCustom2: ""
+							// HScanStyle: "",
+							// HCustom1: "",
+							// HCustom2: ""
 						},
 						success: (res) => {
 							console.log('鎵爜杩斿洖', res.data);
@@ -699,7 +702,7 @@
 						})
 						var sMainStr = JSON.stringify(this.hform);
 						uni.request({
-							url: this.serverUrl + 'WEBSController/set_SaveSellOutBill_BillCheck_Json',
+							url: this.serverUrl + '/WEBSController/set_SaveEntrustReplenishOutBill_BillCheck_Json',
 							method: 'POST',
 							dataType: "json",
 							data: {
@@ -716,7 +719,7 @@
 											if (res.confirm) {
 												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
 												uni.redirectTo({
-													url: '/pages/shengchanlingliao/form?OperationType=1'
+													url: '/pages/weiwaibuliaojiaoyan/form?OperationType=1'
 												})
 											} else if (res.cancel) {
 												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -758,8 +761,8 @@
 					success: (res) => {
 						if (res.confirm) {
 							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-							uni.redirectTo({
-								url: '/pages/qitachukujiaoyan/qitachukujiaoyan'
+							uni.navigateBack({
+								url: '/pages/weiwaibuliaojiaoyan/table'
 							})
 						} else if (res.cancel) {
 							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -934,5 +937,12 @@
 				text-align: center;
 			}
 		}
+		
+		.checkbox{
+			color: #888;
+			font-size: 28rpx;
+			margin-top: 30rpx;
+			float: right;
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/weiwaibuliaojiaoyan/table.vue b/pages/weiwaibuliaojiaoyan/table.vue
index 74ad0c6..394787f 100644
--- a/pages/weiwaibuliaojiaoyan/table.vue
+++ b/pages/weiwaibuliaojiaoyan/table.vue
@@ -4,9 +4,9 @@
 			<view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
 			<view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸蹭笂浼犲垪琛�</view>
 		</view>
-		
+
 		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
-		
+
 		<view class="form" v-if="tabs == 0">
 			<view class="buttons" @tap="add">
 				<uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
@@ -30,11 +30,12 @@
 				<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" v-if="tabs==0">
-			<uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+			<uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+				@tap="showDetail = showDetail==index?-1:index">
 				<view class="card-detail">
 					<view class="detail" v-if="item.鍒跺崟浜�">
 						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
@@ -64,7 +65,8 @@
 			</uni-card>
 		</view>
 		<view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==1">
-			<uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+			<uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+				@tap="showDetail = showDetail==index?-1:index">
 				<view class="card-detail">
 					<view class="detail" v-if="item.鍒跺崟浜�">
 						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
@@ -88,7 +90,7 @@
 						<text>缁勭粐锛�</text>{{item.缁勭粐}}
 					</view>
 				</view>
-		
+
 				<view class="more">
 					<view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
 						<uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>鎾ら攢
@@ -96,7 +98,7 @@
 				</view>
 			</uni-card>
 		</view>
-		
+
 		<view class="over" v-if="!listData || 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>
@@ -104,113 +106,121 @@
 </template>
 
 <script>
-	import { getUserInfo } from "@/utils/auth.js";
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
 	export default {
-	    data() {
-	        return {
-				userInfo:getUserInfo(),
-				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+		data() {
+			return {
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
 				tabs: 0,
-				urls:'/WEBSController/GetKf_PonderationBillMain_TempList_BillCheck_Json',
-				MvarReportTitle:'鐢熶骇琛ユ枡鍗曟牎楠岀紦瀛樺垪琛�',
-				hform:{
-					HBillNo:'',
-					HSourceBillNo:'',
+				urls: '/WEBSController/GetKf_PonderationBillMain_TempList_BillCheck_Json',
+				MvarReportTitle: '鐢熶骇琛ユ枡鍗曟牎楠岀紦瀛樺垪琛�',
+				hform: {
+					HBillNo: '',
+					HSourceBillNo: '',
 					HBillType: 1255,
 					HMaker: uni.getStorageSync('HUserName'),
 					HStockOrgID: uni.getStorageSync('OrganizationID'),
 				},
-				sWhere:'',
-				listData:[],
-				showList:[],
-				showDetail:-1,
-				
-				page:1,
-	        }
-	    },
+				sWhere: '',
+				listData: [],
+				showList: [],
+				showDetail: -1,
+
+				page: 1,
+			}
+		},
 		onLoad() {
+			// //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+			// this.CheckModRight()
+			// this.changeTab(0)
+			// console.log(this.userInfo, uni.getStorageSync('HUserName'))
+		},
+		onShow() {
 			//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
 			this.CheckModRight()
 			this.changeTab(0)
-			console.log(this.userInfo,uni.getStorageSync('HUserName'))
+			console.log(this.userInfo, uni.getStorageSync('HUserName'))
 		},
 		onReachBottom: function() {
 			this.page++
 			setTimeout(() => {
-				this.showList = this.showList.concat(this.getPage(this.page,this.listData))
+				this.showList = this.showList.concat(this.getPage(this.page, this.listData))
 			}, 100)
 		},
 		onPullDownRefresh: function() {
 			this.clear()
-			setTimeout(()=>{
+			setTimeout(() => {
 				uni.stopPullDownRefresh();
 			}, 1000);
 		},
-	    methods: {
-			CheckModRight(){
+		methods: {
+			CheckModRight() {
 				uni.request({
-				    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
-					data:{ 
+					url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+					data: {
 						ModRightName: 'CE_EntrustReplenishOutCheck',
 						HUserName: uni.getStorageSync('HUserName')
 					},
-				    success: (res) => {
-						if(res.data.count == 1){}else{
+					success: (res) => {
+						if (res.data.count == 1) {} else {
 							uni.showToast({
-								title:res.data.Message,
-								icon:'none'
+								title: res.data.Message,
+								icon: 'none'
 							})
 						}
 					},
 					fail: (res) => {
 						console.log(res);
 						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
 						})
 					},
 				});
 			},
-			getPage(page,list){
+			getPage(page, list) {
 				let sindex = (parseInt(page) - 1) * 20
 				let eindex = parseInt(page) * 20
-				let newList = list.slice(sindex,eindex)
+				let newList = list.slice(sindex, eindex)
 				return newList
 			},
-			changeTab(e){
+			changeTab(e) {
 				this.tabs = e
 				this.page = 1
 				this.showList = []
-				
-				if(this.tabs == 0){
+
+				if (this.tabs == 0) {
 					this.urls = '/WEBSController/GetKf_PonderationBillMain_TempList_BillCheck_Json'
 				}
-				if(this.tabs == 1){
+				if (this.tabs == 1) {
 					this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_BillCheck_Json'
 				}
 				this.getList()
 			},
-			getList(){
+			getList() {
 				uni.showLoading({
-					title:'鍔犺浇涓�...'
+					title: '鍔犺浇涓�...'
 				})
 				uni.request({
-				    url: this.serverUrl + this.urls,
-					data:this.hform,
-				    success: (res) => {
-				        console.log(1,res);
-						if(res.data.count == 1){
+					url: this.serverUrl + this.urls,
+					data: this.hform,
+					success: (res) => {
+						console.log(1, res);
+						if (res.data.count == 1) {
 							this.listData = res.data.data
-							this.showList = this.getPage(this.page,this.listData)
-							setTimeout(()=>{
-							     uni.hideLoading()
+							this.showList = this.getPage(this.page, this.listData)
+							setTimeout(() => {
+								uni.hideLoading()
 							}, 1000)
-						}else{
+						} else {
 							uni.hideLoading()
 							this.listData = []
 							uni.showToast({
-								title:res.data.Message,
-								icon:'none'
+								title: res.data.Message,
+								icon: 'none'
 							})
 						}
 					},
@@ -218,18 +228,18 @@
 						console.log(res);
 						uni.hideLoading()
 						uni.showToast({
-							title:'鎺ュ彛璇锋眰澶辫触',
-							icon:'none'
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
 						})
 					},
 				});
 			},
-			search(){
+			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 + "%'";
@@ -239,260 +249,283 @@
 				// }
 				this.getList()
 			},
-			clear(){
+			clear() {
 				this.listData = []
 				this.page = 1
 				this.showList = []
-				
+
 				this.sWhere = ''
 				this.hform = {
-					HBillNo:'',
-					HSourceBillNo:'',
+					HBillNo: '',
+					HSourceBillNo: '',
 					HBillType: 1255,
 					HMaker: uni.getStorageSync('HUserName'),
 					HStockOrgID: uni.getStorageSync('OrganizationID'),
 				}
 				this.getList()
 			},
-			add(){
+			add() {
 				uni.navigateTo({
-					url:'./form?OperationType=1'
+					url: './form?OperationType=1'
 				})
 			},
 			//缂栬緫
-			edit(item){
+			edit(item) {
 				console.log(item)
 				uni.navigateTo({
-					url:'./form?OperationType=2&HBillNo=' + item.HBillNo
+					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'
-	// 					})
-	// 				},
-	// 			})
+				// 			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){
+			del(item) {
 				// console.log(item.hmainid,uni.getStorageSync('HUserName'))
 				uni.showModal({
-				    title: '鎻愮ず',
-				    content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
-				    success: (res) => {
-				        if (res.confirm) {
-				            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+					title: '鎻愮ず',
+					content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
 							uni.request({
-							    url: this.serverUrl + '/WEBSController/DeleteTempBillList_BillCheck_Json',
-								data:{ 
+								url: this.serverUrl +
+									'/WEBSController/DeleteTempBillList_BillCheck_Json',
+								data: {
 									HInterID: item.HInterID,
 									HBillNo: item.鍗曟嵁鍙�,
 									HBillType: this.hform.HBillType,
 									HMaker: uni.getStorageSync('HUserName'),
-									HStockOrgID:this.hform.HStockOrgID,
-									MvarReportTitle:this.MvarReportTitle,
+									HStockOrgID: this.hform.HStockOrgID,
+									MvarReportTitle: this.MvarReportTitle,
 								},
-							    success: (res) => {
-							        console.log(1,res);
-									if(res.data.count == 1){
+								success: (res) => {
+									console.log(1, res);
+									if (res.data.count == 1) {
 										this.clear()
 									}
 									uni.showToast({
-										title:res.data.Message,
-										icon:'none'
+										title: res.data.Message,
+										icon: 'none'
 									})
 								},
 								fail: (res) => {
 									console.log(res);
 									uni.hideLoading()
 									uni.showToast({
-										title:'鎺ュ彛璇锋眰澶辫触',
-										icon:'none'
+										title: '鎺ュ彛璇锋眰澶辫触',
+										icon: 'none'
 									})
 								},
 							});
-				        } else if (res.cancel) {
-				            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-				        }
-				    }
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
 				});
 			},
 			//鎾ら攢
-			revoke(item){
+			revoke(item) {
 				// console.log(item.hmainid,uni.getStorageSync('HUserName'))
 				uni.showModal({
-				    title: '鎻愮ず',
-				    content: '鏄惁纭鎾ら攢',
-				    success: (res) => {
-				        if (res.confirm) {
-				            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+					title: '鎻愮ず',
+					content: '鏄惁纭鎾ら攢',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
 							uni.request({
-							    url: this.serverUrl + '/WEBSController/set_DeleteICStockBillAndWMS_BillCheck_Json',
-								data:{ 
+								url: this.serverUrl +
+									'/WEBSController/set_DeleteICStockBillAndWMS_BillCheck_Json',
+								data: {
 									HInterID: item.HInterID,
 									HBillNo: item.鍗曟嵁鍙�,
 									HBillType: this.hform.HBillType,
 									HMaker: uni.getStorageSync('HUserName'),
-									HStockOrgID:this.hform.HStockOrgID,
-									MvarReportTitle:this.MvarReportTitle,
+									HStockOrgID: this.hform.HStockOrgID,
+									MvarReportTitle: this.MvarReportTitle,
 								},
-							    success: (res) => {
-							        console.log(1,res);
-									if(res.data.count == 1){
+								success: (res) => {
+									console.log(1, res);
+									if (res.data.count == 1) {
 										this.clear()
 									}
 									uni.showToast({
-										title:res.data.Message,
-										icon:'none'
+										title: res.data.Message,
+										icon: 'none'
 									})
 								},
 								fail: (res) => {
 									console.log(res);
 									uni.hideLoading()
 									uni.showToast({
-										title:'鎺ュ彛璇锋眰澶辫触',
-										icon:'none'
+										title: '鎺ュ彛璇锋眰澶辫触',
+										icon: 'none'
 									})
 								},
 							});
-				        } else if (res.cancel) {
-				            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-				        }
-				    }
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
 				});
 			},
-	    }
+		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.form{
+	.form {
 		width: 640rpx;
 		margin: 20rpx auto;
 		margin-top: 90rpx;
 	}
-	.tabs{
+
+	.tabs {
 		width: 100%;
 		position: fixed;
 		left: 0;
 		z-index: 9;
 		display: flex;
 		background-color: #e5e5e5;
-		view{
+
+		view {
 			width: 50%;
 			font-size: 30rpx;
 			color: #333;
 			text-align: center;
 			padding: 16rpx 0;
 		}
-		.on{
+
+		.on {
 			color: #3a78ff;
 			font-weight: bold;
 			border-bottom: 3px solid #3a78ff;
 		}
 	}
-	.buttons{
+
+	.buttons {
 		width: 100%;
 		display: flex;
 		justify-content: center;
 		margin-top: 20rpx;
-		button{
+
+		button {
 			border-radius: 50rpx;
 			width: 180rpx;
 			height: 66rpx;
 			line-height: 66rpx;
 			font-size: 28rpx;
 		}
-		.btn-a{
+
+		.btn-a {
 			background-color: #acacac;
 			color: #fff;
 		}
-		.btn-b{
+
+		.btn-b {
 			background-color: #41a863;
 			color: #fff;
 		}
-		.btn-c{
+
+		.btn-c {
 			background-color: #3a78ff;
 			color: #fff;
 		}
 	}
-    .form-item{
+
+	.form-item {
 		display: flex;
 		align-items: center;
 		font-size: 28rpx;
 		padding: 6rpx 0;
-		.title{
+
+		.title {
 			width: 180rpx;
-			text{
+
+			text {
 				color: red;
 				font-weight: bold;
 			}
 		}
-		.right{
+
+		.right {
 			width: 450rpx;
 			border-radius: 22rpx;
 			border: 1px solid #acacac;
 		}
-		.righton{
+
+		.righton {
 			width: 450rpx;
 			border-radius: 22rpx;
 			border: 1px solid #e4e4e4;
 			background-color: #e4e4e4;
 		}
-		input{
+
+		input {
 			width: 100%;
 			padding: 8rpx 20rpx;
 			font-size: 30rpx;
 		}
 	}
-	.list{
+
+	.list {
 		width: 100%;
-		.card-detail{
+
+		.card-detail {
 			width: 100%;
 			display: flex;
 			flex-wrap: wrap;
 			justify-content: space-between;
 			line-height: 120%;
-			.detail{
+
+			.detail {
 				// width: 50%;
 				font-size: 26rpx;
 				margin-bottom: 12rpx;
 				color: #555;
 				margin-right: 20rpx;
-				text{
+
+				text {
 					color: #999;
 					font-size: 26rpx;
 				}
 			}
 		}
-		.more{
+
+		.more {
 			color: #888;
 			font-size: 26rpx;
 			display: flex;
 			border-top: 1px solid #eee;
 			padding-top: 20rpx;
-			.part{
+
+			.part {
 				width: 50%;
-				display: flex;align-items: center;justify-content: center;
+				display: flex;
+				align-items: center;
+				justify-content: center;
 			}
 		}
 	}
-
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/weiwailingliaojiaoyan/form.vue b/pages/weiwailingliaojiaoyan/form.vue
index 0b2371c..1e8c975 100644
--- a/pages/weiwailingliaojiaoyan/form.vue
+++ b/pages/weiwailingliaojiaoyan/form.vue
@@ -75,6 +75,10 @@
 						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
 					</view>
 				</view>
+				
+				<label class="checkbox" style="float: right;">
+					<checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc"/>鏉$爜鏍稿
+				</label>
 			</view>
 			<view v-if="tabs == 2">
 				<view class="list" v-for="(item,index) in Materlist" :key="index">
@@ -208,7 +212,7 @@
 					HStockOrgName: uni.getStorageSync('Organization'),
 					HStockOrgID: uni.getStorageSync('OrganizationID'),
 					HSourceBarCodeCtl: "N", //鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
-					chkHBarflag: 1,
+					chkHBarflag: false,
 					HBarflag: 'Y',
 
 					HBarCode_B: '',
@@ -935,5 +939,12 @@
 				text-align: center;
 			}
 		}
+		
+		.checkbox{
+			color: #888;
+			font-size: 28rpx;
+			margin-top: 30rpx;
+			float: right;
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/xiaoshouchukujiaoyan/form.vue b/pages/xiaoshouchukujiaoyan/form.vue
index 7c757f7..277dbcc 100644
--- a/pages/xiaoshouchukujiaoyan/form.vue
+++ b/pages/xiaoshouchukujiaoyan/form.vue
@@ -75,6 +75,9 @@
 						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
 					</view>
 				</view>
+				<label class="checkbox" style="float: right !important;">
+					<checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc"/>鏉$爜鏍稿
+				</label>
 			</view>
 			<view v-if="tabs == 2">
 				<view class="list" v-for="(item,index) in Materlist" :key="index">
@@ -194,6 +197,7 @@
 					HBillType: 1205,
 					HBillerID: uni.getStorageSync('HBillerID'),
 					HRedBlueFlag: false,
+					chkHBarflag:false,
 
 					HBarCode: '',
 					HQty: '',
@@ -934,5 +938,11 @@
 				text-align: center;
 			}
 		}
+		
+		.checkbox{
+			color: #888;
+			font-size: 28rpx;
+			margin-top: 30rpx;
+		}
 	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1