From 7c9827baeeadd3e2e9fc839813007ba2229dffaf Mon Sep 17 00:00:00 2001
From: jiangyinzhi <jiangyinzhi@163.com>
Date: Wed, 1 Apr 2026 17:26:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8C=BA=E5=8E=BF=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common.js                             | 10 ++++
 .../energyEfficiency/archivalInformation.vue  | 59 ++++++++++---------
 src/views/enterprise/customer.vue             |  4 +-
 3 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/src/api/common.js b/src/api/common.js
index e2f780a..816a2a2 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -29,6 +29,16 @@ export function getOrgList() {
   })
 }
 
+// 地区公司
+export function cityTree(data) {
+  return myAxios({
+    url: `${sx}/energy-effcicency-net-service/nxzdPCodeYcControllerNet/cityTree`, //后端接口路由
+    method: 'post',
+    data
+  })
+}
+
+
 //获取用户信息
 export function getUserInfo(params) {
   return myAxios({
diff --git a/src/views/energyEfficiency/archivalInformation.vue b/src/views/energyEfficiency/archivalInformation.vue
index fde52fd..49e0b56 100644
--- a/src/views/energyEfficiency/archivalInformation.vue
+++ b/src/views/energyEfficiency/archivalInformation.vue
@@ -43,30 +43,29 @@
                   disabled
                 />
 
-                <!-- 所属区域 -->
+                <!-- 供电公司 -->
+
+                <van-field
+                  v-model="powerCompanyName"
+                  readonly
+                  required
+                  label="供电公司"
+                  placeholder="请输入"
+                  disabled
+                />
+
+                <!-- 区县公司 -->
 
                 <van-field
                   v-model="provOrgName"
                   is-link
                   readonly
                   required
-                  label="所属区域"
+                  label="区县公司"
                   placeholder="请选择"
                   @click="provOrgNoShow = true"
                 />
 
-                <!-- 供电公司 -->
-
-                <van-field
-                  v-model="powerCompanyName"
-                  is-link
-                  readonly
-                  required
-                  label="供电公司"
-                  placeholder="请选择"
-                  @click="handelClickPowerCompany"
-                />
-
                 <!-- 社会信用代码 -->
 
                 <van-field
@@ -195,12 +194,12 @@
           @finish="onFinish"
         />
       </van-popup>
-      <!-- 所属区域 -->
+      <!-- 区县公司 -->
       <van-popup v-model="provOrgNoShow" round position="bottom">
         <van-cascader
           :field-names="orgFieldNames"
           v-model="customer.provOrgNo"
-          title="请选择所属区域"
+          title="请选择区县公司"
           :options="provOrgList"
           :props="backList"
           @close="provOrgNoShow = false"
@@ -209,7 +208,7 @@
         />
       </van-popup>
       <!-- 供电公司 -->
-      <van-popup v-model="powerCompanyShow" round position="bottom">
+      <!-- <van-popup v-model="powerCompanyShow" round position="bottom">
         <van-picker
           v-model="customer.powerCompany"
           show-toolbar
@@ -217,7 +216,7 @@
           @cancel="powerCompanyShow = false"
           @confirm="onConfirmPowerCompanyShow"
         />
-      </van-popup>
+      </van-popup> -->
 
       <van-popup v-model="yearShow" round position="bottom">
         <van-datetime-picker
@@ -273,7 +272,7 @@
 <script>
 // import Header from "@/components/headerNew";
 import { Notify } from 'vant'
-import { getCode, getOrgList } from '@/api/common.js'
+import { getCode, cityTree } from '@/api/common.js'
 import { customerEdit, getSingleInfo } from '@/api/customer.js'
 import Loading from '@/components/loading'
 import VanPickerNew from '@/components/vanPickerNew'
@@ -386,7 +385,7 @@ export default {
         value: 'code',
         children: 'child',
       },
-      //自定义所属区域字段名称
+      //自定义区县公司字段名称
       orgFieldNames: {
         text: 'codeName',
         pCode: 'pcodeValue',
@@ -400,11 +399,11 @@ export default {
       customerTypeShow: false,
       //客户类型弹框数据
       customerTypeList: [],
-      //所属区域中文展示
+      //区县公司中文展示
       provOrgName: '',
-      //所属区域弹框展示
+      //区县公司弹框展示
       provOrgNoShow: false,
-      //所属区域弹框数据
+      //区县公司弹框数据
       provOrgList: [],
       //错误提示
       errorMessage: '',
@@ -426,7 +425,7 @@ export default {
   },
   created() {
     this.getOrg()
-    this.powerList()
+    // this.powerList()
   },
   mounted() {
     this.getPersonData()
@@ -565,8 +564,8 @@ export default {
           this.customer = res.data
           this.customer.customerType = res.data.customerType
           this.customer.consNo = res.data.consNo
-          this.customer.provOrgNo = res.data.orgNo
-          this.provOrgName = res.data.orgName
+          this.customer.provOrgNo = res.data.consOrgNo
+          this.provOrgName = res.data.consOrgName
           this.customer.powerCompany = res.data.powerCompany
           this.getCustomerType()
           this.powerList()
@@ -619,7 +618,7 @@ export default {
     },
     //查询地区
     async getOrg() {
-      const res = await getOrgList()
+      const res = await cityTree()
       if (res.code === 0) {
         this.provOrgList = res.data
         this.backList = res.data
@@ -646,9 +645,11 @@ export default {
     },
     async onFinish1({ selectedOptions }) {
       const data = await this.getCheckboxInfo(selectedOptions)
-      this.customer.orgNo = data.codeValue
+      this.customer.consOrgNo = data.codeValue
       this.customer.provOrgNo = data.codeValue
       this.customer.provinceNo = selectedOptions[0].codeValue
+      this.customer.powerCompany = selectedOptions[0].codeValue
+      this.powerCompanyName = selectedOptions[0].codeName
       this.provOrgName = data.codeName
       this.provOrgNoShow = false
     },
@@ -704,7 +705,7 @@ export default {
     },
     //客户类型点击确认
     customerTypeSure() {},
-    //所属区域点击确认
+    //区县公司点击确认
     provOrgSure() {},
   },
 }
diff --git a/src/views/enterprise/customer.vue b/src/views/enterprise/customer.vue
index 2add202..3a96b15 100644
--- a/src/views/enterprise/customer.vue
+++ b/src/views/enterprise/customer.vue
@@ -17,8 +17,8 @@
           }}
         </div>
         <div class="list-item-div">
-          <img src="@/assets/orgName.png" alt="" />所属区域：
-          {{ personDetail.orgName }}
+          <img src="@/assets/orgName.png" alt="" />区县公司：
+          {{ personDetail.consOrgName }}
         </div>
         <div class="list-item-div list-item-display" style="overflow: unset;">
           <img src="@/assets/contactName.png" alt="" /> 联系人：