用户管理修改

src/layout/components/RealNameAuthentication.vue

@@ -75,7 +75,7 @@
       type: Boolean,
       default: false,
     },
-    staffOpenId: {
+    customerOpenId: {
       type: String,
       default: '',
     },
@@ -109,18 +109,13 @@
   // 识别身份证
   function identifyingInformation() {
     buttonLoading.value = true
-    console.log(form.value.userImgFrontFileBase64, '-form.valueform.value')
+    // console.log(form.value.userImgFrontFileBase64, '-form.valueform.value')
       if(form.value.userImgFrontFileBase64=== ''|| form.value.userImgFrontFileBase64=== null|| form.value.userImgFrontFileBase64=== undefined){
           ElMessage.error('请上传身份证正面图片');
           buttonLoading.value = false
           return
       }
     const params = {
-      // agencyId: 52010106004,
-      // source: 1,
-      // imageType: 1,
-      // fileName: form.value.userImgFrontName,
-      // imageBase64: form.value.userImgFrontFileBase64
       type:1,
       imagePath:form.value.imagePath
     }
@@ -133,11 +128,8 @@
         form.value.gender = data.gender == '男' ? 'MALE' : data.gender == '女' ? 'FEMALE' : 'UNKOWN' // 暂时转换后期整体更改
         form.value.address = data.address
         ElMessage.success('识别成功');
-        buttonLoading.value = false
-      } else {
-        ElMessage.error(res.message);
-        buttonLoading.value = false
       }
+      buttonLoading.value = false
     });
   }
 
@@ -156,20 +148,18 @@
           address: form.value.address,
           idType: 'SFZ',
           gender: form.value.gender,
-          authenticationOpenId: (props.staffOpenId ? props.staffOpenId : sessionStorage.getItem('openId')) ?? '' // 员工管理
+          openId: props.customerOpenId
         }
         BaseService.postN('/userw/account/realnameauthentication', params).then((res: any) => {
           if (res && res.code === 0) {
             isShow.value = false
-            if (!props.staffOpenId) {
+            if (!props.customerOpenId) {
               ElMessage.success('实名认证成功, 请重新登录')
               router.push({ name: 'Login' })
             } else {
               ElMessage.success('实名认证成功')
               emit('success')
             }
-          } else {
-            ElMessage.error(res.message);
           }
         })
       }

src/views/inventoryControl/newInventory/cardDeviceManagement/index.vue

@@ -158,8 +158,6 @@ function handleAudit(ids: any, row: any, type: any) {
         dialogShow.value = false
       }
       getList()
-    } else {
-      ElMessage.error(res.message)
     }
   })
 }

src/views/inventoryControl/newInventory/obuDeviceManagement/index.vue

@@ -158,8 +158,6 @@ function handleAudit(ids: any, row: any, type: any) {
         dialogShow.value = false
       }
       getList()
-    } else {
-      ElMessage.error(res.message)
     }
   })
 }

src/views/system/connection/index.vue

@@ -47,7 +47,7 @@
       <ModifyRole :ref="(el) => (dataForm1Ref = el)" @close-handle="cancel" @refresh-list="btnSearch()" />
     </el-dialog>
     <RealNameAuthentication @success="successfulCertification" v-model="AuthenticationVisible"
-      :staffOpenId="staffOpenId" />
+      :customerOpenId="customerOpenId"/>
     <RealNameMobileEdit @success="successfulCertification" v-model="editMobileVisible" :rowData="rowData" />
   </div>
 </template>
@@ -307,10 +307,10 @@
   }
   // 实名认证
   const AuthenticationVisible = ref()
-  const staffOpenId = ref()
+  const customerOpenId = ref()
   function realNameAuthentication(row) {
     AuthenticationVisible.value = true
-    staffOpenId.value = row.openId
+    customerOpenId.value = row.openId
   }
   function successfulCertification() {
     getList()

src/views/system/dictionaries/index.vue

@@ -27,10 +27,10 @@
       </div>
       <div class="table-content">
         <el-table v-loading="tableLoding" :data="tableData" @row-click="rowClick" style="width: 100%">
-          <el-table-column type="index" width="50" />
+<!--          <el-table-column type="index" label="号" width="50" />-->
           <el-table-column prop="code" label="CODE" />
-          <el-table-column prop="name" label="名称" width="180" />
-          <el-table-column prop="description" label="描述" width="240" />
+          <el-table-column prop="name" label="名称" width="150" />
+          <el-table-column prop="description" label="描述" width="190" />
           <el-table-column label="操作" width="140" fixed="right">
             <template #default="scope">
               <el-button size="small" v-if="IsPermission(route, 'EDIT_LIST')"
@@ -60,10 +60,10 @@
       <div v-show="!initTable">点击字典查看详情</div>
       <div class="table-content">
         <el-table v-show="initTable" v-loading="tableLodingChange" size="small" :data="sonData" style="width: 100%">
-          <el-table-column prop="name" label="字典标签" width="120" />
-          <el-table-column prop="code" label="字典值" />
-          <el-table-column prop="description" label="备注" width="120" />
-          <el-table-column prop="itemOrder" label="字典排序" width="80" />
+          <el-table-column prop="name" label="字典标签" width="150" />
+          <el-table-column prop="code" label="字典值" width="150"/>
+          <el-table-column prop="description" label="备注" width="150" />
+          <el-table-column prop="itemOrder" label="字典排序" width="70" />
           <el-table-column label="操作" fixed="right" width="140">
             <template #default="scope">
               <el-button size="small" v-if="IsPermission(route, 'EDIT_LIST_LEVEL2')"
@@ -156,6 +156,7 @@ let childNode = ref(false)
 let initTable = ref(false)
 let sizeForm: any = ref({})
 let childNodeForm: any = ref({ itemOrder: 1 })
+let typeId = ref('')
 let systemList: any = ref([])
 let code = ref('') //名称或描述
 let description = ref('') //名称或描述
@@ -231,6 +232,7 @@ function handleEdit(idx, row) {
 }
 //字典管理添加
 function handleAdd() {
+  sizeForm.value = {}
   dictionaries.value = true
   addStart.value = false
 }
@@ -261,7 +263,7 @@ function handleChildDelete(idx, row) {
           tableLodingChange.value = false
           $storeinitData.dispatch('initData')
           // getListChild(childNodeForm.value.dictTypeId)
-          getListChild(childNodeForm.value.typeId)
+          getListChild(typeId.value)
           ElMessage.success(res.message)
         } else {
           tableLodingChange.value = false
@@ -342,9 +344,11 @@ function getList() {
 
 //点击行
 function rowClick(row, column, event) {
+console.log('===>row',row.id);
   initTable.value = true
   // childNodeForm.value.dictTypeId = row.id //添加所关联的ID
   childNodeForm.value.typeId = row.id //添加所关联的ID
+  typeId.value = row.id //添加所关联的ID
   title.value = row.name //标题
   getListChild(row.id)
 }
@@ -422,7 +426,7 @@ function formSubmission(formEl) {
           }
           childNode.value = false
           // getListChild(childNodeForm.value.dictTypeId)
-          getListChild(childNodeForm.value.typeId)
+          getListChild(typeId.value)
         } else {
           ElMessage.error(res.message)
         }

src/views/system/login/Login.vue

@@ -367,7 +367,7 @@ const submitForm = () => {
           // };
           // setCache("cacheAccessToken", bizContent, false);
           // router.push('/');
-          ElMessage.error(res.message)
+          // ElMessage.error(res.message)
         }
       })
       .finally(() => {

src/views/system/userManage/index.vue

@@ -310,51 +310,15 @@
 
   // 导入
   function importData(url) {
-    console.log(url,'urlurl');
-    // importFn('a8f9dac698cb4793bb15f26fd608d2b3', getList(), { excelFileUrl: url })
     BaseService.postN('/userw/staff/registerFullBath', { excelFileUrl: url }).then((res: any) => {
       if (res && res.code === 0) {
-        console.log(res)
-        // const errUrl = res.data?.path ?? ''
-        // console.log(errUrl,'errUrlerrUrl');
-        
-        // if (errUrl) {
-          ElMessage.success("导入成功");
-          BaseService.getDownload(
-            import.meta.env.VITE_APP_UPLOAD_URL + res.data,
-            '错误信息文件'
-          )
-        } 
-        // else {
-        //   ElMessage.success("导入成功1111");
-        //   BaseService.getDownload(
-        //     import.meta.env.VITE_APP_UPLOAD_URL + errUrl,
-        //     '错误信息文件'
-        //   )
-        // }
-        //处理导入失败问题
-        // if (res && res.code === 0) {
-        //             let bizContent = res.data
-        //             let url = bizContent.url || "";
-        //             let fileName = bizContent.fileName ? `${bizContent.fileName}` : ''
-        //             if (url) {
-        //                 //window.open(url)
-        //                 //处理下载有文件名
-        //                 BaseService.getDownloadFileName(import.meta.env.VITE_APP_UPLOAD_URL + url, fileName)
-        //                 // btnLoding.value = false;
-        //                 // clearData();
-        //                 // emit("refreshDataList");
-        //                 // emit("closeHandle");
-        //                 ElMessage.success("导入成功");
-        //             } else {
-        //                 ElMessage.error("导入失败");
-        //             }
-
-        //         } else {
-        //             // btnLoding.value = false;
-        //             ElMessage.error(res.message);
-        //         }
-      // }
+          if(res.data===null){
+              ElMessage.success("导入成功");
+          }else {
+              ElMessage.error("导入失败，请查看下载到本地文件的具体错误信息");
+              BaseService.getDownload(res.data,'错误信息文件')
+          }
+        }
     });
   }
   // 搜索按钮