From 5d6da3a9a33f63a637c6f1d1983d155a598e096d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Tue, 25 Feb 2025 21:18:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E5=8D=95=E8=AF=84?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/config.js                                |  4 ++--
 manifest.json                                 |  2 +-
 pages/newOaWorkflowForm/newOaWorkflowForm.vue |  7 +++++--
 pages/work/doCopyWork.vue                     | 21 ++++++++++++++++++-
 pages/work/doWorkAudit.vue                    |  4 ++++
 5 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/conf/config.js b/conf/config.js
index 378ddc7..9052a00 100644
--- a/conf/config.js
+++ b/conf/config.js
@@ -17,12 +17,12 @@ let baseUrl = '/';
 
 // 腾讯地图Key, h5使用
 let QQMapKey = '';
-let commonBaseUrl= 'https://www.shuimuwy.com/';
+let commonBaseUrl= 'https://shuimuwy.com/';
 
 // #ifndef H5
 //服务器域名 小程序 或者 app 时 后端地址
 //let baseUrl = 'http://demo.homecommunity.cn/'; 
-let baseUrl = 'https://www.shuimuwy.com/'; 
+let baseUrl = 'https://shuimuwy.com/'; 
 // #endif
 
 //app支付时这里需要填写支付秘钥
diff --git a/manifest.json b/manifest.json
index eee2ef9..1b24f39 100644
--- a/manifest.json
+++ b/manifest.json
@@ -59,7 +59,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx0a08dd8124d7f04f",
+        "appid" : "wxaba59a870ae03d54",
         "setting" : {
             "urlCheck" : false
         },
diff --git a/pages/newOaWorkflowForm/newOaWorkflowForm.vue b/pages/newOaWorkflowForm/newOaWorkflowForm.vue
index 9fa4fde..a736027 100644
--- a/pages/newOaWorkflowForm/newOaWorkflowForm.vue
+++ b/pages/newOaWorkflowForm/newOaWorkflowForm.vue
@@ -52,7 +52,7 @@
 				<picker bindchange="PickerChange" :value="item.valueIndex" :range-key="'label'" :range="item.values"
 					@change="selectChange($event,item)">
 					<view class="picker">
-						{{item.values.length==0 ? "请选择" : item.values[item.valueIndex].label}}
+						{{item.valueIndex <0 ? "请选择" : item.values[item.valueIndex].label}}
 					</view>
 				</picker>
 			</view>
@@ -132,9 +132,12 @@
 						if (item.type == 'textdate' || item.type == 'textdatetime') {
 							item.value = "请选择";
 						}
-						if (item.type == "radio" || item.type == "select") {
+						if (item.type == "radio") {
 							item.valueIndex = 0;
 						}
+						if ( item.type == "select") {
+							item.valueIndex = -1;
+						}
 					})
 				})
 			},
diff --git a/pages/work/doCopyWork.vue b/pages/work/doCopyWork.vue
index 8d1f807..b8eece2 100644
--- a/pages/work/doCopyWork.vue
+++ b/pages/work/doCopyWork.vue
@@ -15,6 +15,7 @@
 					<radio :class="itemId==valueItem.itemId?'checked':''" v-if="valueItem.state == 'C'"
 						:checked="itemId==valueItem.itemId?true:false" :value="valueItem.itemId">
 					</radio>
+					<view v-else-if="valueItem.state == 'W'">未办理</view>
 					<view v-else>已处理</view>
 				</view>
 			</radio-group>
@@ -34,6 +35,14 @@
 			</view>
 		</view>
 		<view class="margin-top" v-if="itemId">
+			<view class="cu-form-group ">
+				<view class="title">评分</view>
+				<picker mode="selector" :range="scores" @change="onNumberChange">
+					<view class="picker">
+						{{ score }}分
+					</view>
+				</picker>
+			</view>
 			<view class="cu-form-group ">
 				<view class="title">扣款金额</view>
 				<input v-model="deductionMoney" type="number" class="text-right" placeholder="请输入扣款金额"></input>
@@ -68,6 +77,8 @@
 				createUserName: '',
 				items: [],
 				deductionMoney: 0,
+				scores: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+				score: 10,
 				item: {
 					staffName: '',
 					remark: '',
@@ -110,6 +121,7 @@
 					deductionReason: this.deductionReason,
 					itemId: this.itemId,
 					deductionMoney: this.deductionMoney,
+					score:this.score,
 				}).then(_data => {
 					uni.navigateBack();
 				})
@@ -123,10 +135,17 @@
 					}
 				})
 			},
+			onNumberChange(e) {
+				const index = e.detail.value;
+				this.score = this.scores[index];
+			}
 		}
 	}
 </script>
 
 <style>
-
+	.title {
+		min-height: 60upx;
+		height: auto;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/work/doWorkAudit.vue b/pages/work/doWorkAudit.vue
index ad3aa39..24a9563 100644
--- a/pages/work/doWorkAudit.vue
+++ b/pages/work/doWorkAudit.vue
@@ -191,6 +191,10 @@
 	.centent-btn {
 		font-size: 22px;
 	}
+	.title{
+		min-height: 60upx;
+		height: auto;
+	}
 
 	.file-size {
 		font-size: 48upx;