From 193955d7d60040712d3938f81c735070401d3dfb Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 21 Jul 2022 15:32:34 +0800
Subject: [PATCH] up

---
 src/views/assess/clue.vue                |  7 ++++--
 src/views/assess/daily.vue               |  7 ++++--
 src/views/assess/wade.vue                |  7 ++++--
 src/views/common/index.vue               | 13 +++++++----
 src/views/rain/basic/account.vue         | 29 +++++++++++++-----------
 src/views/rain/basic/area.vue            |  7 ++++--
 src/views/rain/basic/group.vue           |  7 ++++--
 src/views/rain/basic/site.vue            |  7 ++++--
 src/views/rain/basic/unit.vue            |  7 ++++--
 src/views/rain/inspection/inspection.vue |  7 ++++--
 src/views/rain/maintain/maintain.vue     | 11 +++++----
 src/views/rain/order/order.vue           |  7 ++++--
 12 files changed, 76 insertions(+), 40 deletions(-)

diff --git a/src/views/assess/clue.vue b/src/views/assess/clue.vue
index dff8cfd..1addba4 100644
--- a/src/views/assess/clue.vue
+++ b/src/views/assess/clue.vue
@@ -32,6 +32,9 @@
                     style="margin-left: 10px;">编辑</Button>
                   <Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
                 </div>
+                <div v-else-if="column.type=='format'">
+                  {{scope.row[column.field]?scope.row[column.field].name:""}}
+                </div>
 
                 <div v-else>{{scope.row[column.field]}}</div>
               </template>
@@ -372,9 +375,9 @@
             align: "center"
           },
           {
-            field: "admin_id",
+            field: "admin",
             title: "提交人",
-            type: "string",
+            type: "format",
             align: "center",
             width:180
           },
diff --git a/src/views/assess/daily.vue b/src/views/assess/daily.vue
index e7d7b40..2d8b158 100644
--- a/src/views/assess/daily.vue
+++ b/src/views/assess/daily.vue
@@ -29,6 +29,9 @@
                     <el-tag v-if="scope.row[column.field]==2" type="success">已处理</el-tag>
                     <el-tag v-if="scope.row[column.field]==3" type="danger">未处理</el-tag>
                 </div>
+                <div v-else-if="column.type=='format'">
+                  {{scope.row[column.field]?scope.row[column.field].name:""}}
+                </div>
                 <div v-else>{{scope.row[column.field]}}</div>
               </template>
           </el-table-column>
@@ -239,9 +242,9 @@ import AvueMap from 'avue-plugin-map'
             align: "center"
           },
           {
-            field: "admin_id",
+            field: "admin",
             title: "提交人",
-            type: "string",
+            type: "format",
             align: "center",
             width:180
           },
diff --git a/src/views/assess/wade.vue b/src/views/assess/wade.vue
index 3c231ea..578cc7c 100644
--- a/src/views/assess/wade.vue
+++ b/src/views/assess/wade.vue
@@ -29,6 +29,9 @@
                     <el-tag v-if="scope.row[column.field]==2" type="success">在建</el-tag>
                     <el-tag v-if="scope.row[column.field]==3">完工</el-tag>
                 </div>
+                <div v-else-if="column.type=='format'">
+                  {{scope.row[column.field]?scope.row[column.field].name:""}}
+                </div>
                 <div v-else>{{scope.row[column.field]}}</div>
               </template>
           </el-table-column>
@@ -211,9 +214,9 @@ import AvueMap from 'avue-plugin-map'
             align: "center"
           },
           {
-            field: "admin_id",
+            field: "admin",
             title: "提交人",
-            type: "string",
+            type: "format",
             align: "center",
             width:180
           },
diff --git a/src/views/common/index.vue b/src/views/common/index.vue
index d895e25..eaf6dee 100644
--- a/src/views/common/index.vue
+++ b/src/views/common/index.vue
@@ -46,6 +46,9 @@
                 <div v-else-if="column.type=='ask_type_id'">
                   {{scope.row[column.field]}}
                 </div>
+                <div v-else-if="column.type=='format'">
+                  {{scope.row[column.field]?scope.row[column.field].name:""}}
+                </div>
                 <div v-else>{{scope.row[column.field]}}</div>
               </template>
           </el-table-column>
@@ -416,16 +419,16 @@
              width:120
           },
           {
-            field: "username",
+            field: "user",
             title: "提交人",
-            type: "user",
+            type: "format",
             align: "center",
              width:180
           },
           {
-            field: "department_id",
+            field: "department",
             title: "提交科室",
-            type: "string",
+            type: "format",
             align: "center",
              width:180
           },
@@ -509,7 +512,7 @@
           keyword: this.searchFields.KeyWord
         }).then(response => {
           for(var m of response.data){
-              m.username = m.user?m.user.name:""
+              // m.username = m.user?m.user.name:""
               m.ask_type_name = m.ask_type_detail?m.ask_type_detail.value:""
               m.ask_content_name = m.ask_content_detail?m.ask_content_detail.value:""
           }
diff --git a/src/views/rain/basic/account.vue b/src/views/rain/basic/account.vue
index 8e43f08..12f1931 100644
--- a/src/views/rain/basic/account.vue
+++ b/src/views/rain/basic/account.vue
@@ -24,6 +24,9 @@
                     style="margin-left: 10px;">编辑</Button>
                   <Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
                 </div>
+                <div v-else-if="column.type=='format'">
+                  {{scope.row[column.field]?scope.row[column.field].name:""}}
+                </div>
                 <div v-else>{{scope.row[column.field]}}</div>
               </template>
           </el-table-column>
@@ -211,30 +214,30 @@
             align: "center"
           },
           {
-            field: "area_id",
+            field: "area",
             title: "所属片区",
-            type: "string",
+            type: "format",
             align: "center"
           },
           {
-            field: "maintain_id",
+            field: "maintain",
             title: "所属养护单位",
-            type: "string",
+            type: "format",
             align: "center"
           },
           {
-            field: "group_id",
+            field: "group",
             title: "所属巡查养护组",
-            type: "string",
+            type: "format",
             align: "center"
           },
-          {
-            field: "admin_id",
-            title: "提交人",
-            type: "string",
-            align: "center",
-            width:180
-          },
+          // {
+          //   field: "admin_id",
+          //   title: "提交人",
+          //   type: "string",
+          //   align: "center",
+          //   width:180
+          // },
           {
             field: "created_at",
             title: "提交日期",
diff --git a/src/views/rain/basic/area.vue b/src/views/rain/basic/area.vue
index 579c376..0e5ea8d 100644
--- a/src/views/rain/basic/area.vue
+++ b/src/views/rain/basic/area.vue
@@ -24,6 +24,9 @@
                     style="margin-left: 10px;">编辑</Button>
                   <Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
                 </div>
+                <div v-else-if="column.type=='format'">
+                  {{scope.row[column.field]?scope.row[column.field].name:""}}
+                </div>
                 <div v-else>{{scope.row[column.field]}}</div>
               </template>
           </el-table-column>
@@ -158,9 +161,9 @@
             align: "center"
           },
           {
-            field: "admin_id",
+            field: "admin",
             title: "提交人",
-            type: "string",
+            type: "format",
             align: "center"
           },
           {
diff --git a/src/views/rain/basic/group.vue b/src/views/rain/basic/group.vue
index 8cccfee..3953277 100644
--- a/src/views/rain/basic/group.vue
+++ b/src/views/rain/basic/group.vue
@@ -24,6 +24,9 @@
                     style="margin-left: 10px;">编辑</Button>
                   <Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
                 </div>
+                <div v-else-if="column.type=='format'">
+                  {{scope.row[column.field]?scope.row[column.field].name:""}}
+                </div>
                 <div v-else>{{scope.row[column.field]}}</div>
               </template>
           </el-table-column>
@@ -158,9 +161,9 @@
             align: "center"
           },
           {
-            field: "admin_id",
+            field: "admin",
             title: "提交人",
-            type: "string",
+            type: "format",
             align: "center"
           },
           {
diff --git a/src/views/rain/basic/site.vue b/src/views/rain/basic/site.vue
index ce8f242..df2fa8a 100644
--- a/src/views/rain/basic/site.vue
+++ b/src/views/rain/basic/site.vue
@@ -31,6 +31,9 @@
                     </div>
                   </div>
                 </div>
+                <div v-else-if="column.type=='format'">
+                  {{scope.row[column.field]?scope.row[column.field].name:""}}
+                </div>
                 <div v-else>{{scope.row[column.field]}}</div>
               </template>
           </el-table-column>
@@ -247,9 +250,9 @@
             width:120
           },
           {
-            field: "admin_id",
+            field: "admin",
             title: "提交人",
-            type: "string",
+            type: "format",
             align: "center",
             width:120
           },
diff --git a/src/views/rain/basic/unit.vue b/src/views/rain/basic/unit.vue
index fff447c..b57cf34 100644
--- a/src/views/rain/basic/unit.vue
+++ b/src/views/rain/basic/unit.vue
@@ -24,6 +24,9 @@
                     style="margin-left: 10px;">编辑</Button>
                   <Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
                 </div>
+                <div v-else-if="column.type=='format'">
+                  {{scope.row[column.field]?scope.row[column.field].name:""}}
+                </div>
                 <div v-else>{{scope.row[column.field]}}</div>
               </template>
           </el-table-column>
@@ -156,9 +159,9 @@
             align: "center"
           },
           {
-            field: "admin_id",
+            field: "admin",
             title: "提交人",
-            type: "string",
+            type: "format",
             align: "center"
           },
           {
diff --git a/src/views/rain/inspection/inspection.vue b/src/views/rain/inspection/inspection.vue
index 960a72b..ec8826f 100644
--- a/src/views/rain/inspection/inspection.vue
+++ b/src/views/rain/inspection/inspection.vue
@@ -49,6 +49,9 @@
                 <el-tag type="warning" v-if="scope.row[column.field]==2">已办结</el-tag>
                 <el-tag type="info" v-if="scope.row[column.field]==3">已退回</el-tag>
 
+              </div>
+              <div v-else-if="column.type=='format'">
+                {{scope.row[column.field]?scope.row[column.field].name:""}}
               </div>
               <!-- <div v-else-if="column.type=='end_type'">
                     <el-tag v-if="scope.row[column.field]==0">无</el-tag>
@@ -797,9 +800,9 @@
           //   width:160
           // },
           {
-            field: "admin_id",
+            field: "admin",
             title: "提交人",
-            type: "string",
+            type: "format",
             align: "center",
             width: 180
           },
diff --git a/src/views/rain/maintain/maintain.vue b/src/views/rain/maintain/maintain.vue
index 831bfdc..b15acd1 100644
--- a/src/views/rain/maintain/maintain.vue
+++ b/src/views/rain/maintain/maintain.vue
@@ -53,6 +53,9 @@
                   <el-tag type="danger" v-if="scope.row[column.field]==4">缺陷办结</el-tag>
 
                 </div>
+                <div v-else-if="column.type=='format'">
+                  {{scope.row[column.field]?scope.row[column.field].name:""}}
+                </div>
                <!-- <div v-else-if="column.type=='end_type'">
                     <el-tag v-if="scope.row[column.field]==0">无</el-tag>
                     <el-tag  type="danger" v-if="scope.row[column.field]==1" >违法转办</el-tag>
@@ -845,9 +848,9 @@
           //   width:160
           // },
           {
-            field: "admin_id",
+            field: "admin",
             title: "提交人",
-            type: "string",
+            type: "admin",
             align: "center",
             width:180
           },
@@ -898,14 +901,14 @@
           page: 1,
           page_size: 99
         }).then(res => {
-          
+
           for(var m of res.data){
             that.selects.areasList.push({
               id:m.id,
               name:m.name
             })
           }
-          
+
         })
       },
       handleCurrentChange(page) {
diff --git a/src/views/rain/order/order.vue b/src/views/rain/order/order.vue
index d240c04..67f7037 100644
--- a/src/views/rain/order/order.vue
+++ b/src/views/rain/order/order.vue
@@ -24,6 +24,9 @@
                     style="margin-left: 10px;">编辑</Button>
                   <Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button>
                 </div>
+                <div v-else-if="column.type=='format'">
+                  {{scope.row[column.field]?scope.row[column.field].name:""}}
+                </div>
                 <div v-else>{{scope.row[column.field]}}</div>
               </template>
           </el-table-column>
@@ -264,9 +267,9 @@
             width:180
           },
           {
-            field: "admin_id",
+            field: "admin",
             title: "提交人",
-            type: "string",
+            type: "format",
             align: "center",
             width:180
           },