From f224bdd440b5854141e47ebbe88e752182fcd755 Mon Sep 17 00:00:00 2001
From: lzyyj <lzyyj@sina.com>
Date: Mon, 14 Oct 2024 10:54:27 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E7=99=BB=E5=BD=95bug=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 921d843..69fc705 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -57,9 +57,7 @@
             size="large"
             type="primary"
             :loading="loading"
-          >
-            登录
-          </el-button>
+          >登录</el-button>
         </div>
         <!-- <el-divider>其他方式登录 </el-divider>
         <div class="flx-row">

From 238a089f4fb8a340eeb74159f077f1c1ee9bc53e Mon Sep 17 00:00:00 2001
From: lzyyj <lzyyj@sina.com>
Date: Mon, 14 Oct 2024 11:09:10 +0800
Subject: [PATCH 2/7] =?UTF-8?q?1=E3=80=81=E7=99=BB=E5=BD=95loading?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=B8=B4=E6=97=B6=E5=A4=84=E7=90=86=202?=
 =?UTF-8?q?=E3=80=81=E6=9C=8D=E5=8A=A1=E7=94=B5=E8=AF=9D=E7=94=B5=E8=AF=9D?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=90=8E=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue     | 3 ++-
 src/views/system/customer.vue | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 69fc705..4baa974 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -165,7 +165,8 @@ const login = (formEl) => {
   if (!formEl) return;
   formEl.validate((valid) => {
     if (valid) {
-      loading.value = true;
+      // 不知道提交失败后怎么关闭，暂时先不开启
+      // loading.value = true;
       console.log(globalStore);
 
       if (loginForm.checked) {
diff --git a/src/views/system/customer.vue b/src/views/system/customer.vue
index 3ade32e..d709bd0 100644
--- a/src/views/system/customer.vue
+++ b/src/views/system/customer.vue
@@ -57,6 +57,7 @@ const initData = () => {
 const onSubmit = () => {
   console.log('submit!')
   updateConfig(form).then((res) => {
+    serviceTelephone.value = form.content;
     console.log('编辑数据成功')
     console.log(ElMessage)
     ElMessage({

From eecb7aa9d4707f83a811563488b1fea4c0ffefdf Mon Sep 17 00:00:00 2001
From: lzyyj <lzyyj@sina.com>
Date: Mon, 14 Oct 2024 11:49:08 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/index.vue | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 4c23945..62d9069 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -309,15 +309,17 @@ import {
 } from '@element-plus/icons-vue'
 import {nextTick, onMounted, reactive, ref} from 'vue'
 
-import {options} from './options.js'
-import {getUserList} from "../../api/modules/user";
+// 示例数据
+// import {options} from './options.js'
+import {getOrderList} from "../../api/modules/order";
 
 const tableData = ref([])
 const dataList = ref([])
 const table = ref()
 const tabclickIndex = ref()
 const isExpand = ref(false)
-const columnData = ref(JSON.parse(JSON.stringify(options)))
+// 示例数据加载
+// const exampleData = ref(JSON.parse(JSON.stringify(options)))
 const disabled = ref(false)
 const dialogVisible = ref(false)
 const total = ref(0)
@@ -332,14 +334,14 @@ const queryData = ref({
 })
 
 const initData = () => {
+  // 示例数据加载
+  // tableData.value = exampleData.value;
 
-  tableData.value = columnData.value;
-
-  // orderLists(queryData.value).then((res) => {
-  //   console.log(res.data.data)
-  //   // total.value = res.data.data.total
-  //   tableData.value = res.data.data
-  // })
+  getOrderList(queryData.value).then((res) => {
+    console.log(res.data)
+    total.value = res.data.total
+    tableData.value = res.data
+  })
 }
 const itemEditHanld = (item) => {
   item.itemEdit = !item.itemEdit

From 3d4b033c1ce23fc239d94f3dbd6a0b0ef6430864 Mon Sep 17 00:00:00 2001
From: lzyyj <lzyyj@sina.com>
Date: Mon, 14 Oct 2024 18:05:59 +0800
Subject: [PATCH 4/7] =?UTF-8?q?3=E3=80=81=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=204=E3=80=81=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/goods.js              |   6 ++
 src/api/modules/postApply.js          |  28 +++++++
 src/router/originalRoutingTable.js    |   4 +-
 src/views/engineer/reconnaissance.vue | 110 ++++++++++++++++++++------
 src/views/goods/index.vue             |  22 +++---
 src/views/users/options.js            |  24 +++---
 src/views/users/reconnaissance.vue    |  23 +++---
 7 files changed, 162 insertions(+), 55 deletions(-)
 create mode 100644 src/api/modules/postApply.js

diff --git a/src/api/modules/goods.js b/src/api/modules/goods.js
index 1fb7207..1033f6b 100644
--- a/src/api/modules/goods.js
+++ b/src/api/modules/goods.js
@@ -23,3 +23,9 @@ export function updateGoods(query) {
         data: query,
     });
 }
+export function delGoods(id) {
+    return service({
+        method: "delete",
+        url: `${API_BASE_URL}/`+id
+    });
+}
diff --git a/src/api/modules/postApply.js b/src/api/modules/postApply.js
new file mode 100644
index 0000000..39e9a4e
--- /dev/null
+++ b/src/api/modules/postApply.js
@@ -0,0 +1,28 @@
+import service from "../request.js";
+
+const API_BASE_URL = '/application';
+
+// 工作岗位资格申请审批管理
+export function getApplyList(query) {
+    return service({
+        method: "get",
+        url: `${API_BASE_URL}/list`,
+        data: query,
+    });
+}
+
+// 工作岗位资格申请拒绝
+export function reject(applicationId) {
+    return service({
+        method: "put",
+        url: `${API_BASE_URL}/reject/`+applicationId
+    });
+}
+
+// 工作岗位资格申请通过
+export function approve(applicationId) {
+    return service({
+        method: "put",
+        url: `${API_BASE_URL}/approve/`+applicationId
+    });
+}
diff --git a/src/router/originalRoutingTable.js b/src/router/originalRoutingTable.js
index 845924f..19c1ef3 100644
--- a/src/router/originalRoutingTable.js
+++ b/src/router/originalRoutingTable.js
@@ -158,7 +158,7 @@ const routerList = [
         component: () => import("../views/users/reconnaissance.vue"),
         meta: {
           requiresAuth: true,
-          name: "勘察人员",
+          name: "勘察工程师",
         },
       },
       {
@@ -187,7 +187,7 @@ const routerList = [
         component: () => import("../views/engineer/reconnaissance.vue"),
         meta: {
           requiresAuth: true,
-          name: "勘察人员审核",
+          name: "勘察工程师审核",
         },
       },
       {
diff --git a/src/views/engineer/reconnaissance.vue b/src/views/engineer/reconnaissance.vue
index ea4be6d..2c22c4e 100644
--- a/src/views/engineer/reconnaissance.vue
+++ b/src/views/engineer/reconnaissance.vue
@@ -54,12 +54,15 @@
       >
         <el-table-column
           label="序号"
-          prop="userId"
-          width="120"
+          width="80"
           align="center"
           show-overflow-tooltip
           sortable
-        />
+        >
+          <template #default="scope">
+            {{ scope.$index + 1 }}
+          </template>
+        </el-table-column>
 
         <el-table-column label="头像" width="200" align="center">
           <template #default="scope">
@@ -69,32 +72,46 @@
         <el-table-column
           label="微信昵称"
           prop="nickname"
-          width="300"
           align="center"
           show-overflow-tooltip
         />
         <el-table-column
           label="名字"
           prop="name"
-          width="300"
           align="center"
           show-overflow-tooltip
         />
         <el-table-column
           label="手机号"
           prop="mobile"
-          width="300"
           align="center"
           show-overflow-tooltip
         />
         <el-table-column
-          label="注册时间"
-          prop="date"
+            label="申请岗位"
+            prop="roleId"
+            :formatter="postFormater"
+            align="center"
+            show-overflow-tooltip
+        />
+        <el-table-column
+          label="申请时间"
+          prop="createTime"
+          :formatter="formatDate"
           width="auto"
           align="center"
           show-overflow-tooltip
           sortable
         />
+        <el-table-column
+            label="状态"
+            prop="status"
+            :formatter="statusFormater"
+            width="auto"
+            align="center"
+            show-overflow-tooltip
+            sortable
+        />
 
         <el-table-column
           label="操作"
@@ -103,7 +120,7 @@
           show-overflow-tooltip
         >
           <template v-slot:default="scope">
-            <el-button type="success">通过</el-button>
+            <el-button type="success" @click="handleApprove(scope.row)">通过</el-button>
             <el-button type="danger" @click="openModel(scope.$index)">驳回</el-button>
           </template>
         </el-table-column>
@@ -122,10 +139,13 @@
 
 <script setup>
 import { ref, onMounted } from 'vue';
-import { getUserList } from '../../api/modules/user';
+import {getApplyList, reject, approve} from "../../api/modules/postApply";
+
+// 示例数据
+// import {options} from './options.js'
+// const exampleData = ref(JSON.parse(JSON.stringify(options)))
+
 import { ElMessage, ElMessageBox } from 'element-plus'
-import {options} from './options.js'
-const columnData = ref(JSON.parse(JSON.stringify(options)))
 
 const tableData = ref([]);
 const searchWechatNickname = ref('');
@@ -138,19 +158,56 @@ const queryData = ref({
 });
 
 const initData = () => {
-
-  tableData.value = columnData.value;
-  // getUserList(queryData.value).then((res) => {
-  //   tableData.value = res.data.data;
-  // });
+  // 加载示例数据
+  // tableData.value = exampleData.value;
+  getApplyList(queryData.value).then((res) => {
+    console.log("调试：总数=", res.data.total, "data.record.length=", res.data.records.length);
+    // total.value = res.data.total
+    tableData.value = res.data.records;
+  });
 };
 
+const formatDate = (row, column, cellValue) => {
+  const date = new Date(cellValue);
+  return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`;
+}
+
+const statusFormater = (row, column, cellValue) => {
+  // 0待审核（审核中）  1驳回   2通过
+  if (cellValue === 1) {
+    return '已驳回';
+  } else if (cellValue === 2) {
+    return '已通过';
+  } else {
+    return '待审核';
+  }
+}
+
+const postFormater = (row, column, cellValue) => {
+  if (cellValue === 2) {
+    return '勘察工程师';
+  } else if (cellValue === 3) {
+    return '维修工程师';
+  } else {
+    return '工程师';
+  }
+}
+
 const searchEvnt = () => {
   console.log('点击搜索');
   queryData.value.keyWord = searchWechatNickname.value || searchName.value || searchMobile.value;
   initData();
 };
 
+const handleApprove = (item) => {
+  console.log("调试：", item)
+  approve(item.id).then((res) => {
+    ElMessage({
+      type: 'success'
+    })
+  })
+}
+
 // 驳回原因
 const openModel = (index) => {
   ElMessageBox.prompt('请输入驳回原因', '', {
@@ -158,13 +215,20 @@ const openModel = (index) => {
     cancelButtonText: '取消',
     inputType: 'textarea',
   })
-      .then(({value}) => {
-
-        ElMessage({
-          type: 'success',
-          message: `驳回成功`,
-        })
+  .then(({ value }) => {
+    // 用户确认后，调用 rejectApplication 函数
+    if (value) { // 确保用户输入了驳回原因
+      reject(applicationId, value);
+    } else {
+      ElMessage({
+        type: 'warning',
+        message: '请输入驳回原因',
       });
+    }
+  })
+  .catch(() => {
+    // 用户取消操作，无需处理
+  });
 };
 
 const handleCurrentChange = (val) => {
diff --git a/src/views/goods/index.vue b/src/views/goods/index.vue
index 4e00ceb..58e724c 100644
--- a/src/views/goods/index.vue
+++ b/src/views/goods/index.vue
@@ -116,11 +116,7 @@ import {
   InfoFilled,
   View,
 } from '@element-plus/icons-vue'
-import {
-  getGoodsList,
-  addGoods,
-  updateGoods,
-} from '../../api/modules/goods.js'
+import { getGoodsList, addGoods, updateGoods, delGoods} from '../../api/modules/goods.js'
 import { options } from './options.js'
 import { onMounted, reactive, ref } from 'vue'
 import { ElMessage } from 'element-plus'
@@ -225,10 +221,18 @@ const ItemView = (item) => {
   dialogData.title = ''
 }
 
-const DeleteItem = (index) => {
-  console.log(index)
-  tableData.value.splice(index, 1)
-}
+const DeleteItem = async (index) => {
+  const row = tableData.value[index]; // 获取要删除的行
+  console.log("调试：row=",row)
+  const id = row.id; // 假设行数据中有一个名为 `id` 的属性
+
+  // 调用 delRecord 函数并等待其完成
+  await delGoods(id).then((res) => {
+    // 如果 delRecord 成功，则从 tableData 中移除该行
+    tableData.value.splice(index, 1);
+  });
+};
+
 const cancelEvent = () => {
   console.log('cancel!')
 }
diff --git a/src/views/users/options.js b/src/views/users/options.js
index f20a060..ea80e75 100644
--- a/src/views/users/options.js
+++ b/src/views/users/options.js
@@ -3,7 +3,7 @@ export const options = [
     userId: 1,
     avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg',
     name: '高永建',
-      nickname: '软件开发老高',
+      nickname: '软件开发歪歪杰',
       mobile: '19136448763',
     date: '2024-10-11 10:11:01'
   },
@@ -11,7 +11,7 @@ export const options = [
     userId: 2,
     avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg',
     name: '张三',
-    nickname: '软件开发老高',
+    nickname: '软件开发歪歪杰',
     mobile: '19136448763',
     date: '2024-10-10 10:11:01'
   },
@@ -19,7 +19,7 @@ export const options = [
     userId: 3,
     avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg',
     name: '李四',
-    nickname: '软件开发老高',
+    nickname: '软件开发歪歪杰',
     mobile: '19136448763',
     date: '2024-10-13 10:11:01'
   },
@@ -27,14 +27,14 @@ export const options = [
     userId: 4,
     avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg',
     name: '名称',
-    nickname: '软件开发老高',
+    nickname: '软件开发歪歪杰',
     mobile: '19136448763',
     date: '2024-10-02 10:11:01'
   },{
     userId: 5,
     avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg',
     name: '名称',
-    nickname: '软件开发老高',
+    nickname: '软件开发歪歪杰',
     mobile: '19136448763',
     date: '2024-10-01 10:11:01'
   },
@@ -42,35 +42,35 @@ export const options = [
     userId: 6,
     avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg',
     name: '名称',
-    nickname: '软件开发老高',
+    nickname: '软件开发歪歪杰',
     mobile: '19136448763',
     date: '2024-10-11 10:11:01'
   },{
     userId: 7,
     avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg',
     name: '名称',
-    nickname: '软件开发老高',
+    nickname: '软件开发歪歪杰',
     mobile: '19136448763',
     date: '2024-10-11 10:11:01'
   },{
     userId: 8,
     avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg',
     name: '名称',
-    nickname: '软件开发老高',
+    nickname: '软件开发歪歪杰',
     mobile: '19136448763',
     date: '2024-10-11 10:11:01'
   },{
     userId: 9,
     avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg',
     name: '名称',
-    nickname: '软件开发老高',
+    nickname: '软件开发歪歪杰',
     mobile: '19136448763',
     date: '2024-10-11 10:11:01'
   },{
     userId: 10,
     avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg',
     name: '名称',
-    nickname: '软件开发老高',
+    nickname: '软件开发歪歪杰',
     mobile: '19136448763',
     date: '2024-10-11 10:11:01'
   },
@@ -78,9 +78,9 @@ export const options = [
     userId: 11,
     avatar: 'https://pic.qqans.com/up/2024-6/2024620113729773.jpg',
     name: '名称',
-    nickname: '软件开发老高',
+    nickname: '软件开发歪歪杰',
     mobile: '19136448763',
     date: '2024-10-11 10:11:01'
   },
 
-];
\ No newline at end of file
+];
diff --git a/src/views/users/reconnaissance.vue b/src/views/users/reconnaissance.vue
index 68b47e5..6c3a6f3 100644
--- a/src/views/users/reconnaissance.vue
+++ b/src/views/users/reconnaissance.vue
@@ -141,15 +141,19 @@ import {
 } from '@element-plus/icons-vue'
 import {nextTick, onMounted, reactive, ref} from 'vue'
 
-import {options} from './options.js'
-import {getUserList} from "../../api/modules/user";
+// 示例数据
+// import {options} from './options.js'
+import {getApplyList, reject, approve} from "../../api/modules/postApply";
 
 const tableData = ref([])
 const dataList = ref([])
 const table = ref()
 const tabclickIndex = ref()
 const isExpand = ref(false)
-const columnData = ref(JSON.parse(JSON.stringify(options)))
+
+// 示例数据
+// const exampleData = ref(JSON.parse(JSON.stringify(options)))
+
 const disabled = ref(false)
 const dialogVisible = ref(false)
 const total = ref(0)
@@ -164,13 +168,14 @@ const queryData = ref({
 
 const initData = () => {
 
-  tableData.value = columnData.value;
+  // 加载示例数据
+  // tableData.value = exampleData.value;
 
-  // orderLists(queryData.value).then((res) => {
-  //   console.log(res.data.data)
-  //   // total.value = res.data.data.total
-  //   tableData.value = res.data.data
-  // })
+  getApplyList(queryData.value).then((res) => {
+    console.log(res.data.data)
+    total.value = res.data.total
+    tableData.value = res.data
+  })
 }
 const itemEditHanld = (item) => {
   item.itemEdit = !item.itemEdit

From 96e5df3a455de113f70cbabe2af7e11f0e0921be Mon Sep 17 00:00:00 2001
From: lzyyj <lzyyj@sina.com>
Date: Tue, 15 Oct 2024 10:28:14 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=8B=98=E5=AF=9F=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/engineer/reconnaissance.vue | 40 ++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/views/engineer/reconnaissance.vue b/src/views/engineer/reconnaissance.vue
index 2c22c4e..cbe3ff3 100644
--- a/src/views/engineer/reconnaissance.vue
+++ b/src/views/engineer/reconnaissance.vue
@@ -120,8 +120,9 @@
           show-overflow-tooltip
         >
           <template v-slot:default="scope">
-            <el-button type="success" @click="handleApprove(scope.row)">通过</el-button>
-            <el-button type="danger" @click="openModel(scope.$index)">驳回</el-button>
+            <el-button type="success" v-if="scope.row.status === 0" @click="handleApprove(scope.row)">通过</el-button>
+            <el-button type="danger" v-if="scope.row.status === 0" @click="handleReject(scope.row)">驳回</el-button>
+<!--            <el-button type="danger" @click="openModel(scope.$index)">驳回</el-button>-->
           </template>
         </el-table-column>
       </el-table>
@@ -200,12 +201,37 @@ const searchEvnt = () => {
 };
 
 const handleApprove = (item) => {
-  console.log("调试：", item)
-  approve(item.id).then((res) => {
-    ElMessage({
-      type: 'success'
+  ElMessageBox.confirm('确定要通过该申请?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    approve(item.id).then((res) => {
+      item.status = 2;
+      ElMessage({
+        type: 'success',
+        message: '申请已被通过！'
+      })
     })
-  })
+  }).catch(() => {
+  });
+}
+
+const handleReject = (item) => {
+  ElMessageBox.confirm('确定要拒绝该申请?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    reject(item.id).then((res) => {
+      item.status = 1;
+      ElMessage({
+        type: 'success',
+        message: '申请已被拒绝！'
+      })
+    })
+  }).catch(() => {
+  });
 }
 
 // 驳回原因

From d09e144aaf75e345cd616a92dc567c0229c57be0 Mon Sep 17 00:00:00 2001
From: lzyyj <lzyyj@sina.com>
Date: Tue, 15 Oct 2024 10:47:31 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=8B=98=E5=AF=9F=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=20=E7=BB=B4=E4=BF=AE=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/engineer/maintain.vue       | 139 +++++++++++++++++++++-----
 src/views/engineer/reconnaissance.vue |   3 +-
 2 files changed, 117 insertions(+), 25 deletions(-)

diff --git a/src/views/engineer/maintain.vue b/src/views/engineer/maintain.vue
index 3f73659..8948d21 100644
--- a/src/views/engineer/maintain.vue
+++ b/src/views/engineer/maintain.vue
@@ -54,12 +54,15 @@
       >
         <el-table-column
             label="序号"
-            prop="userId"
-            width="120"
+            width="80"
             align="center"
             show-overflow-tooltip
             sortable
-        />
+        >
+          <template #default="scope">
+            {{ scope.$index + 1 }}
+          </template>
+        </el-table-column>
 
         <el-table-column label="头像" width="200" align="center">
           <template #default="scope">
@@ -69,27 +72,41 @@
         <el-table-column
             label="微信昵称"
             prop="nickname"
-            width="300"
             align="center"
             show-overflow-tooltip
         />
         <el-table-column
             label="名字"
             prop="name"
-            width="300"
             align="center"
             show-overflow-tooltip
         />
         <el-table-column
             label="手机号"
             prop="mobile"
-            width="300"
             align="center"
             show-overflow-tooltip
         />
         <el-table-column
-            label="注册时间"
-            prop="date"
+            label="申请岗位"
+            prop="roleId"
+            :formatter="postFormater"
+            align="center"
+            show-overflow-tooltip
+        />
+        <el-table-column
+            label="申请时间"
+            prop="createTime"
+            :formatter="formatDate"
+            width="auto"
+            align="center"
+            show-overflow-tooltip
+            sortable
+        />
+        <el-table-column
+            label="状态"
+            prop="status"
+            :formatter="statusFormater"
             width="auto"
             align="center"
             show-overflow-tooltip
@@ -103,8 +120,9 @@
             show-overflow-tooltip
         >
           <template v-slot:default="scope">
-            <el-button type="success">通过</el-button>
-            <el-button type="danger" @click="openModel(scope.$index)">驳回</el-button>
+            <el-button type="success" v-if="scope.row.status === 0" @click="handleApprove(scope.row)">通过</el-button>
+            <el-button type="danger" v-if="scope.row.status === 0" @click="handleReject(scope.row)">驳回</el-button>
+            <!--            <el-button type="danger" @click="openModel(scope.$index)">驳回</el-button>-->
           </template>
         </el-table-column>
       </el-table>
@@ -122,10 +140,13 @@
 
 <script setup>
 import { ref, onMounted } from 'vue';
-import { getUserList } from '../../api/modules/user';
+import {getApplyList, reject, approve} from "../../api/modules/postApply";
+
+// 示例数据
+// import {options} from './options.js'
+// const exampleData = ref(JSON.parse(JSON.stringify(options)))
+
 import { ElMessage, ElMessageBox } from 'element-plus'
-import {options} from './options.js'
-const columnData = ref(JSON.parse(JSON.stringify(options)))
 
 const tableData = ref([]);
 const searchWechatNickname = ref('');
@@ -138,19 +159,82 @@ const queryData = ref({
 });
 
 const initData = () => {
-
-  tableData.value = columnData.value;
-  // getUserList(queryData.value).then((res) => {
-  //   tableData.value = res.data.data;
-  // });
+  // 加载示例数据
+  // tableData.value = exampleData.value;
+  getApplyList(queryData.value).then((res) => {
+    console.log("调试：总数=", res.data.total, "data.record.length=", res.data.records.length);
+    const filteredData = res.data.records.filter(record => record.roleId === 3);
+    // total.value = res.data.total
+    tableData.value = filteredData;
+  });
 };
 
+const formatDate = (row, column, cellValue) => {
+  const date = new Date(cellValue);
+  return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`;
+}
+
+const statusFormater = (row, column, cellValue) => {
+  // 0待审核（审核中）  1驳回   2通过
+  if (cellValue === 1) {
+    return '已驳回';
+  } else if (cellValue === 2) {
+    return '已通过';
+  } else {
+    return '待审核';
+  }
+}
+
+const postFormater = (row, column, cellValue) => {
+  if (cellValue === 2) {
+    return '勘察工程师';
+  } else if (cellValue === 3) {
+    return '维修工程师';
+  } else {
+    return '工程师';
+  }
+}
+
 const searchEvnt = () => {
   console.log('点击搜索');
   queryData.value.keyWord = searchWechatNickname.value || searchName.value || searchMobile.value;
   initData();
 };
 
+const handleApprove = (item) => {
+  ElMessageBox.confirm('确定要通过该申请?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    approve(item.id).then((res) => {
+      item.status = 2;
+      ElMessage({
+        type: 'success',
+        message: '申请已被通过！'
+      })
+    })
+  }).catch(() => {
+  });
+}
+
+const handleReject = (item) => {
+  ElMessageBox.confirm('确定要拒绝该申请?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    reject(item.id).then((res) => {
+      item.status = 1;
+      ElMessage({
+        type: 'success',
+        message: '申请已被拒绝！'
+      })
+    })
+  }).catch(() => {
+  });
+}
+
 // 驳回原因
 const openModel = (index) => {
   ElMessageBox.prompt('请输入驳回原因', '', {
@@ -158,12 +242,19 @@ const openModel = (index) => {
     cancelButtonText: '取消',
     inputType: 'textarea',
   })
-      .then(({value}) => {
-
-        ElMessage({
-          type: 'success',
-          message: `驳回成功`,
-        })
+      .then(({ value }) => {
+        // 用户确认后，调用 rejectApplication 函数
+        if (value) { // 确保用户输入了驳回原因
+          reject(applicationId, value);
+        } else {
+          ElMessage({
+            type: 'warning',
+            message: '请输入驳回原因',
+          });
+        }
+      })
+      .catch(() => {
+        // 用户取消操作，无需处理
       });
 };
 
diff --git a/src/views/engineer/reconnaissance.vue b/src/views/engineer/reconnaissance.vue
index cbe3ff3..71e5b76 100644
--- a/src/views/engineer/reconnaissance.vue
+++ b/src/views/engineer/reconnaissance.vue
@@ -163,8 +163,9 @@ const initData = () => {
   // tableData.value = exampleData.value;
   getApplyList(queryData.value).then((res) => {
     console.log("调试：总数=", res.data.total, "data.record.length=", res.data.records.length);
+    const filteredData = res.data.records.filter(record => record.roleId === 2);
     // total.value = res.data.total
-    tableData.value = res.data.records;
+    tableData.value = filteredData;
   });
 };
 

From 84deb1f932432c8e940366254201b802f6e72991 Mon Sep 17 00:00:00 2001
From: lzyyj <lzyyj@sina.com>
Date: Tue, 15 Oct 2024 10:48:18 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=8B=98=E5=AF=9F=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=20=E7=BB=B4=E4=BF=AE=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/engineer/maintain.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/engineer/maintain.vue b/src/views/engineer/maintain.vue
index 8948d21..93429ba 100644
--- a/src/views/engineer/maintain.vue
+++ b/src/views/engineer/maintain.vue
@@ -207,7 +207,7 @@ const handleApprove = (item) => {
     cancelButtonText: '取消',
     type: 'warning'
   }).then(() => {
-    approve(item.id).then((res) => {
+    approve(item.id).then(() => {
       item.status = 2;
       ElMessage({
         type: 'success',
@@ -224,7 +224,7 @@ const handleReject = (item) => {
     cancelButtonText: '取消',
     type: 'warning'
   }).then(() => {
-    reject(item.id).then((res) => {
+    reject(item.id).then(() => {
       item.status = 1;
       ElMessage({
         type: 'success',