From eb29af8c93a6659b140b038d5823a52b4f9853b5 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Sat, 30 Sep 2023 01:24:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/tempDialog/index.vue | 15 +++++++++------
 src/views/yingji/enterprise.vue           |  4 ++--
 src/views/yingji/planManage.vue           |  4 ++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/views/components/tempDialog/index.vue b/src/views/components/tempDialog/index.vue
index d8c09fe..77826aa 100644
--- a/src/views/components/tempDialog/index.vue
+++ b/src/views/components/tempDialog/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-28 11:25:48
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-28 16:41:42
+ * @LastEditTime: 2023-09-30 01:07:17
 -->
 <template>
   <el-dialog
@@ -24,9 +24,9 @@
         </div>
         <img src="@/assets/images/close.png" alt="" @click="Close" />
       </div>
-      <el-form ref="form" label-width="80px">
+      <el-form ref="form" label-width="80px" v-loading="loading">
         <el-form-item label="企业名称:" class="form-input">
-          <el-input v-model="form.name" :readonly="true"></el-input>
+          <el-input v-model="form.entprName" :readonly="true"></el-input>
         </el-form-item>
         <el-form-item label="行政区划:" class="form-input">
           <el-input v-model="form.district" :readonly="true"></el-input>
@@ -75,7 +75,7 @@ export default {
       dialogVisible:false,
       mydistrict:'',
       form:{
-        name:'测试活动名称',
+        entprName:'',
         district:'',
         createTime:'',
         plannedYear:'',
@@ -85,6 +85,7 @@ export default {
       },
       id:'',
       readonly:false,
+      loading:true,
     }
   },
   computed: {
@@ -107,13 +108,15 @@ export default {
     async getMyData(id){
       // console.log(id)
       // console.log(data)
+      this.loading = true;
       let data = await this.$api.yingji.bPlanManageTwo(id)
       if(data.code == 200){
-        let { district,createTime,plannedYear,planName,planContent,remark } = data.data
+        let { entprName,district,createTime,plannedYear,planName,planContent,remark } = data.data
         this.mydistrict = district
         let myDistrict = this.componendDistrict(district)
         let mycreateTime = createTime.split(' ')[0]
-        this.form = { district:myDistrict,createTime:mycreateTime,plannedYear,planName,planContent,remark }
+        this.form = { entprName,district:myDistrict,createTime:mycreateTime,plannedYear,planName,planContent,remark }
+        this.loading = false;
       }
     },
     Close(item) {
diff --git a/src/views/yingji/enterprise.vue b/src/views/yingji/enterprise.vue
index eeb01a1..3638102 100644
--- a/src/views/yingji/enterprise.vue
+++ b/src/views/yingji/enterprise.vue
@@ -71,7 +71,7 @@
             </el-select>
           </div>
           <div class="input-input">
-            <div class="select-span">企业名称/统一社会信用代码:</div>
+            <div class="select-span">统一社会信用代码:</div>
             <el-input
               v-model="form.uscCode"
               placeholder="请输入企业名称/统一社会信用代码"
@@ -192,7 +192,7 @@
       </el-table>
     </div>
     <div class="pagination">
-      <my-pagination :total="total" @pagesChange="pagesChange"></my-pagination>
+      <my-pagination :total="total" @pagesChange="pagesChange" ref="mypagination"></my-pagination>
     </div>
     <!-- 查看 -->
     <el-dialog
diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue
index 0e31f62..d5271f2 100644
--- a/src/views/yingji/planManage.vue
+++ b/src/views/yingji/planManage.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-04 10:20:06
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-29 16:20:31
+ * @LastEditTime: 2023-09-30 01:03:48
 -->
 <template>
     <div class="plan-management">
@@ -270,7 +270,7 @@
                 let district = this.form.district[1].slice(1, 11);
                 obj = { ...this.pages, ...this.form,district };
               } else if(newForm.district.length == 1) {
-                let district = this.form.district.slice[0](1, 8);
+                let district = this.form.district[0].slice(1, 8);
                 obj = { ...this.pages, ...this.form,district };
               }
               // 不是数组