Răsfoiți Sursa

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

@dongkboy 5 luni în urmă
părinte
comite
86556fed43

+ 1 - 1
src/api/modules/finance.ts

@@ -45,7 +45,7 @@ const financeApi = (axiosInstance: ApiInstance) => ({
     // 平台协议-列表
     getPlatFormReceivableList: (data: any) => axiosInstance.post('/receivable/getPlatFormReceivableList', data),
     // 平台协议-驾意险
-    getPlatformReceivableList: (data: any) => axiosInstance.post('/receivable/getPlatformReceivableList', data),
+    getPlatformReceivableList: (data: any) => axiosInstance.post('/receivable/getPlatFormReceivableList', data),
     // 驾意导入
     importJyExcel: (data: any) => axiosInstance.post('/receivable/importJyExcel', data),
 

+ 2 - 6
src/components/Table/index.vue

@@ -163,9 +163,7 @@ const headClass = (scope: { row: TableRow }) => {
 const newSelectionList = ref<string[]>([]);
 const selectAllChange = (value: any[]) => {
   if (value.length>0) {
-    value.map(val => {
-      newSelectionList.value.push(val.id)
-    })
+    newSelectionList.value=value.map(val => val.id)
   } else {
     newSelectionList.value = [];
   }
@@ -174,9 +172,7 @@ const selectAllChange = (value: any[]) => {
 }
 const selectChange = (value: any[]) => {
   if (value.length>0) {
-    value.map(val => {
-      newSelectionList.value.push(val.id)
-    })
+    newSelectionList.value=value.map(val => val.id)
   } else {
     newSelectionList.value = [];
   }

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

@@ -2993,7 +2993,7 @@ const handleRecognition = (achor) => {
 
 // 提交
 let loading = ref(false)
-const handleSubmit = async (InsurancePolicyRefs: FormInstance | undefined, scope) => {
+const handleSubmit = async (InsurancePolicyRefs: FormInstance | undefined, scope={$index: 0}) => {
     if(insurancePolicyForm.value.plateType == 'A1') {
         if(!insurancePolicyForm.value.limitLoad) {
             ElMessage({

+ 1 - 0
src/views/personnel/memberManagement.vue

@@ -772,6 +772,7 @@ function selectAllChange(list:any){
 }
 
 function selectChange(list:any){
+console.log("🚀 ~ selectChange ~ list:", list)
 
   checkTableIdList.value=list
 }

+ 2 - 2
src/views/personnel/modules/addOperation.vue

@@ -46,9 +46,9 @@
                 <el-form-item prop="typeAttr" label="业务员类型" >
                   <el-select v-model="operationForm.typeAttr" placeholder="请选择业务员类型" @change="typeAttrChange">
                     <el-option key="1" value="6" label="个代"></el-option>
-                    <el-option key="2" value="7" label="渠道"></el-option>
+                    <el-option key="2" value="8" label="渠道"></el-option>
                     <el-option key="3" value="5" label="团队"></el-option>
-                    <el-option key="4" value="8" label="电销组"></el-option>
+                    <el-option key="4" value="7" label="电销组"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>

+ 1 - 1
src/views/personnel/modules/editInstitution.vue

@@ -7,7 +7,7 @@
             <el-input v-model.trim="form.name" maxlength="50" placeholder="输入机构名称" clearable />
           </el-form-item>
         </el-col>
-        <el-col :span="12" v-if="route.query.id">
+        <el-col :span="12" >
           <el-form-item label="上级机构" prop="parentId">
             <el-cascader clearable style="width: 100%"  v-model="form.parentId"
               :options="tableData" :props="tableProps" @change="handleChange" />

+ 1 - 2
src/views/personnel/modules/memberMessage.vue

@@ -1295,8 +1295,7 @@ function delUser() {
           .then(() => {
             api.userApi
               .userDelete({
-                id: [operationForm.value.id],
-
+                ids: [operationForm.value.id],
               })
               .then((res: any) => {
                 if(res.code==200){

+ 1 - 1
src/views/platform/index.vue

@@ -762,7 +762,7 @@ const handleAddSubmit = () => {
         return item.orderNo
     })
     api.financeApi.addReceivable({
-        orderNo: [...arr],
+        orderNos: [...arr],
         queryType: activeName.value == '1'?'1':activeName.value == '2'?'2':''
     }).then((res: any) => {
         if(res.code == 200) {