1216

api/base/path.js

@@ -1,3 +1,3 @@
-const baseURL = 'http://192.168.31.216:8099'
-
+// const baseURL = 'http://192.168.31.216:8099'
+const baseURL = 'http://192.168.31.32:8099'
 export default baseURL

components/dialog-login/dialog-login.vue

@@ -151,7 +151,8 @@
 		}
 
 		.login-btn {
-			background-color: #999999;
+			// background-color: #999999;
+			background-color: #1684fc;
 			margin-top: 32rpx;
 			justify-content: center;
 			padding: 16rpx 0;

pages/batchReporting/index.vue

@@ -9,12 +9,12 @@
 						<text class="label code">{{ curSubPlan['productionPlanNo'] }}</text>
 					</view>
 					<view class=" uni-row" style="margin-left: 16rpx;">
-						<view v-if="item['status'] == 1" class="tag"><text class="label">进行中</text></view>
+						<view v-if="item['status'] == 0" class="tag"><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 v-else-if="item['status'] == 3" class="tag turnover "><text class="label">未开始</text>
 						</view>
-						<view v-else type="default" class="tag finished"><text class="label">已完成</text></view>
+						<view v-else-if="item['status'] == 1" type="default" class="tag finished"><text class="label">已完成</text></view>
 					</view>
 				</view>
 				<view class="item-info uni-row">
@@ -42,7 +42,7 @@
 					<text class="label right">{{ item['NextProcess'] }}</text>
 				</view>
 				<view class="status-btn uni-row">
-					<view v-if="item['status'] == 2" class=" uni-row">
+					<view v-if="item['status'] == 1" class=" uni-row">
 						<button class="turnover-tag" size="mini"
 							@click.stop="handleShowTurnoverApplication(null)">周转申请</button>
 						<!-- <button class="reporting-tag" size="mini" @click="handleToreportingForWork">去报工</button> -->

pages/dashboard/index.vue

@@ -8,8 +8,8 @@
 			<view class="icon"><text class="label">{{ userInfo.nickName.charAt(0) }}</text></view>
 			<view class="user-info uni-column">
 				<view class="nickname uni-row"><text class="label">{{ userInfo.userName }}</text><text class="label"
-						style="margin-left: 12rpx">ID</text><text class="label"
-						style="margin-left: 8rpx">{{ userInfo.userId }}</text>
+						style="margin-left: 24rpx">ID:</text><text class="label"
+						style="margin-left: 6rpx">{{ userInfo.userId }}</text>
 				</view>
 				<view class="process uni-row"><text class="label">当前工段：</text><text class="label">{{ deptName }}</text>
 				</view>
@@ -172,7 +172,8 @@
 		left: 20rpx;
 
 		.start-batch-btn {
-			background-color: grey;
+			// background-color: grey;
+			background-color: #1684fc;
 			margin-bottom: 24rpx;
 			border-radius: 8rpx;
 			justify-content: center;