0619

api/sys/user.js

@@ -14,4 +14,9 @@ export function getURL(data) {
 		method: 'POST',
 		data:data
 	})
-}
+}
+export function getConfigKey(configKey) {
+  return req.request({
+    url: '/system/config/configKey/' + configKey,
+    method: 'get'
+  })

pages/addNewBatch/index.vue

@@ -174,6 +174,9 @@
 	} from '@/api/business/deptProcess.js'
 	import QrScanner from '../vueQrCode/index.vue'
 	import path from '@/api/base/path.js'
+	import {
+			getConfigKey
+		} from '@/api/sys/user.js'
 
 	const batchNoCheck = ref(null) // 批次号是否选中
 	const batchNoList = ref([]) // 批次号列表
@@ -189,11 +192,12 @@
 	const emit = defineEmits(['batchReporting-addBatch']);
 	const inpValue = ref('')
 	const loading = ref(false)
-
+	const dataSource = ref(false)
 	const curDept = ref(false) //判断当前工段是否是该批次的领料部门
 	const lotList = ref([])
 	const selectedProcess = ref(null)
 	const processList = ref([])
+	const url = ref("")
 
 	onLoad(() => {
 		// 处理特殊字符JSON解析失败报错
@@ -316,33 +320,42 @@
 			let header = {
 				Authorization: token
 			}
-			uni.request({
-				url: path.furnaceNoURL + '/business/furnaceNoInfo/getFurnaceNoInfo',
-				data: {
-					productionPlanNo: store.planDetails.productionPlanNo,
-					lineNumber: store.planDetails.lineNumber
-				},
-				method: 'GET',
-				header,
-				sslVerify: false,
-				success: (res) => {
-					if (res.data.code == 200 && res.data.data.length > 0) {
-						for (let i = 0; i < res.data.data.length; i++) {
-							furnaceNumberInfoList.value[i] = {
-								text: res.data.data[i].furnaceNumber + '  (' + res.data.data[i]
-									.incomingDate + ')',
-								value: res.data.data[i]
-							}
-						}
-
-						// basicInfo.value = res.data.data[0];
-						// dayWork.value.furnaceNoInfo = basicInfo.value;
-					}
-				},
-				fail: (err) => {
-					console.log(err)
-				}
-			})
+			//判断拉取数据源
+					 getConfigKey('switch_data_source').then(res => {
+					          dataSource.value = res.msg == 'true'
+							  if(dataSource.value){
+								console.log("切换数据源")
+							  }else{
+								  uni.request({
+								  	url: path.furnaceNoURL + '/business/furnaceNoInfo/getFurnaceNoInfo',
+								  	data: {
+								  		productionPlanNo: store.planDetails.productionPlanNo,
+								  		lineNumber: store.planDetails.lineNumber
+								  	},
+								  	method: 'GET',
+								  	header,
+								  	sslVerify: false,
+								  	success: (res) => {
+								  		if (res.data.code == 200 && res.data.data.length > 0) {
+								  			for (let i = 0; i < res.data.data.length; i++) {
+								  				furnaceNumberInfoList.value[i] = {
+								  					text: res.data.data[i].furnaceNumber + '  (' + res.data.data[i]
+								  						.incomingDate + ')',
+								  					// text: '2415800347000 (2024-05-06)',
+								  					value: res.data.data[i]
+								  				}
+								  			}
+								  
+								  			// basicInfo.value = res.data.data[0];
+								  			// dayWork.value.furnaceNoInfo = basicInfo.value;
+								  		}
+								  	},
+								  	fail: (err) => {
+								  		console.log(err)
+								  	}
+								  })
+							  }
+					        })
 		} else {
 			isWasteRecyclingFlag.value = false
 			furnaceInfo.value.furnaceNumber = "废品回用"
@@ -480,6 +493,8 @@
 				//因为废品回用对工序进行单独的修改。所以重新查产品的工艺，如果该批不是废品回用，则查产品工序，如果是，则到
 				//对应表查
 				//通过批次号查
+				//切换数据源
+				data.tenantId = !store.tenantId ? store.userInfo.tenantId : store.tenantId
 				getProcessListByLot(data).then(response => {
 					let lotProcessList = response.data
 					let filteredData = lotProcessList.filter((item1) =>

utils/request.js

@@ -12,8 +12,10 @@ function behindRequist({
 	method = "GET"
 }) {
 	let token = 'Bearer ' + getToken();
+	let tenantId = store.tenantId?store.tenantId:0
 	let header = {
-		Authorization: token
+		Authorization: token,
+		tenantId:tenantId
 	}
 	return new Promise((resolve, reject) => {
 		const urlList = uni.getStorageSync('baseUrl')