Browse Source

fix:修改股权交新增时数据变化

贾宇博 2 months ago
parent
commit
d73f128084

+ 4 - 4
src/store/modules/sidebar.js

@@ -37,7 +37,7 @@ const useSidebarStore = defineStore(
           const ws = new WebSocket(`ws://192.168.100.119:8080/websocket/${userStore.id}`);
           
           ws.onopen = () => { // 连接建立后执行
-            console.log("WebSocket connection established");
+            // console.log("WebSocket connection established");
           };
           
           ws.onmessage = (event) => {
@@ -48,15 +48,15 @@ const useSidebarStore = defineStore(
               this.badgeObj.xxtzGqxxtzNum = data.data || 0;
             }
             
-            console.log(data, '>>>>>>>event长连接data',  this.badgeObj)
+            // console.log(data, '>>>>>>>event长连接data',  this.badgeObj)
           }
           
           ws.onerror = (error) => {
-            console.error("WebSocket error:", error);
+            // console.error("WebSocket error:", error);
           };
           
           ws.onclose = () => {
-            console.log("WebSocket connection closed");
+            // console.log("WebSocket connection closed");
           };
         }
       }

+ 2 - 2
src/utils/request.js

@@ -67,7 +67,7 @@ service.interceptors.request.use(config => {
   }
   return config
 }, error => {
-    console.log(error)
+    // console.log(error)
     Promise.reject(error)
 })
 
@@ -108,7 +108,7 @@ service.interceptors.response.use(res => {
     }
   },
   error => {
-    console.log('err' + error)
+    // console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
       message = "后端接口连接异常";

+ 25 - 3
src/views/EquityTransactions/ShareholderTransactions/index.vue

@@ -90,19 +90,19 @@
     <el-dialog :title="title" v-model="open" width="600px" append-to-body>
       <el-form ref="transferRef" :model="form" :rules="RefCheckList" label-width="100px">
         <el-form-item label="公司" prop="companyId">
-          <el-select v-model="form.companyId" placeholder="请选择公司" clearable style="width: 100%;">
+          <el-select v-model="form.companyId" placeholder="请选择公司" clearable @change="handleCompanyChange" style="width: 100%;">
             <el-option v-for="company in DataList" :key="company.shareholderId" :label="company.shareholderName"
               :value="company.shareholderId" />
           </el-select>
         </el-form-item>
         <el-form-item label="股权转让方" prop="equitySellerId">
-          <el-select v-model="form.equitySellerId" placeholder="请选择股权转让方" clearable style="width: 100%;">
+          <el-select v-model="form.equitySellerId" placeholder="请选择股权转让方" clearable style="width: 100%;" :disabled="!form.companyId">
             <el-option v-for="company in FormList" :key="company.shareholderId" :label="company.shareholderName"
               :value="company.shareholderId" />
           </el-select>
         </el-form-item>
         <el-form-item label="股权受让方" prop="equityBuyerId">
-          <el-select v-model="form.equityBuyerId" placeholder="请选择股权受让方" clearable style="width: 100%;">
+          <el-select v-model="form.equityBuyerId" placeholder="请选择股权受让方" clearable style="width: 100%;" :disabled="!form.companyId">
             <el-option v-for="company in FormList" :key="company.shareholderId" :label="company.shareholderName"
               :value="company.shareholderId" />
           </el-select>
@@ -204,6 +204,28 @@ function GetList() {
   });
 }
 
+
+// 公司选择变化时的处理
+const handleCompanyChange = async (companyId) => {
+  if (companyId) {
+    try {
+      // 调用接口,传递 companyId 获取股东列表
+      const response = await GetNotShaList({ 
+        companyId: companyId,
+        state: queryParams.value.state 
+      });
+      FormList.value = response.data;
+    } catch (error) {
+      FormList.value = []; // 失败时清空
+    }
+  } else {
+    // 清空公司时,重置转让方和受让方
+    FormList.value = [];
+    form.value.equitySellerId = null;
+    form.value.equityBuyerId = null;
+  }
+};
+
 // 取消按钮
 function cancel() {
   open.value = false;

+ 0 - 3
src/views/equity/message/index.vue

@@ -164,7 +164,6 @@ import useSidebarStore from "@/store/modules/sidebar";
 
 const { proxy } = getCurrentInstance();
 const { e_vote_status } = proxy.useDict('e_vote_status');
-console.log(e_vote_status.value,'>>>>>>>>>>>>>1111111111');
 const { e_msg_type } = proxy.useDict('e_msg_type');
 
 const sidebarStore = useSidebarStore()
@@ -266,7 +265,6 @@ const setVoteStatus = (status) => {
     voteReason: voteReason.value, // 传递投票原因
   })
     .then(response => {
-      console.log(response);
       proxy.$modal.msgSuccess("操作成功");
       isVote.value = 1; // 更新投票状态
       centerDialogVisible.value = false; // 关闭对话框
@@ -405,7 +403,6 @@ const handleCellClick = (row, column) => {
     if (row.isRead === '0') {
       MessageSetRead(row.equityMessageId)
         .then(response => {
-          console.log("已调用 MessageSetRead 接口,返回数据:", response);
           proxy.$modal.msgSuccess("消息已标记为已读");
           sidebarStore.getOnList()
           row.isRead = '1'; // 前端同步更新状态,防止重复调用

+ 0 - 1
src/views/tool/build/DraggableItem copy.vue

@@ -62,7 +62,6 @@ function deleteItem(item, parent) {
 }
 
 function handleInput(value) {
-  console.log(value);
   props.element.defaultValue = value
 }
 

+ 0 - 1
src/views/tool/build/index.vue

@@ -261,7 +261,6 @@ function generate(data) {
 function execDownload(data) {
   const codeStr = generateCode()
   const blob = new Blob([codeStr], { type: 'text/plain;charset=utf-8' })
-  console.log(proxy.download);
   Download.saveAs(blob, data.fileName)
 }