Преглед на файлове

业务员列表接口变更+复制方案按钮loading添加

祁鹏飞 преди 1 седмица
родител
ревизия
851e736e9c

+ 1 - 0
src/api/modules/operation.ts

@@ -81,6 +81,7 @@ const operationApi = (axiosInstance: ApiInstance) => ({
   addOperation: (data: any) => axiosInstance.post('/userInfo/add', data), // 新赠
   updateOperation: (data: any) => axiosInstance.post('/userInfo/update', data), //编辑
   operationList: (data: OperationSearch) => axiosInstance.post('/userInfo/getUserInfoList', data), // 列表
+  getBaojiaUserInfoList: (data: OperationSearch) => axiosInstance.post('/userInfo/getBaojiaUserInfoList', data), // 列表
   operationDelete: (data: {
     ids: string[],
     getAll: number

+ 1 - 1
src/views/additionalOrder/additional/modules/salesmanSelect.vue

@@ -72,7 +72,7 @@ const handleConfirm = () => {
 // 初始化
 const initData = () => {
   loading.value = true
-  api.operationApi.operationList({
+  api.operationApi.getBaojiaUserInfoList({
     isMember: 2,
     isEnable: 0,
     salesman:searchValue.value,

+ 2 - 2
src/views/insurancePolicy/index.vue

@@ -5,7 +5,7 @@
     <!-- 表单组件:包含所有保险单信息 -->
     <el-form ref="InsurancePolicyRefs" :model="insurancePolicyForm" :rules="insurancePolicyRules">
       <!-- 业务员信息区域 -->
-      <el-row :gutter="20" class="formItem" v-if="!userInfo.typeAttr.includes('7')">
+      <el-row :gutter="20" class="formItem" v-if="!userInfo.typeAttr?.includes('7')">
         <el-col :span="6">
           <!-- 业务员输入框:用于搜索和选择业务员 -->
           <el-form-item label="业务员:" style="margin-top: 10px">
@@ -3639,7 +3639,7 @@ const validateForm = async (InsurancePolicyRefs: FormInstance | undefined): Prom
     return false
   }
   // 业务员必选验证
-  if (!insurancePolicyForm.value.salesman && !userInfo.value.typeAttr.includes('7')) {
+  if (!insurancePolicyForm.value.salesman && !userInfo.value.typeAttr?.includes('7')) {
     ElMessage({
       message: '业务员必选',
       type: 'warning'

+ 3 - 2
src/views/quoteConfig/agreement/components/autoLoadingButton.vue

@@ -40,6 +40,7 @@ watch(() => props.loading, (val) => {
 }, { immediate: true })
 
 watch(internalLoading, (val) => {
+  console.log("🚀 ~ val:", val)
   if (props.loading === undefined) {
     isLoading.value = val
   }
@@ -55,11 +56,11 @@ const handleClick = async () => {
     try {
       const result = await props.onClick()
       emit('success', result)
+      internalLoading.value = false
     } catch (error) {
+      internalLoading.value = false
       emit('error', error)
       throw error // 保留异常,方便上层继续处理
-    } finally {
-      internalLoading.value = false
     }
   }
 }

+ 5 - 2
src/views/quoteConfig/project/project.vue

@@ -162,7 +162,7 @@
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button size="small" type="primary" @click="submitCopy">确定</el-button>
+      <el-button size="small" type="primary" :loading="loading" @click="submitCopy">确定</el-button>
     </template>
   </el-dialog>
 </template>
@@ -329,6 +329,8 @@ const handleCopy = (row) => {
   copyId.value = row.id
   copyDialog.value = true
 }
+
+const loading = ref(false)
 /** 提交复制操作,校验险种选择后触发保险公司查询 */
 const submitCopy = () => {
   if (insuranceTypeValue.value.length == 0) {
@@ -342,6 +344,7 @@ const submitCopy = () => {
     schemeId: copyId.value,
     productCode: insuranceTypeValue.value
   }
+  loading.value = true
   api.projectApi.copyScheme(params).then(res => {
     if (res.code == 200) {
       ElMessage({
@@ -351,7 +354,7 @@ const submitCopy = () => {
       copyDialog.value = false
       searchCompany()
     }
-  })
+  }).finally(() => loading.value = false)
 }
 
 onMounted(() => {

+ 3 - 3
src/views/sale/commission.vue

@@ -47,7 +47,7 @@
         <el-button type="default" @click="exportExcel">导出</el-button>
       </div>
       <el-table :data="tableData" style="margin-top: 20px" height="calc(100% - 194px)">
-        <el-table-column prop="orderNo" label="订单编号" width="180">
+        <el-table-column prop="orderNo" label="订单编号" width="200">
           <template #default="{ row }">
             <el-link type="primary" @click="handleOrderClick(row.orderNo, row)">
               {{ row.orderNo }}
@@ -61,14 +61,14 @@
         <el-table-column prop="distributor" label="分销员" width="100" />
         <el-table-column prop="distributorMobile" label="分销员手机号" width="180" />
 
-        <el-table-column prop="commission" label="分销员金额" width="180" />
+        <el-table-column prop="commission" label="分销员金额" min-width="120" />
 
         <el-table-column prop="distributionLevel" label="分销员等级" width="100">
           <template #default="{ row }">
             {{ row.distributionLevel == 1 ? '一级分销' : row.distributionLevel == 2 ? '二级分销' : '三级分销' }}
           </template>
         </el-table-column>
-        <el-table-column prop="distributionRatio" label="分销比例" width="180" />
+        <el-table-column prop="distributionRatio" label="分销比例" min-width="120" />
       </el-table>
 
       <div class="pagination-wrapper">