jwyu 9 月之前
父节点
当前提交
723a15d046

+ 5 - 1
src/views/customer/UserSearch.vue

@@ -227,7 +227,7 @@ function handleGoDetail(e){
             <template v-if="row.Status === 1">
               <el-button
                 type="primary"
-                v-permission="'user:transform'"
+                v-permission="'user:globalTransform'"
                 link
                 @click="handleTransFormUser(row)"
                 >转客户</el-button
@@ -236,12 +236,14 @@ function handleGoDetail(e){
             <template v-else>
               <el-button
                 type="primary"
+                v-permission="'user:globalEdit'"
                 link
                 @click.stop="handleEditUser(row)"
                 >编辑</el-button
               >
               <el-button
                 type="danger"
+                v-permission="'user:globalEnabled'"
                 link
                 v-if="row.Status"
                 @click.stop="handleDisabledUser(row)"
@@ -249,6 +251,7 @@ function handleGoDetail(e){
               >
               <el-button
                 type="primary"
+                v-permission="'user:globalEnabled'"
                 link
                 v-else
                 @click.stop="handleEnableUser(row)"
@@ -256,6 +259,7 @@ function handleGoDetail(e){
               >
               <el-button
                 type="danger"
+                v-permission="'user:globalDelete'"
                 link
                 @click.stop="handleDelUser(row)"
                 >删除</el-button

+ 1 - 0
src/views/customer/reportStatistic/components/UserStatisticDetail.vue

@@ -74,6 +74,7 @@ function handleRefreshList() {
 watch(() => show.value, (n) => {
   if (n) {
     permissionIds.value = ''
+    classifyIds.value=''
     handleRefreshList()
   }
 })

+ 1 - 1
src/views/report/pdf/components/EditPdf.vue

@@ -35,7 +35,7 @@ watch(()=>show.value,(n)=>{
     formData.title=props.defaultData.Title
     formData.classify=[props.defaultData.ClassifyIdFirst,props.defaultData.ClassifyIdSecond]
     formData.abstract=props.defaultData.Abstract
-    formData.author=props.defaultData.Author.split(',')
+    formData.author=props.defaultData.Author?props.defaultData.Author.split(','):''
   }else{
     for(let key in formData){
       formData[key]=''