1225

api/base/path.js

@@ -1,16 +1,16 @@
-// const baseURL = 'http://120.46.159.163:7004'
-
-const baseURL = function() {
-	let path = '';
-	try {
-		const value = uni.getStorageSync('baseUrl');
-		path = value ? value : 'http://120.46.159.163:7004';
-		console.log(value)
-	} catch (e) {
-		// error
-	}
-	return path;
-}()
+// const baseURL = 'http://120.46.159.163:7004';
+const baseURL = 'http://192.168.31.216:8099';
 
+// const baseURL = function() {
+// 	let path = '';
+// 	try {
+// 		const value = uni.getStorageSync('baseUrl');
+// 		path = value ? value : 'http://120.46.159.163:7004';
+// 		console.log(value)
+// 	} catch (e) {
+// 		// error
+// 	}
+// 	return path;
+// }()
 
 export default baseURL

components/dialog-login/dialog-login.vue

@@ -31,11 +31,10 @@
 	import {
 		getUserProcess
 	} from '@/api/process/process.js'
-	import baseURL from '@/api/base/path.js'
+	
 	import {
 		store
 	} from '@/store/index.js'
-import request from '../../utils/request'
 	// 对话框
 	const baseDialog = ref(null)
 	const currentUser = ref({})
@@ -43,13 +42,13 @@ import request from '../../utils/request'
 	const successMsg = ref('登录成功')
 	const userInfo = ref({})
 	const user = ref([])
-	const URL = ref('')
+	// const URL = ref('')
 	// const { proxy } = getCurrentInstance()
-	
+
 	onLoad(() => {
-		URL.value = baseURL;
+		// URL.value = baseURL;
 	})
-	
+
 	function init() {
 
 	}
@@ -61,38 +60,40 @@ import request from '../../utils/request'
 	}
 	const handleLogin = () => {
 		// 获取服务器地址
+		const baseURL = uni.getStorageSync('baseUrl')
+		loginRequest(baseURL)
+		/*
 		uni.getStorage({
 			key: 'baseUrl',
 			success: function(res) {
 				URL.value = res.data;
-				console.log(URL.value)
 				// 加载
 				uni.showLoading({
 					title: '加载中'
 				});
-				loginRequest(URL.value);	
 				setTimeout(function() {
 					uni.hideLoading();
 				}, 3000)
+				loginRequest(URL.value);
+				console.log(URL.value)
 			},
 			fail: function() {
-				uni.showLoading({
-					title: '加载中'
-				});
+				uni.setStorageSync('baseUrl', URL.value);
 				loginRequest(URL.value);
+				console.log(URL.value)
 				setTimeout(function() {
 					uni.hideLoading();
 				}, 3000)
 			}
 		});
+		*/
 	}
 
-	function loginRequest(url){
+	function loginRequest(url) {
 		// 请求
 		uni.request({
 			method: 'POST',
 			url: url + '/login',
-			timeout: 6000,
 			data: {
 				username: currentUser.value.userName,
 				password: currentUser.value.password
@@ -134,14 +135,6 @@ import request from '../../utils/request'
 						duration: 2000
 					})
 				}
-			},
-			fail: function(){
-				uni.showToast({
-					title: '请求超时',
-					icon: 'error',
-					//显示持续时间为 2秒
-					duration: 2000
-				})
 			}
 		})
 	}

components/dialog-selectEquipment/dialog-selectEquipment.vue

@@ -89,17 +89,21 @@
 		if (firstItem.value) {
 			for (var i = 0; i < selection.value.length; i++) {
 				sendReqParam.value.push(firstItem.value);
-				sendReqParam.value[i].equipmentDetailId = selection.value[i].equipmentId;
-				sendReqParam.value[i].equipmentDetailCode = selection.value[i].equipmentCode;
+				sendReqParam.value[i].equipmentDetailId = selection.value[i].equipmentDetailId;
+				sendReqParam.value[i].equipmentDetailCode = selection.value[i].equipmentDetailCode;
 				sendReqParam.value[i].startTime = timestampToTime(new Date());
 				sendReqParam.value[i].status = 1;
 				if (i > 0) {
-					sendReqParam.value.value[i].id = null;
+					sendReqParam.value[i].id = null;
 				}
 			}
-			emit('handleAddDayWorkItem', sendReqParam.value)
+			emit('handleAddDayWorkItem', sendReqParam.value);
+			selection.value = [];
+		}else{
+			console.log(selection.value);
+			emit('handleAddDayWorkItem', selection.value);
+			selection.value = [];
 		}
-		emit('handleAddDayWorkItem', selection.value)
 		close();
 	}
 </script>

pages/batchReporting/index.vue

@@ -10,11 +10,13 @@
 					</view>
 					<view class=" uni-row" style="margin-left: 16rpx;">
 						<view v-if="item['status'] == 1" class="tag"><text class="label">进行中</text></view>
-						<view v-else-if="item['status'] == 2" class="tag turnover "><text class="label">周转中</text>
+						<view v-else-if="item['status'] == 3" class="tag turnover "><text class="label">周转中</text>
+						</view>
+						<view v-else-if="item['status'] == 2" class="tag turnover "><text class="label">待周转</text>
 						</view>
 						<view v-else-if="item['status'] == 0" class="tag turnover "><text class="label">未开始</text>
 						</view>
-						<view v-else-if="item['status'] == 3" type="default" class="tag finished"><text
+						<view v-else-if="item['status'] == 4" type="default" class="tag finished"><text
 								class="label">已完成</text></view>
 					</view>
 				</view>
@@ -45,7 +47,7 @@
 						class="label right">{{item.prevProcess && item.nextProcess.length > 0 ? item.nextProcess[0].processAlias : null }}</text>
 				</view>
 				<view class="status-btn uni-row">
-					<view v-if="item['status'] == 1" class=" uni-row">
+					<view v-if="item['status'] == 2" class=" uni-row">
 						<button class="turnover-tag" size="mini"
 							@click.stop="handleShowTurnoverApplication(item)">周转申请</button>
 						<!-- <button class="reporting-tag" size="mini" @click="handleToreportingForWork">去报工</button> -->

pages/index/index.vue

@@ -49,6 +49,7 @@
 		getUserInfo,
 		getNickNameByUserName
 	} from '@/api/login/index.js'
+	import baseURL from '@/api/base/path.js'
 	// 登录过的用户
 	const loggedUsers = ref([])
 	const loginDialog = ref(null)
@@ -59,7 +60,8 @@
 	const showInput = ref(false)
 
 	onLoad(() => {
-		init();
+		
+		initBaseUrl();
 		// getUser();
 	})
 
@@ -68,12 +70,10 @@
 			success: function(res) {
 				for (let i = 0; i < res.keys.length; i++) {
 					let storagekey = res.keys[i];
+					console.log(storagekey)
 					uni.getStorage({
 						key: storagekey,
 						success: function(res) {
-							if (storagekey === 'baseUrl') {
-								baseUrl.value = res.data;
-							}
 							if (storagekey !== 'token' && storagekey !== '__DC_STAT_UUID' &&
 								storagekey !== 'baseUrl') {
 								getNickNameByUserName(storagekey).then((response) => {
@@ -86,13 +86,27 @@
 									}
 								})
 							}
+							if(storagekey === 'baseUrl'){
+								baseUrl.value = res.data;
+							}
 						}
 					});
 				}
 			}
 		});
 	}
-
+	
+	function initBaseUrl () {
+		uni.getStorage({
+			key: 'baseUrl',
+			fail: function() {
+				uni.setStorageSync('baseUrl', baseURL);
+			},
+			complete: function() {
+				init();
+			}
+		});
+	}
 
 	function handleGear() {
 		showInput.value = !showInput.value
@@ -110,13 +124,8 @@
 						icon: "success",
 						title: "设置成功"
 					})
-				},
+				}
 			});
-			// 刷新当前页面重新加载一下()
-			// uni.navigateBack({
-			// 	delta: 1
-			// })
-			refresh();
 			showInput.value = !showInput.value;
 		} else {
 			uni.showToast({
@@ -126,16 +135,6 @@
 		}
 	}
 
-	function refresh() {
-		// 刷新当前页面
-		var pages = getCurrentPages(); //获取所有页面的数组对象
-		var currPage = pages[pages.length - 1]; //当前页面
-		uni.reLaunch({
-			url: currPage.$page.fullPath
-		})
-	}
-
-
 	const handleShowLoginDialog = (user) => {
 		let _user = user ?? {}
 		// 调用子组件中的方法
@@ -193,13 +192,13 @@
 	.page-container {
 		overflow: auto;
 	}
-
+	
 	.logo {
 		width: 120rpx;
 		height: 120rpx;
 		margin: 0 auto;
 	}
-
+	
 	.title {
 		height: 80rpx;
 		justify-content: center;

pages/reportingForWork/index.vue

@@ -54,7 +54,7 @@
 		</scroll-view>
 		<view class="bottom uni-row">
 			<button class="bottom-btn left-btn" @click="HandleChangevehicle"><text class="label">更换载具</text></button>
-			<button class="bottom-btn right-btn" type="primary" @click="handleStartProcessing"><text
+			<button class="bottom-btn right-btn" type="primary" @click="handleStartProcessing(null)" :disabled="flag"><text
 					class="label">开始加工</text></button>
 		</view>
 		<dialog-end-work ref="endWorkDialog" @sendEquipment='getEquipment' @reset="reset" />
@@ -92,6 +92,7 @@
 	const dayWorkItem = ref({}) // 添加传输对象
 	const reqParam = ref([]) // 请求参数
 	const userInfo = ref(null) // 登录员工信息
+	const flag = ref(true)
 
 	onLoad(() => {
 		curSubDetails.value = store.planSubDetails;
@@ -116,8 +117,17 @@
 				listData.value[i].taskTime = (timeStamp / 3600000).toFixed(2) === 'NaN' ? 0 : (timeStamp / 3600000)
 					.toFixed(2);
 			}
-			uni.hideLoading()
+			// 判断是否是新批次默认生成的第一条,下面的开始加工按钮不能点(有一个为0就不能点)
+			let arr = []
+			for (var i = 0; i < listData.value.length; i++) {
+				arr[i] = listData.value[i].status;
+			}
+			
+			flag.value = arr.includes('0');
+			// flag.value = listData.value.some(value => {value.status == '0'|| value.status == '3'})
+			console.log(flag.value)	
 		})
+		uni.hideLoading();
 	}
 
 	function reset() {
@@ -172,10 +182,10 @@
 
 	function handleAddDayWorkItem(data) {
 		console.log(data)
-		if (data[0].nickName) { // data里面任意一对象除了设备相关的字段存在,直接给reqParam赋值
+		if (data[0].dayworkId) { // data里面任意一对象除了设备相关的字段存在,直接给reqParam赋值
 			reqParam.value = data;
 		} else {
-			equipmentList.value = data;
+			// equipmentList.value = data;
 			dayWorkItem.value = {
 				dayworkId: dayWorkInfo.value.id,
 				lotId: dayWorkInfo.value.lotId,
@@ -188,10 +198,10 @@
 				startTime: timestampToTime(new Date())
 			}
 
-			for (var i = 0; i < equipmentList.value.length; i++) {
+			for (var i = 0; i < data.length; i++) {
 				reqParam.value.push(dayWorkItem.value);
-				reqParam.value[i].equipmentDetailId = equipmentList.value[i].equipmentId;
-				reqParam.value[i].equipmentDetailCode = equipmentList.value[i].equipmentCode;
+				reqParam.value[i].equipmentDetailId = data[i].equipmentDetailId;
+				reqParam.value[i].equipmentDetailCode = data[i].equipmentDetailCode;
 			}
 		}
 		console.log(reqParam.value)
@@ -202,6 +212,7 @@
 					title: '操作成功',
 					duration: 2000
 				});
+				reqParam.value = [];
 				init();
 			} else {
 				uni.showToast({

utils/request.js

@@ -1,5 +1,5 @@
 import { getToken } from '@/utils/auth'
-import baseURL from '@/api/base/path.js'
+// import baseURL from '@/api/base/path.js'
 
 let timeout = 6000;
 
@@ -9,7 +9,7 @@ function request({url, data, method="GET"}) {
 	    Authorization: token
 	}
 	return new Promise((resolve, reject)=>{
-		// console.log('token：' + token)
+		const baseURL = uni.getStorageSync('baseUrl')
 		uni.request({
 			url: baseURL + url,
 			data,
@@ -40,7 +40,6 @@ function request({url, data, method="GET"}) {
 				}
 			},
 			fail: (err) => {
-				console.log("err:", err)
 				uni.showToast({
 					icon: 'none',
 					title: err.errMsg,