From 7237b76c8fe87df70ae2e3b4a03cf675140960fc Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 17 May 2024 16:05:10 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jczz_web

---
 src/views/cGovernance/taskECallTwo/index.vue |   76 +++++++++++++++++++-------------------
 1 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/views/cGovernance/taskECallTwo/index.vue b/src/views/cGovernance/taskECallTwo/index.vue
index 8bee266..1f0957d 100644
--- a/src/views/cGovernance/taskECallTwo/index.vue
+++ b/src/views/cGovernance/taskECallTwo/index.vue
@@ -120,6 +120,18 @@
               }, ],
             },
             {
+              width: 156,
+              label: "诉求主题",
+              prop: "issueTitle",
+              search: true,
+              searchSpan: 4,
+              rules: [{
+                required: true,
+                message: "请选择诉求主题",
+                trigger: "blur",
+              }],
+            },
+            {
               width: 100,
               label: "诉求来源",
               prop: "issueOrigin",
@@ -147,24 +159,6 @@
               }, ],
               // search: true,
             },
-
-            {
-              width: 156,
-              overHidden: true,
-              label: "诉求主题",
-              addDisplay: false,
-              editDisplay: false,
-              viewDisplay: false,
-              prop: "issueTitle",
-              search: true,
-              searchSpan: 4,
-              rules: [{
-                required: true,
-                message: "请选择诉求主题",
-                trigger: "blur",
-              }],
-            },
-
             {
               label: "诉求内容",
               parent: false,
@@ -187,10 +181,10 @@
               type: "select",
               dicData: [{
                 label: "个人",
-                value: 0
+                value: "0"
               }, {
                 label: "企业",
-                value: 1
+                value: "1"
               }],
               // hide: true,
               // search: true,
@@ -218,10 +212,10 @@
               type: "select",
               dicData: [{
                 label: "男",
-                value: 0
+                value: "0"
               }, {
                 label: "女",
-                value: 1
+                value: "1"
               }],
               rules: [{
                   required: false,
@@ -229,7 +223,7 @@
                   trigger: "blur",
                 },
                 {
-                  validator: validatorPhone,
+                  // validator: validatorPhone,
                   trigger: 'blur'
                 }
               ],
@@ -254,10 +248,15 @@
               // format: "yyyy-MM-dd",
               // valueFormat: "yyyy-MM-dd",
               rules: [{
-                required: true,
-                message: "请选择现场联系电话",
-                trigger: "blur",
-              }, ],
+                  required: false,
+                  message: "请输入现场联系电话",
+                  trigger: "blur",
+                },
+                {
+                  validator: validatorPhone,
+                  trigger: 'blur'
+                }
+              ],
             },
             {
               label: "网格",
@@ -374,19 +373,19 @@
               type: "select",
               dicData: [{
                 label: "咨询",
-                value: 0
+                value: "0"
               }, {
                 label: "投诉",
-                value: 1
+                value: "1"
               }, {
                 label: "求助",
-                value: 2
+                value: "2"
               }, {
                 label: "举报",
-                value: 3
+                value: "3"
               }, {
                 label: "建议",
-                value: 4
+                value: "4"
               }],
               // hide: true,
             },
@@ -414,10 +413,10 @@
               type: "select",
               dicData: [{
                 label: "一般",
-                value: 0
+                value: "0"
               }, {
                 label: "即办",
-                value: 1
+                value: "1"
               }],
               // hide: true,
             },
@@ -504,13 +503,13 @@
               type: "select",
               dicData: [{
                 label: "受理",
-                value: 0
+                value: "0"
               }, {
                 label: "处理中",
-                value: 1
+                value: "1"
               }, {
                 label: "已归档",
-                value: 2
+                value: "2"
               }],
               // hide: true,
             },
@@ -822,8 +821,9 @@
       },
       beforeOpen(done, type) {
         if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then((res) => {
+          getDetail(this.form.orderId).then((res) => {
             this.form = res.data.data
+            this.form.sceneAddr = [this.form.sceneGeoLng, this.form.sceneGeoLat, this.form.sceneAddr].join(',')
             // if (this.form.imageUrls.length > 0) {
             //   var urls = []
             //   var names = this.form.imageUrls.split(",")

--
Gitblit v1.9.3