From 879249b34397ba1dc2be1ff1c7afd158d35ec340 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 25 十二月 2025 14:30:48 +0800
Subject: [PATCH] 1.公司-商机管理添加市的字段

---
 src/views/salesManagement/opportunityManagement/index.vue |  137 ++++++++++++++++++++++++++++-----------------
 1 files changed, 84 insertions(+), 53 deletions(-)

diff --git a/src/views/salesManagement/opportunityManagement/index.vue b/src/views/salesManagement/opportunityManagement/index.vue
index 23cd728..405cd8a 100644
--- a/src/views/salesManagement/opportunityManagement/index.vue
+++ b/src/views/salesManagement/opportunityManagement/index.vue
@@ -38,7 +38,7 @@
         height="calc(100vh - 18.5em)"
         stripe
       >
-        <el-table-column align="center" type="selection" width="55" />
+        <el-table-column align="center" type="selection" width="55" fixed="left"/>
         <el-table-column align="center" label="搴忓彿" type="index" width="60" />
         <el-table-column label="鐘舵��" prop="status" width="120">
           <template #default="{ row }">
@@ -50,12 +50,13 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="鐪佷唤" prop="province" show-overflow-tooltip width="120" />
+        <el-table-column label="鐪佷唤" prop="province" show-overflow-tooltip />
+        <el-table-column label="甯�" prop="city" show-overflow-tooltip/>
         <el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" show-overflow-tooltip />
         <el-table-column label="鍟嗘満鏉ユ簮" prop="businessSource" show-overflow-tooltip />
         <!-- <el-table-column label="瀹㈡埛鎻忚堪" prop="description" show-overflow-tooltip min-width="200" /> -->
-        <el-table-column label="褰曞叆浜�" prop="entryPerson" show-overflow-tooltip />
-        <el-table-column label="鏇存柊鏃ユ湡" prop="updateTime">
+        <el-table-column label="褰曞叆浜�" prop="entryPerson" show-overflow-tooltip width="120" />
+        <el-table-column label="鏇存柊鏃ユ湡" prop="updateTime" width="120">
           <template #default="{ row }">
             {{ formatDate(row.updateTime) }}
           </template>
@@ -113,7 +114,7 @@
     <el-dialog
       v-model="dialogFormVisible"
       :title="operationType === 'add' ? '鏂板缓鍟嗘満' : operationType === 'edit' ? '缂栬緫鍟嗘満' : operationType === 'addOperation' ? '娣诲姞鍟嗘満' : '鍟嗘満璇︽儏'"
-      width="600px"
+      width="1000px"
       @close="closeDialog"
     >
       <el-form
@@ -135,12 +136,25 @@
         </el-form-item>
         
         <el-form-item label="鐪佷唤" prop="province">
-          <el-select v-model="form.province" filterable placeholder="璇烽�夋嫨鐪佷唤" style="width: 100%" :disabled="operationType === 'detail' || operationType === 'addOperation'">
+          <el-select v-model="form.province" filterable placeholder="璇烽�夋嫨鐪佷唤"
+										 @change="getCityListChange"
+										 style="width: 100%" :disabled="operationType === 'detail' || operationType === 'addOperation'">
             <el-option
               v-for="item in provinceOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="甯�" prop="city">
+          <el-select v-model="form.city" filterable placeholder="璇烽�夋嫨甯�"
+										 style="width: 100%" :disabled="operationType === 'detail' || operationType === 'addOperation'">
+            <el-option
+              v-for="item in cityOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
             />
           </el-select>
         </el-form-item>
@@ -165,7 +179,6 @@
             type="textarea"
             :rows="3"
             placeholder="璇疯緭鍏ュ鎴锋弿杩�"
-            maxlength="500"
             show-word-limit
           />
         </el-form-item>
@@ -265,12 +278,12 @@
 import useUserStore from '@/store/modules/user'
 import dayjs from 'dayjs'
 import { getToken } from '@/utils/auth'
-import { 
-  opportunityListPage, 
-  addOpportunity, 
-  updateOpportunity, 
-  delOpportunity,
-  addDescription
+import {
+	opportunityListPage,
+	addOpportunity,
+	updateOpportunity,
+	delOpportunity,
+	addDescription, getProvinceList, getCityList
 } from '@/api/salesManagement/opportunityManagement.js'
 import { userListNoPage } from '@/api/system/user.js'
 import {customerList, getSalesLedgerWithProducts} from '@/api/salesManagement/salesLedger.js'
@@ -309,6 +322,7 @@
   id: undefined,
   status: undefined,
   province: '',
+	city: '',
   customerName: '',
   businessSource: '',
   description: '',
@@ -366,43 +380,9 @@
   { value: '椤圭洰楠屾敹', label: '椤圭洰楠屾敹' }
 ]
 
-// 鐪佷唤閫夐」锛堢ず渚嬶級
-const provinceOptions = [
-  { value: '鍖椾含甯�', label: '鍖椾含甯�' },
-  { value: '澶╂触甯�', label: '澶╂触甯�' },
-  { value: '娌冲寳鐪�', label: '娌冲寳鐪�' },
-  { value: '灞辫タ鐪�', label: '灞辫タ鐪�' },
-  { value: '鍐呰挋鍙よ嚜娌诲尯', label: '鍐呰挋鍙よ嚜娌诲尯' },
-  { value: '杈藉畞鐪�', label: '杈藉畞鐪�' },
-  { value: '鍚夋灄鐪�', label: '鍚夋灄鐪�' },
-  { value: '榛戦緳姹熺渷', label: '榛戦緳姹熺渷' },
-  { value: '涓婃捣甯�', label: '涓婃捣甯�' },
-  { value: '姹熻嫃鐪�', label: '姹熻嫃鐪�' },
-  { value: '娴欐睙鐪�', label: '娴欐睙鐪�' },
-  { value: '瀹夊窘鐪�', label: '瀹夊窘鐪�' },
-  { value: '绂忓缓鐪�', label: '绂忓缓鐪�' },
-  { value: '姹熻タ鐪�', label: '姹熻タ鐪�' },
-  { value: '灞变笢鐪�', label: '灞变笢鐪�' },
-  { value: '娌冲崡鐪�', label: '娌冲崡鐪�' },
-  { value: '婀栧寳鐪�', label: '婀栧寳鐪�' },
-  { value: '婀栧崡鐪�', label: '婀栧崡鐪�' },
-  { value: '骞夸笢鐪�', label: '骞夸笢鐪�' },
-  { value: '骞胯タ澹棌鑷不鍖�', label: '骞胯タ澹棌鑷不鍖�' },
-  { value: '娴峰崡鐪�', label: '娴峰崡鐪�' },
-  { value: '閲嶅簡甯�', label: '閲嶅簡甯�' },
-  { value: '鍥涘窛鐪�', label: '鍥涘窛鐪�' },
-  { value: '璐靛窞鐪�', label: '璐靛窞鐪�' },
-  { value: '浜戝崡鐪�', label: '浜戝崡鐪�' },
-  { value: '瑗胯棌鑷不鍖�', label: '瑗胯棌鑷不鍖�' },
-  { value: '闄曡タ鐪�', label: '闄曡タ鐪�' },
-  { value: '鐢樿們鐪�', label: '鐢樿們鐪�' },
-  { value: '闈掓捣鐪�', label: '闈掓捣鐪�' },
-  { value: '瀹佸鍥炴棌鑷不鍖�', label: '瀹佸鍥炴棌鑷不鍖�' },
-  { value: '鏂扮枂缁村惥灏旇嚜娌诲尯', label: '鏂扮枂缁村惥灏旇嚜娌诲尯' },
-  { value: '鍙版咕鐪�', label: '鍙版咕鐪�' },
-  { value: '棣欐腐鐗瑰埆琛屾斂鍖�', label: '棣欐腐鐗瑰埆琛屾斂鍖�' },
-  { value: '婢抽棬鐗瑰埆琛屾斂鍖�', label: '婢抽棬鐗瑰埆琛屾斂鍖�' }
-]
+// 鐪佷唤閫夐」
+const provinceOptions = ref([])
+const cityOptions = ref([])
 
 // 鑾峰彇鐘舵�佹爣绛剧被鍨� 
 const getStatusTagType = (status) => { 
@@ -516,8 +496,16 @@
   customerList().then((res) => {
     customerOption.value = res
   })
+	getProvinceList().then(res => {
+		provinceOptions.value = res.data
+	})
   
   dialogFormVisible.value = true
+}
+const getCityListChange = (id) => {
+	getCityList({provinceId: id}).then(res => {
+		cityOptions.value = res.data
+	})
 }
 
 // 娣诲姞鎿嶄綔
@@ -596,8 +584,43 @@
     customerOption.value = res
   })
   
+  // 鍔犺浇鐪佷唤鍒楄〃
+  await getProvinceList().then(res => {
+    provinceOptions.value = res.data
+  })
+  
+  // 濡傛灉鍚庣杩斿洖鐨勬槸name锛岄渶瑕佽浆鎹负id
+  let provinceId = row.province
+  let cityId = row.city
+  
+  // 濡傛灉province鏄痭ame瀛楃涓诧紝鏌ユ壘瀵瑰簲鐨刬d
+  if (row.province && typeof row.province === 'string' && !/^\d+$/.test(row.province)) {
+    const provinceOption = provinceOptions.value.find(item => item.name === row.province)
+    if (provinceOption) {
+      provinceId = provinceOption.id
+      // 鍔犺浇瀵瑰簲鐨勫煄甯傚垪琛�
+      await getCityList({ provinceId: provinceId }).then(res => {
+        cityOptions.value = res.data
+        // 濡傛灉city鏄痭ame瀛楃涓诧紝鏌ユ壘瀵瑰簲鐨刬d
+        if (row.city && typeof row.city === 'string' && !/^\d+$/.test(row.city)) {
+          const cityOption = cityOptions.value.find(item => item.name === row.city)
+          if (cityOption) {
+            cityId = cityOption.id
+          }
+        }
+      })
+    }
+  } else if (row.province) {
+    // 濡傛灉province鏄痠d锛岀洿鎺ュ姞杞藉煄甯傚垪琛�
+    await getCityList({ id: row.province }).then(res => {
+      cityOptions.value = res.data
+    })
+  }
+  
   // 浣跨敤褰撳墠璐﹀彿鍜屽綋澶╂棩鏈熶綔涓洪粯璁ゅ��
   Object.assign(form, row, {
+    province: provinceId, // 浣跨敤杞崲鍚庣殑id
+    city: cityId, // 浣跨敤杞崲鍚庣殑id
     entryPerson: userStore.nickName, // 璁剧疆褰曞叆浜轰负褰撳墠璐﹀彿
     entryDate: dayjs().format('YYYY-MM-DD') // 璁剧疆褰曞叆鏃堕棿涓哄綋澶�
   })
@@ -619,6 +642,10 @@
         tempFileIds = fileList.value.map(item => item.tempId)
       }
       
+      // 灏嗙渷浠藉拰甯傜殑id杞崲涓簄ame
+      const provinceName = form.province ? provinceOptions.value.find(item => item.id === form.province)?.name || form.province : ''
+      const cityName = form.city ? cityOptions.value.find(item => item.id === form.city)?.name || form.city : ''
+      
       let api
       let successMessage
       let submitData
@@ -628,6 +655,8 @@
         successMessage = '鏂板缓鎴愬姛'
         submitData = {
           ...form,
+          province: provinceName, // 浼爊ame鑰屼笉鏄痠d
+          city: cityName, // 浼爊ame鑰屼笉鏄痠d
           tempFileIds: tempFileIds,
           type: 9  // 鍟嗘満绠$悊鐨勭被鍨嬫爣璇�
         }
@@ -649,6 +678,8 @@
         successMessage = '淇敼鎴愬姛'
         submitData = {
           ...form,
+          province: provinceName, // 浼爊ame鑰屼笉鏄痠d
+          city: cityName, // 浼爊ame鑰屼笉鏄痠d
           tempFileIds: tempFileIds,
           type: 9  // 鍟嗘満绠$悊鐨勭被鍨嬫爣璇�
         }

--
Gitblit v1.9.3