Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/master'

ouyj 4 mesi fa
parent
commit
847f0d33e8

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
 	"name": "工效通APP",
 	"appid": "__UNI__1050C07",
 	"description": "工效通任务管理平台",
-	"versionName": "1.2.8",
-	"versionCode": "128",
+	"versionName": "1.3.0",
+	"versionCode": "130",
 	"uni-app-x": {},
 	"quickapp": {},
 	"mp-weixin": {

+ 6 - 0
pages/order/detail/returnIndex.uvue

@@ -665,5 +665,11 @@
 	padding: 20rpx 0;
 	border-bottom: 1rpx solid #f0f0f0;
 }
+
+.reject-reason-textarea {
+    width: 100%;
+    min-height: 100rpx;
+    line-height: 1.5;
+}
 </style>
 

+ 44 - 10
pages/order/detail/suspendIndex.uvue

@@ -63,20 +63,40 @@
 			</view> -->
 			<!-- 工作负责人选择 -->
 			<view class="info-section">
-			    <view class="section-title">
+			    <!-- <view class="section-title">
 			        <text class="section-title-text">挂起原因<text style="color: red;">*</text></text>
-			    </view>
+			    </view> -->
 			    <view class="info-card">
-			        <view class="form-item">
+			        <view class="info-item">
+						<view class="info-label">
+							<text class="form-label required">挂起原因<text style="color: red;">*</text></text>
+						</view>
 			            <!-- <text class="form-label required">挂起原因</text> -->
-			            <view class="form-picker" @click="showReasonPicker = true">
-			                <view class="picker-display">
-			                    <text v-if="suspendReason" class="selected-value">{{ suspendReason }}</text>
-			                    <text v-else class="placeholder">请选择挂起原因</text>
-			                    <text class="arrow">▼</text>
-			                </view>
-			            </view>
+						<view class="info-value">
+							<view class="form-picker" @click="showReasonPicker = true">
+								<view class="picker-display">
+									<text v-if="suspendReason" class="selected-value">{{ suspendReason }}</text>
+									<text v-else class="placeholder">请选择挂起原因</text>
+									<text class="arrow">▼</text>
+								</view>
+							</view>
+						</view>
 			        </view>
+					<view class="info-item" v-if="detailData.suspendReason == '4'">
+						<view class="info-label">
+							<text class="form-label required">说明<text style="color: red;">*</text></text>
+						</view>
+						<view class="info-value">
+							 <textarea
+								class="reject-reason-textarea"
+								placeholder="请输入说明(必填)"
+								v-model="suspendExplain"
+								maxlength="500"
+								:show-confirm-bar="false"
+								auto-height
+							></textarea>
+						</view>
+					</view>
 			    </view>
 			</view>
 
@@ -194,6 +214,7 @@
 	const selectedReasonIndex = ref<number>(-1)
 	const suspendReasonOptions = ref<PickerOption[]>([])
 	const showReasonPicker = ref<boolean>(false)
+	const suspendExplain = ref<string>("")
 
 	// 获取负责人列表(使用用户列表接口)
 	const dictList = async (): Promise<void> => {
@@ -300,9 +321,17 @@
 			})
 			return
 		}
+		if ((suspendExplain.value == '' || suspendExplain.value.trim() === '') && detailData.value.suspendReason == '4') {
+			uni.showToast({
+				title: '请输入说明',
+				icon: 'none'
+			})
+			return
+		}
 		if (isDealing.value || hasDealed.value) return // 双重保险
 		isDealing.value = true
 		detailData.value.workOrderStatus = 'to_approve'
+		detailData.value.rejectionReason = suspendExplain.value
 		try {
 			const result = await suspendOrder(detailData.value)
 			const resultObj = result as UTSJSONObject
@@ -767,5 +796,10 @@
 	    color: #999999;
 	    margin-left: 12rpx;
 	}
+.reject-reason-textarea {
+    width: 100%;
+    min-height: 100rpx;
+    line-height: 1.5;
+}
 </style>
 

+ 1 - 2
pages/profile/index.uvue

@@ -40,8 +40,7 @@
 				
 				<view class="menu-item" @longpress="handleVersionClick()">
 					<image class="menu-icon" src="/static/images/profile/5.png" mode="aspectFit"></image>
-					<text class="menu-title">{{version}}</text>
-					<text class="menu-arrow">›</text>
+					<text class="menu-title">版本:{{version}}</text>
 				</view>
 			</view> 
             <!-- 功能菜单 -->

+ 1 - 1
pages/score/pending.uvue

@@ -45,7 +45,7 @@
 			</view>
 			<view class="info-row">
 			  <view class="info-label">
-			    <text class="text-gray">工作结束时间: {{ formatDate(getPropertyValue(item, 'realEndTime')) }}</text>
+			    <text class="text-gray">工作结束时间: {{ getPropertyValue(item, 'realEndTime') }}</text>
 			  </view>
 			</view>
           </view>

+ 2 - 2
pages/worktime/index.uvue

@@ -94,10 +94,10 @@
             <text class="breakdown-label">维修工时</text>
             <text class="breakdown-value">{{ repairHours }}小时</text>
           </view>
-          <view v-if="rank !== null && totalRankingUsers !== null" class="breakdown-item">
+          <!-- <view v-if="rank !== null && totalRankingUsers !== null" class="breakdown-item">
             <text class="breakdown-label">排名</text>
             <text class="breakdown-value">{{ rank }}/{{ totalRankingUsers }}</text>
-          </view>
+          </view> -->
         </view>
       </view>
     </view>

+ 3 - 2
utils/request.uts

@@ -13,8 +13,9 @@ export type RequestConfig = {
 };
 
 // 基础 URL
-const BASE_URL = "http://192.168.110.105:8080";
-// const BASE_URL = "http://222.243.138.146:5095";
+// const BASE_URL = "http://192.168.110.105:8080";
+const BASE_URL = "http://222.243.138.146:5095" //测试服务器;
+	// const BASE_URL = "http://222.243.138.146:5097" //正式服务器;
 // const BASE_URL = "http://10.170.129.135:8089";
 
 /**