Procházet zdrojové kódy

fetch:新增消息通知-表决状态

贾宇博 před 1 měsícem
rodič
revize
48d2773024
2 změnil soubory, kde provedl 15 přidání a 8 odebrání
  1. 13 6
      src/views/equity/message/index.vue
  2. 2 2
      vite.config.js

+ 13 - 6
src/views/equity/message/index.vue

@@ -62,6 +62,11 @@
         </template>
       </el-table-column>
       <el-table-column label="投票原因" align="center" prop="voteReason" />
+      <el-table-column label="表决状态" align="center" prop="voteStatus">
+        <template #default="scope">
+          <dict-tag :options="e_vote_status" :value="scope.row.voteStatus" />
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -159,6 +164,9 @@ import { CaretBottom } from '@element-plus/icons-vue'
 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()
 const centerDialogVisible = ref(false); // 对话框
@@ -166,12 +174,6 @@ const dialogTitle = ref(''); // 对话框标题
 const currentRowId = ref(''); // 存储 equityMessageId
 const noticeContent = ref('');
 const voteReason = ref('');//投票原因
-
-const isVote = ref(0); // 投票状态:0 未投票,1 已投票
-const msgType = ref(0); // 消息类型:4 表示投票公告通知
-
-const { e_msg_type } = proxy.useDict('e_msg_type');
-
 const messageList = ref([]);
 const open = ref(false);
 const loading = ref(true);
@@ -182,6 +184,10 @@ const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
 let timer = null; // 定时器 ID
+const isVote = ref(0); // 投票状态:0 未投票,1 已投票
+const msgType = ref(0); // 消息类型:4 表示投票公告通知
+
+
 
 const data = reactive({
   form: {},
@@ -195,6 +201,7 @@ const data = reactive({
     ids: null, // 选中数据的id
     stateName: null,
     voteReason: null,
+    voteStatus: null,
   },
   rules: {
   },

+ 2 - 2
vite.config.js

@@ -33,8 +33,8 @@ export default defineConfig(({ mode, command }) => {
         '/dev-api': { // 代理后缀
           // target: 'http://192.168.100.84:8080',
           // target: 'http://1.95.212.35:8080',
-          target: 'http://192.168.100.119:8080', // 王文龙代理地址
-          // target: 'http://192.168.100.71:8080', // 李荣代理地址
+          // target: 'http://192.168.100.119:8080', // 王文龙代理地址
+          target: 'http://192.168.100.71:8080', // 李荣代理地址
           // target: 'https://api.wzs.pub/mock/13',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')