Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/finance/index.vue

@@ -521,7 +521,19 @@ const initCompany = () => {
 
 // 领取
 const auditReceive = (row) => {
-    api.financeApi.isLock(row.id).then((res: any) => {
+    /**
+     * 领取财务审核订单
+     *
+     * 功能说明：
+     * 1. 首先检查订单是否被锁定（防止多人同时领取）
+     * 2. 若未被锁定（res.data 为 false），则调用领取接口
+     * 3. 领取成功后显示成功提示
+     * 4. 若订单已被锁定，则显示警告提示
+     *
+     * @param {Object} row - 订单数据对象
+     * @param {string} row.orderNo - 订单编号，用于锁定检查和领取操作
+     */
+    api.financeApi.isLock(row.orderNo).then((res: any) => {
         if(res.code == 200) {
             if(!res.data) {
                 api.financeApi.auditReceive(row.orderNo).then((res: any) => {

src/views/operationManagement/operation.vue

@@ -128,9 +128,9 @@
         </template>
       </el-table-column>
       <el-table-column label="管理人" prop="leaderName" width="150"></el-table-column>
-      <el-table-column label="管理人工号" prop="leaderId" width="200"></el-table-column>
+      <el-table-column label="管理人手机号" prop="leaderId" width="200"></el-table-column>
       <el-table-column label="推荐人" prop="referrerName" width="150"></el-table-column>
-      <el-table-column label="推荐人工号" prop="referrerId" width="200"></el-table-column>
+      <el-table-column label="推荐人手机号" prop="referrerId" width="200"></el-table-column>
       <el-table-column fixed="right" label="操作" width="120">
         <template #default="scope">
           <div style="display: flex; align-items: center; justify-content: space-between">

src/views/representative/partnerReview.vue

@@ -109,7 +109,7 @@ const fields = ref([
       value: 'grade',
     },
   },
-  { label: "管理人", model: "leaderId", type: "input", placeholder: "管理人工号" },
+  { label: "管理人", model: "leaderId", type: "input", placeholder: "管理人名称" },
 ]);
 const columns = [
   { prop: "name", label: "姓名", width: '200'},
@@ -182,6 +182,14 @@ function getList(item: PageInfo) {
 
 };
 const resetForm = () => {
+  Object.assign(formInline, {
+    deptId: '',
+    name: '',
+    leaderId: '',
+    leaderName: '',
+    partnerStatus: "1",
+    grade: '',
+  })
   findpage();
 }
 //数据查询