From c40faa96c951b793bdf457c529ab3f375b6b8948 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sat, 27 Apr 2024 11:23:31 +0800
Subject: [PATCH] 更新
---
pages/home/index.vue | 8 ++++++--
pages/home/launch.html | 10 +++++++---
pages/home/launch.vue | 8 +++++---
subPackage/school/troubleDetail.vue | 15 +++++++++++----
subPackage/school/clockIn.vue | 19 ++++++-------------
5 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/pages/home/index.vue b/pages/home/index.vue
index deeab46..f7a4915 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1073,8 +1073,12 @@
code: this.validationCode
}).then(res => {
if (res.code == 200) {
- this.navToPage();
- this.isShowModal = false;
+ if (res.data) {
+ this.navToPage();
+ this.isShowModal = false;
+ } else {
+ this.$showTips(res.msg);
+ }
}
})
},
diff --git a/pages/home/launch.html b/pages/home/launch.html
index a8ec79e..630831e 100644
--- a/pages/home/launch.html
+++ b/pages/home/launch.html
@@ -9,11 +9,15 @@
<script type="text/javascript">
var config = {
id: "wx41aa8a5d2e565a05",
- path: "subPackage/workbench/views/cscj",
- version: "trial"
+ path: "page/login/login",
+ version: "develop",
+ query: {
+ type: 1
+ }
}
window.onload = function() {
- location.href = `weixin://dl/business/?appid=${config.id}&path=${config.path}&env_version=${config.version}`
+ location.href =
+ `weixin://dl/business/?appid=${config.id}&path=${config.path}&env_version=${config.version}&query=${config.query}`
})
</script>
</body>
diff --git a/pages/home/launch.vue b/pages/home/launch.vue
index 13d1a96..8ef86d4 100644
--- a/pages/home/launch.vue
+++ b/pages/home/launch.vue
@@ -18,9 +18,11 @@
navTo() {
var config = {
id: "wx41aa8a5d2e565a05",
- path: "subPackage/workbench/views/cscj",
- version: "trial",
- query: "test"
+ path: "page/login/login",
+ version: "develop",
+ query: {
+ type: 1
+ }
}
location.href =
`weixin://dl/business/?appid=${config.id}&path=${config.path}&env_version=${config.version}&query=${config.query}`
diff --git a/subPackage/school/clockIn.vue b/subPackage/school/clockIn.vue
index 7ca38a4..b98a779 100644
--- a/subPackage/school/clockIn.vue
+++ b/subPackage/school/clockIn.vue
@@ -13,7 +13,6 @@
<view class="content bgc-ff">
<u-form labelPosition="left" :model="info" :rules="rules" ref="form" labelWidth="90"
:labelStyle="{fontSize:'28rpx'}">
-
<u-form-item label="角色类型" prop="type" borderBottom ref="phone" @click="showPicker = true"
v-if="roleName !='mj'">
<u-input v-model="clockInRoleTypeValue" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
@@ -75,19 +74,12 @@
</view>
</view>
-
<!-- <button class="submit-btn" @click="sumitInfo">提交</button> -->
<!-- <button class="list-btn" @click="navigatorPage">我上报的事件</button> -->
-
<footer-btn @click="sumitInfo"></footer-btn>
-
-
<u-picker :defaultIndex="clockInRoleTypeIndex" :closeOnClickOverlay="true" :show="showPicker"
:columns="[statusList]" @close="showPicker = false" @cancel="showPicker = false" keyName="name"
@confirm="confirmPicker"></u-picker>
-
-
-
</view>
</template>
@@ -97,8 +89,6 @@
import {
addClockIn
} from "@/api/school/school.js";
-
-
import {
getQrCodeDetail
} from "@/api/system/index"
@@ -200,8 +190,12 @@
})
},
-
sumitInfo() {
+ if (this.info.type == 2) {
+ this.info.gradeAndClass = "";
+ this.info.realName = "";
+ }
+
this.$refs.form.validate().then(valid => {
if (this.form.images.length > 0) {
let urls = []
@@ -210,7 +204,6 @@
})
this.info.images = urls.join(",")
}
-
addClockIn(this.info).then(res => {
this.$showTips("提交成功", "success")
setTimeout(() => {
@@ -224,7 +217,7 @@
confirmPicker(e) {
this.clockInRoleTypeIndex = e.indexs;
this.clockInRoleTypeValue = e.value[0].name;
- this.info.type = e.value[0].value;
+ this.info.type = e.value[0].id;
this.showPicker = false;
},
diff --git a/subPackage/school/troubleDetail.vue b/subPackage/school/troubleDetail.vue
index 38533ea..97f66cf 100644
--- a/subPackage/school/troubleDetail.vue
+++ b/subPackage/school/troubleDetail.vue
@@ -191,20 +191,27 @@
submitInfo() {
let data = {
- id: this.info.id,
-
+ id: this.info.id
}
if (this.roleTypeName == "xyzt") {
- data.confirmFlag = 1;
if (!this.form.isProblem) {
this.$showTips("请选择是否隐患")
return;
}
-
if (!this.form.isHandle) {
this.$showTips("请选择是否处理")
return;
}
+ if (this.form.isProblem == 2) {
+ if (this.form.isHandle) {
+ delete this.form.isHandle;
+ }
+ data.confirmFlag = 2;
+ } else if (this.form.isHandle == 1) {
+ data.confirmFlag = 2;
+ } else {
+ data.confirmFlag = 1;
+ }
} else {
if (!this.confirmNotion) {
this.$showTips("请输入处理意见")
--
Gitblit v1.9.3