diff --git a/components/bottom-button/three2.vue b/components/bottom-button/three2.vue
new file mode 100644
index 0000000..d209ea4
--- /dev/null
+++ b/components/bottom-button/three2.vue
@@ -0,0 +1,138 @@
+
+
+
+
+
+
+
+
+
+ {{ firstText }}
+
+
+
+
+
+ {{ secondText }}
+
+
+
+
+
+ {{
+ isSubmit ? (type == "view" ? "关闭" : thirdText) : nextText
+ }}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/investigation/task.vue b/pages/investigation/task.vue
index a877c45..2208fad 100644
--- a/pages/investigation/task.vue
+++ b/pages/investigation/task.vue
@@ -432,11 +432,11 @@
-
+
+
+
import BottomButton from "../../components/bottom-button/three.vue";
+ import BottomButton2 from "../../components/bottom-button/three2.vue";
import BottomButtonTwo from "../../components/bottom-button/index.vue";
import NoData from "../../components/no-data.vue";
import TopTitle from "../../components/top-title.vue";
@@ -461,6 +462,7 @@
TopTitle,
NoData,
BottomButton,
+ BottomButton2,
BottomButtonTwo,
InvestigationItem,
@@ -1471,21 +1473,25 @@
}
},
bottomButtonTwo() {
- if (!this.formData.roadType) {
+ console.log(this.type)
+ if(!this.type) {
+ if (!this.formData.roadType) {
return this.$.toast("请输入道路类型");
+ }
+ if (!this.formData.roadWidth) {
+ return this.$.toast("请输入道路宽度");
+ }
+ if (!this.formData.laneCount) {
+ return this.$.toast("请输入车道数");
+ }
+ if (!this.formData.designSpeed) {
+ return this.$.toast("请输入设计时速");
+ }
+ if (!this.formData.limitSpeed) {
+ return this.$.toast("请输入限速");
+ }
}
- if (!this.formData.roadWidth) {
- return this.$.toast("请输入道路宽度");
- }
- if (!this.formData.laneCount) {
- return this.$.toast("请输入车道数");
- }
- if (!this.formData.designSpeed) {
- return this.$.toast("请输入设计时速");
- }
- if (!this.formData.limitSpeed) {
- return this.$.toast("请输入限速");
- }
+
this.isEdit = false;
this.active = 2;
},