From 635e1b3c0d48c2db884794cb8bc26d6ff1591ffa Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期四, 21 十二月 2023 16:24:46 +0800
Subject: [PATCH] 1.增加行政处罚的数据展示 2.增加信访的数据展示

---
 src/views/fytz/user/UserEdit.vue |   62 +++++++++++++++++++++---------
 1 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/src/views/fytz/user/UserEdit.vue b/src/views/fytz/user/UserEdit.vue
index 60e1399..479bd47 100644
--- a/src/views/fytz/user/UserEdit.vue
+++ b/src/views/fytz/user/UserEdit.vue
@@ -15,11 +15,12 @@
       <div class="sub-title">鐢ㄦ埛淇℃伅琛�</div>
       <FormCol>
         <!-- <CompUserInfos :form-info="formUserInfos" /> -->
+        <CompBaseInfo :form-info="formUserInfos" />
       </FormCol>
       <el-divider />
       <div class="sub-title">浼佷笟淇℃伅</div>
       <FormCol>
-        <!-- <CompPanyInfo :form-info="formVehicleBaseInfo" /> -->
+        <CompPanyInfo :form-info="formPanyInfo" />
       </FormCol>
       <!-- <template v-if="formAnyInfo.typeid == 1">
         <div class="sub-title">娌圭儫鍑�鍖栬缃�</div>
@@ -51,9 +52,7 @@
         </el-col>
         <el-col :span="6">
           <el-row justify="end" align="middle" style="height: 80px">
-            <el-button type="success" @click="drawer = true"
-              >鏂板璁惧</el-button
-            >
+            <el-button type="success" @click="drawer = true">鏂板璁惧</el-button>
           </el-row>
         </el-col>
       </el-row>
@@ -73,14 +72,14 @@
     <el-tab-pane label="琛屾斂澶勭綒" name="fourth">
       <div class="sub-title">琛屾斂澶勭綒琛�</div>
       <FormCol>
-        <!-- <CompPunishment :form-info="formProblem" /> -->
+        <CompPunishment :table-info="formPunishment" />
       </FormCol>
     </el-tab-pane>
 
     <el-tab-pane label="淇¤鎶曡瘔" name="fifth">
       <div class="sub-title">淇¤鎶曡瘔</div>
       <FormCol>
-        <!-- <CompLaint :form-info="formLaint" /> -->
+        <CompComplaint :table-info="formComplaint" />
       </FormCol>
     </el-tab-pane>
 
@@ -97,8 +96,15 @@
 
 <script>
 import userApi from '@/api/fytz/userApi';
+import punishmentApi from '@/api/fytz/punishmentApi';
+import lettersAndVisitsApi from '@/api/fytz/lettersAndVisitsApi';
+
 // import ComBaseInformation from '@/views/baseinfo/fytz/scene/ComBaseInformation.vue';
 import CompUserInfo from './components/CompUserInfo.vue';
+import CompBaseInfo from './components/CompBaseInfo.vue';
+import CompPanyInfo from './components/CompPanyInfo.vue';
+import CompPunishment from './components/CompPunishment.vue';
+import CompComplaint from './components/CompComplaint.vue';
 // import CompLaint from '@/views/baseinfo/fytz/scene/CompLaint.vue';
 // import CompDeviceInfo from "@/views/baseinfo/fytz/scene/CompDeviceInfo.vue";
 // import CompPanyInfo from '@/views/baseinfo/fytz/scene/CompPanyInfo.vue';
@@ -116,6 +122,10 @@
     // ComBaseInformation,
     // CompLaint,
     CompUserInfo,
+    CompBaseInfo,
+    CompPanyInfo,
+    CompPunishment,
+    CompComplaint
     // CompDeviceInfo,
     // CompPanyInfo,
     // CompFumePurifyDevice,
@@ -132,31 +142,45 @@
       drawer: false,
       formUser: {},
       // formSubScene: {},
-      formLaint: {},
+      formComplaint: [],
       // formDevice: {},
       formPanyInfo: {},
       formFumePurifyDevice: {},
       formHazardousWasteFile: {},
       formHazardousWasteRecord: {},
       formProblem: {},
-      formPunishment: {},
+      formPunishment: [],
       formRestaurantBaseInfo: {},
       formVehicleBaseInfo: {},
       formUserInfos: {},
       activeName: 'first',
-      scroll: '',
+      scroll: ''
     };
   },
   beforeRouteEnter(to, from, next) {
     userApi.fetchUserBaseInfo(to.params.userId).then((res) => {
-      next((vm) => {
-        if (res.userInfo) {
-          vm.formUser = res.userInfo;
-        } else {
-          vm.formUser = {
-            guid: to.params.userId,
-          };
-        }
+      punishmentApi.fetchPunishment(to.params.userId).then((punish) => {
+        lettersAndVisitsApi.fetchLetterAndVisit(to.params.userId).then((letterAndVisit) => {
+          next((vm) => {
+            if (res.userInfo) {
+              vm.formUser = res.userInfo;
+            } else {
+              vm.formUser = {
+                guid: to.params.userId
+              };
+            }
+            if (res.baseInfo) {
+              vm.formUserInfos = res.baseInfo;
+            }
+            if (res.company) {
+              vm.formPanyInfo = res.company;
+            }
+
+            vm.formPunishment = punish;
+
+            vm.formComplaint = letterAndVisit;
+          });
+        });
       });
     });
   },
@@ -167,8 +191,8 @@
     // 鍥為��椤甸潰
     onBack() {
       this.$router.back();
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped>

--
Gitblit v1.9.3