登陆页添加账号密码登录和忘记密码功能

pages/apps/notification/notificationDetail.vue

@@ -16,11 +16,11 @@
 		</view>
 	</view>
 	<view v-else-if="showFlag">
-		<!-- First Section: 巡视工单 to 联系方式 -->
+		<!-- First Section: 巡查工单 to 联系方式 -->
 		<view class="form-section">
 			<u--form :model="inputForm" labelWidth="100px" class="u-form" labelPosition="left" :rules="rules" ref="inputForm" v-if="!nodeFlag">
 
-				<u-form-item label="巡视工单" prop="no">
+				<u-form-item label="巡查工单" prop="no">
 					<u--input v-model="inputForm.no" :disabled="true" placeholder="工单编号" clearable></u--input>
 				</u-form-item>
 
@@ -111,7 +111,7 @@
 				if (data.lookOverId) {
 					this.showFlag = true;
 				}
-				// 获取巡视工单信息
+				// 获取巡查工单信息
 				await overService.queryById(data.lookOverId).then((data) => {
 					//data.no = 'XS-J' + data.no;
 					this.fileList1 = data.fileList1

pages/edt/DisposeRubbishForm.vue

@@ -4,7 +4,7 @@
             <block slot="content">建筑垃圾清运处理</block>
         </cu-custom>
 
-        <!-- First Section: 巡视工单 to 联系方式 -->
+        <!-- First Section: 巡查工单 to 联系方式 -->
         <view class="form-section">
             <!-- 遮罩层 -->
             <view v-if="isProcessing" class="mask"></view>
@@ -43,14 +43,14 @@
                         <u-form-item
                                 v-for="(item, index_workOver) in inputForm.workOverNoList"
                                 :key="index_workOver"
-                                :label="`巡视工单 ${index_workOver + 1}`"
+                                :label="`巡查工单 ${index_workOver + 1}`"
                                 :required="true"
                                 :prop="'workOverNoList[' + index_workOver + '].no'"
                         >
                             <div style="width: 100%" @click="showWorkOver(index_workOver)">
                                 <u--input v-model="inputForm.workOverNoList[index_workOver].no" readonly
                                           style="pointer-events: none;"
-                                          placeholder="请选择巡视工单编号" @focus="showWorkOver(index_workOver)" clearable></u--input>
+                                          placeholder="请选择巡查工单编号" @focus="showWorkOver(index_workOver)" clearable></u--input>
 
                                 <view >
                                     <text class="u-demo-block__title">{{inputForm.workOverNoList[index_workOver].no}}清理前照片</text>
@@ -74,7 +74,7 @@
                 </template>
 
                 <u-form-item label="" >
-                    <u-button style="width: 100%" type="primary"  @click="addRow()" plain>新增巡视工单</u-button>
+                    <u-button style="width: 100%" type="primary"  @click="addRow()" plain>新增巡查工单</u-button>
                 </u-form-item>
 
 
@@ -115,14 +115,14 @@
                         <u-form-item
                                 v-for="(item, index_workOver) in inputForm.workOverNoList"
                                 :key="index_workOver"
-                                :label="`巡视工单 ${index_workOver + 1}`"
+                                :label="`巡查工单 ${index_workOver + 1}`"
                                 :required="true"
                                 :prop="'workOverNoList[' + index_workOver + '].no'"
                         >
                             <u--input
                                     v-model="inputForm.workOverNoList[index_workOver].no"
                                     :disabled="true"
-                                    placeholder="请选择巡视工单编号">
+                                    placeholder="请选择巡查工单编号">
                             </u--input>
                             <u-button type="primary" style="width: 20%" text="处理" @click="disposeWorkOver(inputForm.workOverNoList[index_workOver].id)" v-if="!weighFlag"></u-button>
                         </u-form-item>
@@ -210,6 +210,7 @@
 
                 <u-form-item label="重量（t）" prop="weight" :required="true">
                     <u--input
+                            @change="weightChange"
                             v-model="inputForm.weight"
                             @input="handleInput('weight', $event)"
                             placeholder="重量"
@@ -219,6 +220,7 @@
 
                 <u-form-item label="运输里程（km）" prop="transportMileage" :required="true">
                     <u--input
+                            :disabled="true"
                             v-model="inputForm.transportMileage"
                             @input="handleInput('transportMileage', $event)"
                             placeholder="运输里程"
@@ -228,6 +230,7 @@
 
                 <u-form-item label="补贴（元）" prop="subsidy" :required="true">
                     <u--input
+                            :disabled="true"
                             v-model="inputForm.subsidy"
                             @input="handleInput('subsidy', $event)"
                             placeholder="补贴"
@@ -301,6 +304,7 @@
                     weight: '',
                     transportMileage: '',
                     subsidy: '',
+                    subsidyUnitPrice: '',
                 },
                 rules: {
                     'processingUnit': [
@@ -378,8 +382,12 @@
             },
         },
         methods: {
+            weightChange(weight) {
+                const product = parseFloat(weight) * parseFloat(this.inputForm.transportMileage) * parseFloat(this.inputForm.subsidyUnitPrice);
+                this.inputForm.subsidy = Math.round(product * 100) / 100;
+
+            },
             handleMouseDown(event) {
-                console.log('21312312')
                 event.preventDefault(); // 防止选择文本
                 this.$refs.input.focus(); // 使 input 获得焦点
             },
@@ -425,6 +433,8 @@
                         } else if (taskName === '过磅专员处理') {
                             this.nodeFlag = true;
                             this.weighFlag = true;
+                            //在此处获取发起地区的距离以及计算方式
+
                         }
                     }
 
@@ -588,7 +598,7 @@
                 // 点击删除按钮时，从表格中移除指定行
                 this.inputForm.programIds.splice(index, 1);
                 this.inputForm.workOverNoList.splice(index, 1);
-                //重新获取巡视工单信息
+                //重新获取巡查工单信息
                 this.insertRefreshPhoto()
             },
 
@@ -693,7 +703,7 @@
                         this.inputForm.programId = programIdString
                     }
                     if(this.inputForm.programIds.length == 0){
-                        errors.push("请选择巡视工单")
+                        errors.push("请选择巡查工单")
                     }
                     if(this.weighFlag){
                         if(!this.inputForm.weight){

pages/edt/DisposeRubbishFormDetail.vue

@@ -4,7 +4,7 @@
             <block slot="content">建筑垃圾清运处理</block>
         </cu-custom>
 
-        <!-- First Section: 巡视工单 to 联系方式 -->
+        <!-- First Section: 巡查工单 to 联系方式 -->
         <view class="form-section">
             <u--form :model="inputForm" labelWidth="100px" class="u-form" labelPosition="left" :rules="rules" ref="inputForm">
 
@@ -41,14 +41,14 @@
                         <u-form-item
                                 v-for="(item, index_workOver) in inputForm.workOverNoList"
                                 :key="index_workOver"
-                                :label="`巡视工单 ${index_workOver + 1}`"
+                                :label="`巡查工单 ${index_workOver + 1}`"
                                 :required="true"
                                 :prop="'workOverNoList[' + index_workOver + '].no'"
                         >
                             <u--input
                                     v-model="inputForm.workOverNoList[index_workOver].no"
                                     :disabled="true"
-                                    placeholder="请选择巡视工单编号">
+                                    placeholder="请选择巡查工单编号">
                             </u--input>
                             <u-button type="primary" style="width: 20%" text="详情" @click="disposeWorkOver(inputForm.workOverNoList[index_workOver].id)"></u-button>
                         </u-form-item>

pages/edt/PatrolWorkOrderAuditForm.vue

@@ -1,14 +1,14 @@
 <template>
     <view>
         <cu-custom :backUrl="'/pages/index/index?id=apps'" :isBack="true" bgColor="bg-gradual-blue" v-if="!nodeFlag">
-            <block slot="content">建筑垃圾巡视</block>
+            <block slot="content">建筑垃圾巡查</block>
         </cu-custom>
 
-        <!-- First Section: 巡视工单 to 联系方式 -->
+        <!-- First Section: 巡查工单 to 联系方式 -->
         <view class="form-section">
             <u--form :model="inputForm" labelWidth="100px" class="u-form" labelPosition="left" :rules="rules" ref="inputForm">
 
-                <u-form-item label="巡视工单" prop="no">
+                <u-form-item label="巡查工单" prop="no">
                     <u--input v-model="inputForm.no" :disabled="true" placeholder="工单编号" clearable></u--input>
                 </u-form-item>
 

pages/edt/PatrolWorkOrderDisposeForm.vue

@@ -1,14 +1,14 @@
 <template>
     <view>
         <cu-custom :backUrl="'/pages/index/index?id=apps'" :isBack="true" bgColor="bg-gradual-blue">
-            <block slot="content">建筑垃圾巡视</block>
+            <block slot="content">建筑垃圾巡查</block>
         </cu-custom>
 
-        <!-- First Section: 巡视工单 to 联系方式 -->
+        <!-- First Section: 巡查工单 to 联系方式 -->
         <view class="form-section">
             <u--form :model="inputForm" labelWidth="100px" class="u-form" labelPosition="left" :rules="rules" ref="inputForm" v-if="!nodeFlag">
 
-                <u-form-item label="巡视工单" prop="no">
+                <u-form-item label="巡查工单" prop="no">
                     <u--input v-model="inputForm.no" :disabled="true" placeholder="工单编号" clearable></u--input>
                 </u-form-item>
 

pages/edt/PatrolWorkOrderForm.vue

@@ -1,14 +1,14 @@
 <template>
     <view>
         <cu-custom :backUrl="'/pages/index/index?id=apps'" :isBack="true" bgColor="bg-gradual-blue" v-if="!nodeFlag">
-            <block slot="content">建筑垃圾巡视</block>
+            <block slot="content">建筑垃圾巡查</block>
         </cu-custom>
 
-        <!-- First Section: 巡视工单 to 联系方式 -->
+        <!-- First Section: 巡查工单 to 联系方式 -->
         <view class="form-section">
             <u--form :model="inputForm" labelWidth="100px" class="u-form" labelPosition="left" :rules="rules" ref="inputForm" v-if="!nodeFlag">
 
-                <u-form-item label="巡视工单" prop="no">
+                <u-form-item label="巡查工单" prop="no">
                     <u--input v-model="inputForm.no" :disabled="true" placeholder="工单编号" clearable></u--input>
                 </u-form-item>
 
@@ -31,7 +31,7 @@
 
             <u--form :model="inputForm" labelWidth="100px" class="u-form" labelPosition="left" :rules="rules" ref="inputForm" v-if="nodeFlag">
 
-                <u-form-item label="巡视工单" prop="no">
+                <u-form-item label="巡查工单" prop="no">
                     <u--input v-model="inputForm.no" :disabled="true" placeholder="工单编号" clearable></u--input>
                 </u-form-item>
 

pages/login/login.vue

@@ -47,11 +47,45 @@
 				<u-button type="primary" shape="circle" color="linear-gradient(90deg, #1989FA, #19C2FA)" @click="bindLogin" text="立即登录"></u-button>
 			</view>
 			<view class="fot">
-				<!--<text @tap="reg_ok">免费注册</text>
-				<text style="display: inline-block;width: 10vw;"></text>-->
-				<!--<text @tap="openForgetPassword" style="color: #1989FA;">忘记密码</text>-->
+				<text @tap="loginOnPassword" style="color: #1989FA;">账号密码登陆</text>
+				<text style="display: inline-block;width: 10vw;"></text>
+				<text @tap="openForgetPassword" style="color: #1989FA;">忘记密码</text>
 			</view>
 	</view>
+		<view id="box" v-else-if="whichPage === '3'">
+
+			<view id="top" class="">
+				<view class="top_le"></view>
+				<view class="top_ri"></view>
+			</view>
+			<view class="title">
+				<view>账号密码登陆</view>
+				<!--<view>使用账号绑定的手机号找回密码</view>-->
+			</view>
+			<view class="login-form">
+				<u--form :model="inputForm" labelWidth="100px"  labelPosition="left" :rules="rules" ref="uForm">
+					<u-form-item label="用户名" borderBottom prop="username">
+						<u-input border="none" v-model="inputForm.username" />
+					</u-form-item>
+					<u-form-item label="密码" borderBottom prop="password">
+						<u-input border="none" password v-model="inputForm.password" />
+					</u-form-item>
+					<u-form-item label="验证码" borderBottom prop="code">
+						<u-input border="none" v-model="inputForm.code" />
+						<u--image :showLoading="true" :src="captchaImg" width="140px" height="40px" @click="getCaptcha"></u--image>
+					</u-form-item>
+				</u--form>
+			</view>
+			<view class="but">
+				<u-button type="primary" shape="circle" color="linear-gradient(90deg, #1989FA, #19C2FA)" @click="bindLogin" text="欢迎登录"></u-button>
+			</view>
+			<view class="fot">
+				<!--				<text @tap="reg_ok">免费注册</text>-->
+				<!--				<text style="display: inline-block;width: 10vw;"></text>-->
+				<text @tap="backLogin" style="color: #1989FA;">返回登陆页面</text>
+			</view>
+		</view>
+
 		<view id="box" v-else-if="whichPage === '2'">
 
 			<view id="top" class="">
@@ -60,7 +94,7 @@
 			</view>
 			<view class="title">
 				<view>修改密码</view>
-				<view>使用账号绑定的手机号找回密码</view>
+				<!--<view>使用账号绑定的手机号找回密码</view>-->
 			</view>
 			<view class="login-form">
 				<u--form :model="inputForm" labelWidth="100px"  labelPosition="left" :rules="rules" ref="uForm">
@@ -89,7 +123,7 @@
 			<view class="fot">
 				<!--				<text @tap="reg_ok">免费注册</text>-->
 				<!--				<text style="display: inline-block;width: 10vw;"></text>-->
-				<text @tap="backLogin" style="color: #1989FA;">前往登录页面</text>
+				<text @tap="backLogin" style="color: #1989FA;">返回登陆页面</text>
 			</view>
 		</view>
 	</view>
@@ -234,6 +268,14 @@
 					this.whichPage = '2' // 打开忘记密码页面
 				})
 			},
+			loginOnPassword () {
+				this.inputForm.username = ''
+				this.inputForm.password = ''
+				this.inputForm.code = ''
+				this.$nextTick(() => {
+					this.whichPage = '3' // 打开账号密码页面
+				})
+			},
 			backLogin () {
 				this.inputForm.phoneNumber = ''
 				this.inputForm.phoneCode = ''
@@ -411,14 +453,23 @@
 						reject('Form validation failed');
 					} else {
 						loginService.savePwd(this.inputForm).then((data) => {
+
 							if (data.success) {
-								this.$message.success(data.message)
+								uni.showToast({
+									title: data.message,
+									icon: "success",
+									duration: 1500  // 提示持续时间为1秒（1000毫秒）
+								});
 								this.inputForm.username = this.inputForm.phoneNumber
 								this.inputForm.newPassword = this.inputForm.newPassword
 								this.backLogin() // 修改密码成功后返回登录页面
 								this.loading = false
 							} else {
-								this.$message.error(data.message)
+								uni.showToast({
+									title: data.message,
+									icon: 'none',
+									duration: 1500
+								});
 								this.loading = false
 							}
 						}).catch(() => {

pages/workbench/workbench.vue

@@ -77,7 +77,7 @@
           <span class="cuIcon-title" style="color: #f67e1f;margin-right: 5px;"></span>
           <span v-if="userInfo.roleNames === '过磅专员' " style="font-weight: bold">过磅记录</span>
           <span v-if="userInfo.roleNames === '村负责人' " style="font-weight: bold">清运记录</span>
-          <span v-if="userInfo.roleNames === '巡视员' || userInfo.roleNames === '乡镇巡查员' " style="font-weight: bold">垃圾巡视</span>
+          <span v-if="userInfo.roleNames === '巡查员' || userInfo.roleNames === '乡镇巡查员' " style="font-weight: bold">垃圾巡查</span>
           <span v-if="userInfo.roleNames === '乡镇负责人' " style="font-weight: bold">清运记录</span>
         </span>
 			</view>
@@ -181,8 +181,8 @@
 
 		<!-- 页脚区域 -->
 		<view class="footer-div">
-			<!--<u-button v-if="userInfo.roleNames == '巡视员' || userInfo.roleNames == '乡镇巡查员' " type="primary" text="巡视工单" @click="openPatrolWorkOrderForm()"></u-button>-->
-			<u-button v-if="userInfo.roleNames == '巡视员' || userInfo.roleNames == '乡镇巡查员' " type="primary" text="巡视工单" @click="start()"></u-button>
+			<!--<u-button v-if="userInfo.roleNames == '巡查员' || userInfo.roleNames == '乡镇巡查员' " type="primary" text="巡查工单" @click="openPatrolWorkOrderForm()"></u-button>-->
+			<u-button v-if="userInfo.roleNames == '巡查员' || userInfo.roleNames == '乡镇巡查员' " type="primary" text="巡查工单" @click="start()"></u-button>
 			<u-button v-if="userInfo.roleNames == '村负责人' " type="primary" text="清运工单" @click="start()"></u-button>
 		</view>
 	</view>
@@ -338,7 +338,7 @@
 							borderRadius: '15px',
 							backgroundImage: 'linear-gradient(to right, #0285f7 0%, #19b3bd 100%)'
 						};
-					case '巡视员':
+					case '巡查员':
 					case '乡镇巡查员':
 						return {
 							height: '130px',
@@ -684,9 +684,9 @@
 							row = data.records[0].procDef
 						});
 						break;
-					case '巡视员':
+					case '巡查员':
 					case '乡镇巡查员':
-						this.sprocessForm.filterText = '巡视工单流程'
+						this.sprocessForm.filterText = '巡查工单流程'
 						//根据用户id查询流程id
 						await taskService.getProcessDefIdByRoleName({
 							filter: "processes",