From a04725356191f7f3c22b0521fcf3f9f028eb51b9 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 30 一月 2026 13:22:47 +0800
Subject: [PATCH] 调整调出单 调出调出仓库 获取函数

---
 pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue             |    1 
 pages.json                                                     |    7 
 pages/xiaoshouchuku/SellOutBill.vue                            |    2 
 pages/index/tab4.vue                                           |    7 
 pages/qitaruku_v2/OtherInBill.vue                              |    2 
 pages/shengchanrukushengdan/Kf_ProductInBill.vue               |   12 
 pages/caigouruku/POStockInBill.vue                             |    1 
 pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue |  879 +++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/caigoutuiliao/POStockInBackBill.vue                      |    1 
 manifest.json                                                  |    4 
 pages/fenbushidiaorudan/form_test.vue                          |   61 +++
 pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill.vue     |    1 
 pages/zhijiediaobo/MoveStockBill.vue                           |    4 
 pages/index/login.vue                                          |    2 
 pages/shengchanlingliao/PPickingCheckBill.vue                  |    1 
 pages/xiaoshoutuihuo/ICStockBillMain.vue                       |    2 
 pages/fenbushidiaochudan/form_out.vue                          |   29 +
 pages/qitachuku_v2/OtherOutBill.vue                            |    1 
 18 files changed, 995 insertions(+), 22 deletions(-)

diff --git a/manifest.json b/manifest.json
index b542431..885d8fe 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "鏅轰簯LMES",
     "appid" : "__UNI__B002F49",
     "description" : "",
-    "versionName" : "2.0.66",
-    "versionCode" : 266,
+    "versionName" : "2.0.68",
+    "versionCode" : 268,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index ae32e70..d439813 100644
--- a/pages.json
+++ b/pages.json
@@ -1723,6 +1723,13 @@
 		    {
 		        "navigationBarTitleText" : "鐗规壒鍗�"
 		    }
+		},
+		{
+		    "path" : "pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP",
+		    "style" : 
+		    {
+		        "navigationBarTitleText" : "閿�鍞嚭搴撳崟(楠岃瘉)"
+		    }
 		}
 		
 
diff --git a/pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue b/pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
new file mode 100644
index 0000000..54cea81
--- /dev/null
+++ b/pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
@@ -0,0 +1,879 @@
+<template>
+	<view>
+        <!-- 鍩烘湰淇℃伅 -->
+        
+		<view class="tabs horizon_tabs" id="tabs">
+			<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
+			<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
+			<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
+			<view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鍣ㄥ叿淇℃伅</view>
+			<view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">鏉$爜淇℃伅</view>
+			<view :class="tabs == 5 ? 'on':''" @tap="tabs = 5">涓嬫灦淇℃伅</view>
+		</view>
+		<!-- 閫夋嫨婧愬崟 -->
+		<template v-if="tabs == 0">
+			<view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+			</view>
+		</template>
+        
+        <!-- 琛ㄥご淇℃伅 -->
+        <template v-if="tabs == 1">
+        	<view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+        	</view>
+        </template>
+
+		<!-- 鐗╂枡淇℃伅 -->
+		<template v-if="tabs == 2">
+			<view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+				
+			</view>
+		</template>
+        
+        <!-- 鍣ㄥ叿淇℃伅 -->
+        <template v-if="tabs == 3">
+        	<view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+        	</view>
+        </template>
+        
+        <!-- 鏉$爜淇℃伅 -->
+        <template v-if="tabs == 4">
+        	<view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+        	</view>
+        </template>
+        
+        <!-- 涓嬫灦淇℃伅 -->
+        <template v-if="tabs == 5">
+        	<view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+        	</view>
+        </template>
+		<!-- 鎿嶄綔鎸夐挳 -->
+		<view class="buttons" id="buttons">
+			<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			<view style="flex: 1;"></view>
+			<button class="btn-a" v-if="operationType!=4" size="mini" @tap="addNew">鏂板</button>
+			<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import dayjs from "dayjs";
+	import {
+		CommonUtils
+	} from "@/utils/common";
+	import {
+		MpaasScan
+	} from "@/utils/mpaasScan.js"
+	import {
+		getUserInfo
+	} from "../../../utils/auth";
+
+	export default {
+		// 閿�鍞嚭搴撳崟(楠岃瘉)
+		name: 'Kf_SellOutBill_CusBar_APP',
+		data() {
+			return {
+				tabs: 0,
+				
+				btnTop: 0,
+				tabsBottom: 0,
+				HModName: "Sb_EqpMaintenanceBill",
+				HBillType: '3910',
+				operationType: 1,
+				uploadOptions: {},
+				enableEdit: true,
+				enableSourceBillEdit: true,
+
+				// 婧愬崟绫诲瀷鐩稿叧
+				HMainSourceBillType: "璁惧缁翠慨鐧昏鍗�", // 鐢ㄤ簬鏄剧ず鐨勬簮鍗曠被鍨�
+				arrayHMainSourceBillType: ['璁惧缁翠慨鐧昏鍗�', '鎵嬪伐褰曞叆', '璁惧缁翠慨娲惧伐鍗�'],
+				arrayHMainSourceBillTypeID: ['璁惧缁翠慨鐧昏鍗�', '鎵嬪伐褰曞叆', '璁惧缁翠慨娲惧伐鍗�'], // 瀵瑰簲鐨勫崟鎹被鍨婭D
+				showHMainSourceBillType: true,
+
+				HDeptList: [],
+				HRepairCheckList: [],
+				HEmpList: [],
+				HRepairList: [],
+
+				hform: {
+					HBillType: '3910',
+					HStockOrgID: uni.getStorageSync("OrganizationID"),
+					HBarCode: "",
+					HBarCode: '',
+					HRepairBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+					HRepairEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+					HRepairContent: '',
+					HBillNo: '',
+					HInterID: 0,
+					HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+					HDeptName: getUserInfo().HDeptName,
+					HDeptID: getUserInfo().HDeptID,
+					HEmpName: getUserInfo().HEmpName,
+					HEmpID: getUserInfo().HEmpID,
+					HRepair: '',
+					HRepairID: 0,
+					HExplanation: '',
+					HMainSourceBillType: '璁惧缁翠慨鐧昏鍗�', // 榛樿涓鸿澶囩淮淇櫥璁板崟
+					HMainSourceBillNo: '',
+					HMainSourceInterID: 0,
+					HMainSourceEntryID: 0,
+					HManagerName: getUserInfo().HManagerName,
+					HManagerID: getUserInfo().HManagerID,
+					HTimes: 0,
+					HCycleUnit: '灏忔椂',
+					HBarName: '',
+					HNumber: '',
+					HEquipID: 0,
+					HBarSpec: '',
+					HBarModel: '',
+					HMaker: getUserInfo()["Czymc"],
+					HChecker: '',
+					HCloseMan: '',
+					HUpDater: '',
+					HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
+					HCheckDate: '',
+					HCloseDate: '',
+					HUpDateDate: '',
+					HDeleteMan: '',
+					HDeleteDate: ''
+				},
+				HDetailList: [{
+					"HRepairID": 0,
+					"HRepairCode": "",
+					"HRepairName": "",
+					"HManagerID": 0,
+					"HManagerCode": "",
+					"HManagerName": "",
+					"HRepairExplanation": '',
+					"HRemark": "",
+					"HEmpID": '',
+					"HSourceInterID": 0,
+					"HSourceEntryID": 0,
+					"HSourceBillNo": ''
+				}]
+			};
+		},
+		computed: {
+			containerHeight: {
+				get() {
+					return this.btnTop - this.tabsBottom - 5
+				}
+			},
+		},
+		methods: {
+			// 鏄剧ず婧愬崟鍗曟嵁鍒楄〃寮圭獥
+			showBillList() {
+				this.$refs.billList.showPopup()
+			},
+
+			// 閫夋嫨婧愬崟绫诲瀷
+			HMainSourceBillTypeChange(e) {
+				if (e.detail.value == -1 || e.detail.value == NaN) {
+					this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+					this.hform.HMainSourceBillType = '鎵嬪伐褰曞叆'
+					return
+				}
+
+				this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+				this.hform.HMainSourceBillType = this.arrayHMainSourceBillTypeID[e.detail.value]
+
+				// 缂撳瓨褰撳墠椤甸潰閫夋嫨
+				const pages = getCurrentPages()
+				const currentPage = pages[pages.length - 1]
+				uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
+					HSourceBillTypeName: this.HMainSourceBillType,
+					HSourceBillType: this.hform.HMainSourceBillType
+				})
+			},
+
+			// 璇诲彇缂撳瓨
+			loadCache() {
+				const pages = getCurrentPages()
+				const currentPage = pages[pages.length - 1]
+				let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
+				if (HBillTypeCache) {
+					this.HMainSourceBillType = HBillTypeCache.HSourceBillTypeName
+					this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
+				}
+			},
+
+			// 缁翠慨椤圭洰
+			async getRepairList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Gy_Repair/GetRepairList',
+						data: {
+							sWhere: '',
+							user: getUserInfo()["Czymc"]
+						}
+					})
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HRepairList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: `鑾峰彇缁翠慨椤圭洰澶辫触: ${Message}`
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: `鑾峰彇缁翠慨椤圭洰澶辫触: ${err}`
+					})
+				}
+			},
+			// 鍒犻櫎鏄庣粏
+			delDetail(item) {
+
+			},
+			// 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
+			ValidCheck() {
+				if (this.hform.HEquipID == 0) {
+					return {
+						Message: "鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!",
+						state: false
+					}
+				}
+				if (this.hform.HDeptID == 0) {
+					return {
+						Message: "閮ㄩ棬涓嶅緱涓虹┖!",
+						state: false
+					}
+				}
+				if (this.hform.HEmpID == 0) {
+					return {
+						Message: "楠屾敹浜轰笉寰椾负绌�!",
+						state: false
+					}
+				}
+				if (this.hform.HRepairCheckMainID == 0) {
+					return {
+						Message: "缁翠慨椤圭洰涓嶅緱涓虹┖!",
+						state: false
+					}
+				}
+				if (this.hform.HManagerID == 0) {
+					return {
+						Message: "璐熻矗浜轰笉寰椾负绌�!",
+						state: false
+					}
+				}
+				if (this.hform.HMainSourceBillType !== '鎵嬪伐褰曞叆') {
+					if (!this.hform.HMainSourceBillNo || this.hform.HMainSourceBillNo.trim() === '') {
+						CommonUtils.showTips({
+							message: '婧愬崟绫诲瀷闈炴墜宸ュ綍鍏ワ紝蹇呴』閫夋嫨婧愬崟锛�'
+						})
+						return
+					}
+				}
+				return {
+					Message: "",
+					state: true
+				}
+			},
+			addNew() {
+				uni.redirectTo({
+					url: './Sb_EquipRepairSendWorkBill?operationType=1'
+				})
+			},
+			goBack() {
+				uni.navigateBack()
+			},
+			checkBoxChangeHandler(index, e) {
+				let cr = e.detail.value
+				if (cr.length == 0) {
+					this.HCheckFileList[index]["HDotCheckResult"] = false
+				} else {
+					this.HCheckFileList[index]["HDotCheckResult"] = true
+				}
+			},
+			uploadFile(index) {
+				console.log('filePath: ', this.attachmentInfo[index].filePath);
+				// 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
+				uni.uploadFile({
+					url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
+					filePath: this.attachmentInfo[index].filePath,
+					name: 'file',
+					formData: {
+						HBillNo: this.hform.HBillNo,
+						HRemark: "",
+						HUserName: getUserInfo()["Czymc"]
+					},
+					success: (uploadRes) => {
+						CommonUtils.showTips({
+							message: "涓婁紶鎴愬姛"
+						})
+						this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
+					},
+					fail: (err) => {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: `涓婁紶澶辫触: ${err}`
+						})
+					}
+				})
+			},
+			delFile(index) {
+				console.log('attachmentInfo: ', this.attachmentInfo[index]);
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+					success: (res) => {
+						if (res.confirm) {
+							this.attachmentInfo.splice(index, 1)
+						}
+					},
+				})
+
+			},
+			handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
+				console.log('file: ', res);
+				let fileInfo = res.data[0]
+				this.attachmentInfo.push({
+					fileName: fileInfo.name,
+					size: fileInfo.size,
+					status: '绛夊緟涓婁紶',
+					filePath: fileInfo.tempFilePath
+				})
+			},
+			// 涓婁紶鏂囦欢
+			fileUpload() {
+				this.$refs.XeUpload.upload('file', {});
+			},
+			//鑾峰彇鐝鏁版嵁
+			async getShiftList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Web/GetGy_ShiftsList_Json',
+						data: {
+							Shifts: "",
+						}
+					})
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HShiftsList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			async getHDeptList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Gy_Department/list',
+						data: {
+							sWhere: ` and HUSEORGID = ${uni.getStorageSync('OrganizationID')} `,
+							user: uni.getStorageSync('HUserName'),
+							Organization: uni.getStorageSync('Organization')
+						}
+					})
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HDeptList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			// 鑾峰彇鑱屽憳鏁版嵁
+			async getEmpList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/PublicPageMethod/UserList',
+						data: {
+							sWhere: " where 1=1",
+						}
+					})
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HEmpList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			// 鑾峰彇楠岃瘉椤圭洰鏁版嵁
+			async getCheckProjList() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: '/Gy_RepairCheck/GetRepairCheckList',
+						data: {
+							sWhere: "",
+							user: uni.getStorageSync('HUserName'),
+						}
+					})
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						this.HRepairCheckList = data
+					} else {
+						CommonUtils.showTips({
+							title: '娓╅Θ鎻愮ず',
+							message: Message
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: '娓╅Θ鎻愮ず',
+						message: err
+					})
+				}
+			},
+			toScanCode() {
+				MpaasScan.scanCode(cb => {
+					this.hform.HBarCode = cb
+					this.GetMessageByBarCode(cb)
+				})
+			},
+			toScanHMainSourceBillNo() {
+				MpaasScan.scanCode(cb => {
+					this.hfrom.HMainSourceBillNo = cb
+					this.GetMessageByHMainSourceBillNo(cb)
+				})
+			},
+			async GetMessageByHMainSourceBillNo(HSouceBillNo) {
+				try {
+					// 鏍规嵁婧愬崟绫诲瀷閫夋嫨涓嶅悓鐨勬帴鍙�
+					if (this.hform.HMainSourceBillType === '璁惧缁翠慨鐧昏鍗�') {
+						url = "/Sb_EqpRepairWorkBill/GetEqpConkBookBillListPage";
+						dataField = {
+							sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
+							user: getUserInfo()["Czymc"],
+							page: 1,
+							size: 1,
+						};
+					} else if (this.hform.HMainSourceBillType === '璁惧缁翠慨娲惧伐鍗�') {
+						url = "/Sb_EquipRepairSendWorkBill/GetEquipRepairSendWorkBillListPage";
+						dataField = {
+							sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
+							user: getUserInfo()["Czymc"],
+							page: 1,
+							size: 1,
+						};
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鏆備笉鏀寔璇ユ簮鍗曠被鍨嬶細${this.hform.HMainSourceBillType}`
+						})
+						return;
+					}
+
+					let res = await CommonUtils.doRequest2Async({
+						url: url,
+						data: dataField
+					})
+
+					let { count, Message, data } = res.data
+					if (count == 1) {
+						this.hform.HMainSourceBillNo = data[0]["鍗曟嵁鍙�"]
+						this.hform.HMainSourceInterID = data[0]["hmainid"]
+						this.hform.HMainSourceEntryID = data[0]["hsubid"]
+
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: `鑾峰彇婧愬崟鍗曞彿澶辫触: ${Message}`
+						})
+					}
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: `鑾峰彇婧愬崟鍗曞彿澶辫触: ${err}`
+					})
+				}
+			},
+			async GetMessageByBarCode(HBarCode) {
+				try {
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List",
+						data: {
+							HBarCode: HBarCode,
+						},
+					})
+
+
+					if (!res) {
+						return
+					}
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+
+					if (count == 1) {
+						console.log('data: ', data);
+						this.hform.HEquipID = data[0].hmainid
+						this.hform.HBarName = data[0].璁惧鍚嶇О
+						this.hform.HBarSpec = data[0].璁惧瑙勬牸
+						this.hform.HBarModel = data[0].璁惧鍨嬪彿
+						this.hform.HQty = 1
+
+						this.enableEdit = false
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: Message
+						})
+					}
+
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: err
+					})
+				}
+			},
+			radioChange({
+				detail: {
+					value
+				}
+			}) {
+				this.hform.HCheckResult = value
+			},
+			async getMaxNum() {
+				try {
+					let res = await CommonUtils.doRequest2Async({
+						url: "/Web/GetMAXNum",
+						data: {
+							"HBillType": this.HBillType
+						}
+					})
+					let {
+						count,
+						data,
+						Message
+					} = res.data
+					this.hform.HInterID = 0
+					this.hform.HBillNo = data[0]["HBillNo"]
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+					})
+				}
+			},
+			async submit() {
+				let valid = this.ValidCheck()
+				if (!valid.state) {
+					CommonUtils.showTips({
+						message: valid.Message
+					})
+					return
+				}
+                
+				try {
+					let oMain = JSON.stringify(this.hform);
+					this.HDetailList[0].HManagerID = this.hform.HManagerID
+					this.HDetailList[0].HRepairID = this.hform.HRepairID
+					this.HDetailList[0].HRepairExplanation = this.hform.HExplanation
+					this.HDetailList[0].HEmpID = this.hform.HEmpID
+					this.HDetailList[0].HSourceInterID = this.hform.HMainSourceInterID
+					this.HDetailList[0].HSourceEntryID = this.hform.HMainSourceEntryID
+					this.HDetailList[0].HSourceBillNo = this.hform.HMainSourceBillNo
+
+					let sSubStr = JSON.stringify(this.HDetailList);
+					let sMainSub = oMain + ';' + sSubStr;
+                    console.log('sMainSub: ',sMainSub);
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Sb_PDA_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList",
+						data: {
+							"msg": sMainSub
+						},
+						method: "POST"
+					})
+
+					if (!res) {
+						return
+					}
+
+					let {
+						count,
+						Message
+					} = res.data
+					if (count == 1) {
+						if (this.operationType == 4) {
+							uni.showModal({
+								title: '鎻愮ず',
+								content: res.data.Message + '銆傚嵆灏嗚繑鍥炰笂绾ч〉闈�',
+								showCancel: false,
+								success: (res) => {
+									if (res.confirm) {
+										console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+										setTimeout(() => {
+											uni.navigateBack();
+										}, 50)
+										// uni.redirectTo({
+										//     url: './Sb_EquipRepairSendWorkBill?operationType=1'
+										// })
+									} else if (res.cancel) {
+										console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+										setTimeout(() => {
+											uni.navigateBack();
+										}, 50)
+									}
+								}
+							});
+							return
+						}
+						uni.showModal({
+							title: '鎻愮ず',
+							content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+							success: (res) => {
+								if (res.confirm) {
+									console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+									uni.redirectTo({
+										url: './Sb_EquipRepairSendWorkBill?operationType=1'
+									})
+								} else if (res.cancel) {
+									console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+									setTimeout(() => {
+										uni.navigateBack();
+									}, 50)
+								}
+							}
+						});
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+						})
+					}
+
+
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: "鎻愪氦鍗曟嵁澶辫触: " + err
+					})
+				}
+			},
+			async getEquipFileMain(HInterID) {
+				try {
+					let res = await CommonUtils.doRequest2Sync({
+						url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_ListByHEquipID",
+						data: {
+							HEquipID: HInterID,
+						},
+					})
+
+
+					if (!res) {
+						return
+					}
+
+					let {
+						data,
+						count,
+						Message
+					} = res.data
+
+					if (count == 1) {
+						console.log('data: ', data);
+						this.hform.HEquipID = data[0].hmainid
+						this.hform.HBarName = data[0].璁惧鍚嶇О
+						this.hform.HBarSpec = data[0].璁惧瑙勬牸
+						this.hform.HBarModel = data[0].璁惧鍨嬪彿
+						this.hform.HQty = 1
+
+						this.enableEdit = false
+					} else {
+						CommonUtils.showTips({
+							title: "娓╅Θ鎻愮ず",
+							message: Message
+						})
+					}
+
+				} catch (err) {
+					CommonUtils.showTips({
+						title: "娓╅Θ鎻愮ず",
+						message: err
+					})
+				}
+			},
+            async getSourceBillInfo(HSourceBillType, HInterID, HBillNo) {
+                // 涓嬫帹鍗曟嵁绫诲瀷涓鸿澶囨晠闅滅櫥璁板崟
+                if(HSourceBillType == 3907) {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Sb_EqpRepairWorkBill/Sb_EqpConkBookBillListCheckDetai",
+                        data: {
+                            HID: HInterID
+                        }
+                    })
+                    
+                    let {data,code, count, Message} = res.data
+                    
+                    if(code == 1) {
+                        console.log('data: ',data.h_v_Sb_EquipConkBookBillList_Edit);
+                        let data1 = data.h_v_Sb_EquipConkBookBillList_Edit[0]
+                        this.hform.HMainSourceBillType = HSourceBillType
+                        this.HMainSourceBillType = '璁惧鏁呴殰鐧昏鍗�'
+                        this.hform.HMainSourceBillNo = data1.鍗曟嵁鍙�
+                        this.hform.HMainSourceInterID = data1.hmainid
+                        this.hform.HMainSourceEntryID = data1.hsubid
+                        this.hform.HEquipID = data1.HEquipID
+                        this.hform.HManagerName = data1.璐熻矗浜�
+                        this.hform.HManagerID = data1.HManagerID
+                        this.hform.HBarName = data1.璁惧鍚嶇О
+                        this.hform.HBarModel = data1.璁惧鍨嬪彿
+                        this.hform.HBarSpec = data1.璁惧瑙勬牸
+                    }
+                    else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鑾峰彇婧愬崟澶辫触: ${Message}`
+                        })
+                    }
+                }
+            }
+		},
+		onLoad(e) {
+			console.log('e: ', e);
+			if (!e.operationType) {
+				this.operationType = 1
+			} else {
+				this.operationType = e.operationType
+			}
+
+			if (this.operationType == 1) {
+				// 鏂板
+				this.getMaxNum()
+			} else if (this.operationType == 2) {
+				// 澶嶅埗
+			} else if (this.operationType == 3) {
+				// 缂栬緫
+
+			} else if (this.operationType == 4) {
+				// 鐢辨姤宸ュ钩鍙版墦寮�
+				let HEquipID = e.HEquipID
+				this.getMaxNum()
+				this.getEquipFileMain(HEquipID)
+			} else if(this.operationType == 5) {
+                let {HSourceBillType, HInterID, HBillNo} = e
+                // 涓嬫帹
+                this.getMaxNum()
+                this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo)
+            }
+
+			this.getHDeptList()
+			this.getEmpList()
+			this.getRepairList()
+			this.loadCache()
+
+			// 鐩戝惉鍗曟嵁閫夋嫨瀹屾垚浜嬩欢
+			uni.$on('BillSelectComplete', (e) => {
+				console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
+				this.hform.HMainSourceInterID = e.HInterID
+				this.hform.HMainSourceBillNo = e.HBillNo
+				this.hform.HMainSourceEntryID = e.HEntryID
+				this.hform.HEquipID = e.HEquipID
+				this.hform.HBarName = e.HEquipName
+				this.hform.HBarSpec = e.HEquipSpec
+				this.hform.HBarModel = e.HEquipModel
+				this.$refs.billList.exit()
+			})
+		},
+		onUnload() {
+			uni.$off('BillSelectComplete')
+		},
+		onReady() {
+			const query = uni.createSelectorQuery().in(this)
+			query.select("#buttons")
+				.boundingClientRect()
+				.select("#tabs")
+				.boundingClientRect()
+				.exec(res => {
+					this.btnTop = Math.floor(res[0].top)
+					this.tabsBottom = Math.ceil(res[1].bottom)
+				})
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../style/MJBillStyle.scss";
+
+	.picker-overlay {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 1;
+	}
+    
+    .horizon_tabs {
+        width: 100%;
+        overflow-x: auto;
+    }
+</style>
\ No newline at end of file
diff --git a/pages/caigouruku/POStockInBill.vue b/pages/caigouruku/POStockInBill.vue
index f3607a8..3491855 100644
--- a/pages/caigouruku/POStockInBill.vue
+++ b/pages/caigouruku/POStockInBill.vue
@@ -663,6 +663,7 @@
                             for (var i = 0; i < res.data.data.length; i++) {
                                 this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
                             }
+                            this.HWHNameChange(getUserInfo()["HWhName"])
                         } else {
                             uni.showToast({
                                 title: '浠撳簱鏁版嵁璇锋眰澶辫触',
diff --git a/pages/caigoutuiliao/POStockInBackBill.vue b/pages/caigoutuiliao/POStockInBackBill.vue
index 56b1d88..be89c9a 100644
--- a/pages/caigoutuiliao/POStockInBackBill.vue
+++ b/pages/caigoutuiliao/POStockInBackBill.vue
@@ -644,6 +644,7 @@
                             for (var i = 0; i < res.data.data.length; i++) {
                                 this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
                             }
+                            this.HWHNameChange(getUserInfo()["HWhName"])
                         } else {
                             uni.showToast({
                                 title: '浠撳簱鏁版嵁璇锋眰澶辫触',
diff --git a/pages/fenbushidiaochudan/form_out.vue b/pages/fenbushidiaochudan/form_out.vue
index e2d9726..f9a66cf 100644
--- a/pages/fenbushidiaochudan/form_out.vue
+++ b/pages/fenbushidiaochudan/form_out.vue
@@ -500,6 +500,8 @@
                     HTMQty_B: '',
                     HWHName_B: '',
                     HSPName_B: '',
+                    
+                    HSourceFlag: false,
                 }
             }
         },
@@ -825,12 +827,13 @@
                     this.getHBaseList()
                 }
             },
-            // 璋冨叆浠撳簱淇敼
+            // 璋冨叆浠撲綅淇敼
             HStockPlaceInNameChange(e) {
-                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
-                    if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
-                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
-                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
+                console.log('浠撲綅e: ',e);
+                for (var i = 0; i < this.HStockPlaceInNameList.length; i++) {
+                    if (this.HStockPlaceInNameList[i].浠撲綅鍚嶇О == e) {
+                        this.hform.HStockPlaceName = this.HStockPlaceInNameList[i].浠撲綅鍚嶇О
+                        this.hform.HStockPlaceID = this.HStockPlaceInNameList[i].HMainID
                     }
                 }
             },
@@ -1343,10 +1346,10 @@
                 }
             },
             HOutStockPlaceNameChange(e) {
-                for (var i = 0; i < this.HStockPlaceInNameList.length; i++) {
-                    if (this.HStockPlaceInNameList[i].浠撲綅鍚嶇О == e) {
-                        this.hform.HOutStockPlaceName = this.HStockPlaceInNameList[i].浠撲綅鍚嶇О
-                        this.hform.HOutStockPlaceID = this.HStockPlaceInNameList[i].HMainID
+                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+                    if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+                        this.hform.HOutStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+                        this.hform.HOutStockPlaceID = this.HStockPlaceNameList[i].HMainID
                     }
                 }
             },
@@ -1571,6 +1574,7 @@
                         },
                         success: (res) => {
                             if (res.data.count == 1) {
+                                this.hform.HSourceFlag = true
                                 var data = res.data.data
                                 console.log(2, data);
                                 this.hform.HSupName = data.hSupNameField
@@ -1662,7 +1666,7 @@
                 var sHQty = this.hform.HQty
                 var sSourceBillNo = this.hform.HSourceBillNo
                 var sSourceBillType = this.hform.HMainSourceBillType
-                var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
+                var HSourceFlag = this.hform.HSourceFlag
                 console.log(this.hform.HSourceBillNo, HSourceFlag)
                 if (HDeleteFlag == "*") {
                     if (sBarCode == "") {
@@ -1792,6 +1796,7 @@
                         this.hform.HBarCode = ''
                         if (res.data.count == 1) {
                             CommonUtils.playSound(1)
+                            this.hform.HSourceFlag = true
                             var data = res.data.data
                             if (data.hBarTypeField == '浠撳簱鏉$爜') {
                                 this.hform.HWHName = data.hWhNameField
@@ -2191,6 +2196,7 @@
                                 this.hform.HSCSPName_B = data.BarCodeDetailslist[0].HSCSPName
                             }
                         } else {
+                            this.Materlist = []
                             uni.showToast({
                                 title: res.data.Message,
                                 icon: 'none'
@@ -2358,6 +2364,7 @@
                                 this.hform.HStockOutOrgName = this.arrayHOrgName[HStockOutOrgIndex]
                             }
                             this.tabs = 2
+                            this.hform.HSourceFlag = true
                             this.DisBillEntryList()
                         } else {
                             uni.showToast({
@@ -2377,7 +2384,7 @@
             },
             addNew() {
                 uni.redirectTo({
-                    url: '/pages/zhijiediaobo/MoveStockBill?OperationType=1'
+                    url: '/pages/fenbushidiaochudan/form_out?OperationType=1'
                 })
             },
             async submit() {
diff --git a/pages/fenbushidiaorudan/form_test.vue b/pages/fenbushidiaorudan/form_test.vue
index 4957574..0cb1e12 100644
--- a/pages/fenbushidiaorudan/form_test.vue
+++ b/pages/fenbushidiaorudan/form_test.vue
@@ -168,7 +168,7 @@
             <view v-if="tabs == 2">
                 <view class="list" v-for="(item,index) in Materlist" :key="index">
                     <uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠g爜" style="margin: 10px;"
-                        @tap="showMaterialDetail(item)">
+                        @tap="delMater(item)">
                         <view class="card-detail">
                             <view class="detail">
                                 <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
@@ -420,6 +420,8 @@
                     HSPName_B: '',
                     HSCWHName_B: '',
                     HSCSPName_B: '',
+                    
+                    HSourceFlag: false,
                 }
             }
         },
@@ -488,6 +490,47 @@
             }
         },
         methods: {
+            //鍒犻櫎鐗╂枡鐮�
+            delMater(item) {
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+                    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
+                                },
+                                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'
+                                    })
+                                },
+                            });
+                        }
+                    }
+                });
+            },
             // 鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
             async checkModRight() {
                 try {
@@ -609,7 +652,7 @@
                 if (!this.hform.HOutStockPlaceName) this.hform.HOutStockPlaceID = 0
 
                 const sHQty = this.hform.HQty || 0
-                const HSourceFlag = !!this.hform.HSourceBillNo
+                const HSourceFlag = this.hform.HSourceFlag
 
                 try {
                     console.log('寮�濮嬪鐞嗘潯鐮�:', sBarCode, sHQty, HSourceFlag, this.hform);
@@ -719,6 +762,8 @@
 
             // 璁剧疆婧愬崟淇℃伅
             async setSourceBillInfo(data) {
+                this.hform.HSourceFlag = true
+                return
                 if (data.hDeptIDField != 0) {
                     this.hform.HDeptID = data.hDeptIDField
                     this.hform.HDeptName = data.hDeptNameField
@@ -746,12 +791,16 @@
                 // 鏇存柊缁勭粐鏄剧ず
                 const inOrgIndex = this.arrayHOrgValue.findIndex(e => e == data.hStockInOrgIDField)
                 const outOrgIndex = this.arrayHOrgValue.findIndex(e => e == data.hStockOutOrgIDField)
+               
                 if (inOrgIndex !== -1) {
                     this.hform.HStockInOrgName = this.arrayHOrgName[inOrgIndex]
                 }
                 if (outOrgIndex !== -1) {
                     this.hform.HStockOutOrgName = this.arrayHOrgName[outOrgIndex]
                 }
+                
+                console.log('HStockInOrgName: ',this.hform.HStockInOrgName);
+                console.log('HStockOutOrgName: ',this.hform.HStockOutOrgName);
 
                 // 濡傛灉缁勭粐鍙戠敓鍙樺寲锛屾竻绌轰粨搴撲粨浣�
                 if (this.hform.HStockInOrgID != uni.getStorageSync('OrganizationID')) {
@@ -947,6 +996,7 @@
                     })
 
                     if (res.data.count == 1) {
+                        this.hform.HSourceFlag = true
                         CommonUtils.playSound(1)
                         await this.setSourceBillInfo(res.data.data)
                         this.tabs = 2
@@ -1348,6 +1398,7 @@
                             }
 
                             this.tabs = 2
+                            this.hform.HSourceFlag = true
                             this.DisBillEntryList()
                         }
                     }
@@ -1357,7 +1408,7 @@
             // 鏂板鍗曟嵁
             addNew() {
                 uni.redirectTo({
-                    url: '/pages/fenbushidiaoru/form?OperationType=1'
+                    url: '/pages/fenbushidiaorudan/form_test?OperationType=1'
                 })
             },
 
@@ -1514,6 +1565,10 @@
             border: 1px solid #acacac;
             position: relative;
             display: flex;
+            
+            .uni-combox {
+                width: 100%;
+            }
         }
 
         .righton {
diff --git a/pages/index/login.vue b/pages/index/login.vue
index 68a3b0e..33c1755 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -109,7 +109,7 @@
 					"鏉窞鍑礉濂堢壒": 'http://192.168.50.253:8080/API/',
 					"鏉窞鍑礉濂堢壒澶栫綉": 'http://erp.hzcabinet.cn:9090/API/',
 					"缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
-					"闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.121:81/API/',
+					"闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.102:81/API/',
 					"闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.88.82:81/API/',
 					"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
 					"浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
diff --git a/pages/index/tab4.vue b/pages/index/tab4.vue
index fbeebe6..04124f5 100644
--- a/pages/index/tab4.vue
+++ b/pages/index/tab4.vue
@@ -203,6 +203,13 @@
 						"id": 22,
 						"hidden": false
 					},
+					// {
+						// "img": "../../static/icon/icon15.png",
+						// "text": "閿�鍞嚭搴撳崟楠岃瘉",
+						// "url": "/pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP",
+						// "id": 23,
+						// "hidden": false
+					// },
 				]
 			}
 		},
diff --git a/pages/qitachuku_v2/OtherOutBill.vue b/pages/qitachuku_v2/OtherOutBill.vue
index 593ec4d..bd8af71 100644
--- a/pages/qitachuku_v2/OtherOutBill.vue
+++ b/pages/qitachuku_v2/OtherOutBill.vue
@@ -705,6 +705,7 @@
                             for (var i = 0; i < res.data.data.length; i++) {
                                 this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
                             }
+                            this.HWHNameChange(getUserInfo()["HWhName"])
                         } else {
                             uni.showToast({
                                 title: '浠撳簱鏁版嵁璇锋眰澶辫触',
diff --git a/pages/qitaruku_v2/OtherInBill.vue b/pages/qitaruku_v2/OtherInBill.vue
index 3c7f9bb..0188a0f 100644
--- a/pages/qitaruku_v2/OtherInBill.vue
+++ b/pages/qitaruku_v2/OtherInBill.vue
@@ -714,6 +714,8 @@
                             for (var i = 0; i < res.data.data.length; i++) {
                                 this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
                             }
+                            
+                            this.HWHNameChange(getUserInfo()['HWhName'])
                         } else {
                             uni.showToast({
                                 title: '浠撳簱鏁版嵁璇锋眰澶辫触',
diff --git a/pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill.vue b/pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill.vue
index d308931..9c56bf8 100644
--- a/pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill.vue
+++ b/pages/shengchanbuliaojiaoyan/MateReplenishOutCheckBill.vue
@@ -512,6 +512,7 @@
                             for (var i = 0; i < res.data.data.length; i++) {
                                 this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
                             }
+                            this.HWHNameChange(getUserInfo()["HWhName"])
                         } else {
                             uni.showToast({
                                 title: '浠撳簱鏁版嵁璇锋眰澶辫触',
diff --git a/pages/shengchanlingliao/PPickingCheckBill.vue b/pages/shengchanlingliao/PPickingCheckBill.vue
index 239d49b..6bf57ab 100644
--- a/pages/shengchanlingliao/PPickingCheckBill.vue
+++ b/pages/shengchanlingliao/PPickingCheckBill.vue
@@ -612,6 +612,7 @@
                             for (var i = 0; i < res.data.data.length; i++) {
                                 this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
                             }
+                            this.HWHNameChange(getUserInfo()["HWhName"])
                         } else {
                             uni.showToast({
                                 title: '浠撳簱鏁版嵁璇锋眰澶辫触',
diff --git a/pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue b/pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue
index 1243547..fe4190b 100644
--- a/pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue
+++ b/pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue
@@ -685,6 +685,7 @@
                             for (var i = 0; i < res.data.data.length; i++) {
                                 this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
                             }
+                            this.HWHNameChange(getUserInfo()["HWhName"])
                         } else {
                             uni.showToast({
                                 title: '浠撳簱鏁版嵁璇锋眰澶辫触',
diff --git a/pages/shengchanrukushengdan/Kf_ProductInBill.vue b/pages/shengchanrukushengdan/Kf_ProductInBill.vue
index cf56820..0da6cb8 100644
--- a/pages/shengchanrukushengdan/Kf_ProductInBill.vue
+++ b/pages/shengchanrukushengdan/Kf_ProductInBill.vue
@@ -438,9 +438,8 @@
             this.getHSupList()
             this.getHEmpList()
             this.getHDeptList()
-
-            this.getRelationStore()
-
+            await this.getRelationStore()
+            
             uni.$on('BillSelectComplete', (e) => {
                 console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
                 this.getHBarCodeData(e.HBillNo)
@@ -529,7 +528,7 @@
                     this.getHBaseList({
                         sWhere: sWhere
                     })
-
+                    
                 } else {
                     this.getHBaseList()
                 }
@@ -682,6 +681,10 @@
                             for (var i = 0; i < res.data.data.length; i++) {
                                 this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
                             }
+                            // 鏈湴鏈夊瓨鍌ㄤ粨搴� 鍒欐洿鏂颁负鏈湴浠撳簱鐨勫��
+                            if (getUserInfo()["HWhID"] != 0) {
+                                this.HWHNameChange(getUserInfo()["HWhName"])
+                            }
                         } else {
                             uni.showToast({
                                 title: '浠撳簱鏁版嵁璇锋眰澶辫触',
@@ -812,6 +815,7 @@
             },
             //閫夋嫨浠撳簱
             HWHNameChange(e) {
+                console.log('e: ',e);
                 // var name = e.split("(")
                 for (var i = 0; i < this.HWHNameList.length; i++) {
                     if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
diff --git a/pages/xiaoshouchuku/SellOutBill.vue b/pages/xiaoshouchuku/SellOutBill.vue
index f32018e..61c7d05 100644
--- a/pages/xiaoshouchuku/SellOutBill.vue
+++ b/pages/xiaoshouchuku/SellOutBill.vue
@@ -711,7 +711,7 @@
                             for (var i = 0; i < res.data.data.length; i++) {
                                 this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
                             }
-
+                            this.HWHNameChange(getUserInfo()["HWhName"])
                             // this.HStockPlaceNameChange(res.data.data[0].浠撳簱鍚嶇О)
                         } else {
                             uni.showToast({
diff --git a/pages/xiaoshoutuihuo/ICStockBillMain.vue b/pages/xiaoshoutuihuo/ICStockBillMain.vue
index d62052c..952236c 100644
--- a/pages/xiaoshoutuihuo/ICStockBillMain.vue
+++ b/pages/xiaoshoutuihuo/ICStockBillMain.vue
@@ -522,6 +522,8 @@
                             for (var i = 0; i < res.data.data.length; i++) {
                                 this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
                             }
+                            
+                            this.HWHNameChange(getUserInfo()["HWhName"])
                         } else {
                             uni.showToast({
                                 title: '浠撳簱鏁版嵁璇锋眰澶辫触',
diff --git a/pages/zhijiediaobo/MoveStockBill.vue b/pages/zhijiediaobo/MoveStockBill.vue
index d9acf56..ffcb32b 100644
--- a/pages/zhijiediaobo/MoveStockBill.vue
+++ b/pages/zhijiediaobo/MoveStockBill.vue
@@ -1042,6 +1042,8 @@
                             for (var i = 0; i < res.data.data.length; i++) {
                                 this.arrayHWHInName[i] = res.data.data[i].浠撳簱鍚嶇О
                             }
+                            
+                            this.HWHInNameChange(getUserInfo()["HSCWHName"])
                         } else {
                             uni.showToast({
                                 title: '浠撳簱鏁版嵁璇锋眰澶辫触',
@@ -1099,6 +1101,8 @@
                                 this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
                                 this.arrayHWHInName[i] = res.data.data[i].浠撳簱鍚嶇О
                             }
+                            // 璋冨嚭浠撳簱
+                            this.HSCWHNameChange(getUserInfo()["HWhName"])
                         } else {
                             uni.showToast({
                                 title: '浠撳簱鏁版嵁璇锋眰澶辫触',

--
Gitblit v1.9.1