解决冲突

src/views/dataStatistics/roiStatistical/index.vue

@@ -321,6 +321,7 @@ const initRemoteOption = (type: string, params?: object) => {
 
 
 const initCompanyUserList = () => {
+  if (!rolesIdentify.value.includes('administrator')) return
   channelCompanyUserList().then(res => {
     companyUserList.value = res.data;
   })

src/views/dataStatistics/userStatistics/index.vue

@@ -48,6 +48,7 @@
           <el-table :data="tableData" class="mt-3" v-loading="loading">
             <el-table-column prop="date" min-width="120px" label="时间" />
             <el-table-column  v-if="!rolesIdentify.includes('optimizer')" prop="username" label="优化师" min-width="160px" />
+
             <el-table-column prop="miniprogram_name" label="小程序名称" min-width="160px" />
             <el-table-column label="当日新增用户数" prop="new_user_num" min-width="160px">
               <template #header>
@@ -158,7 +159,6 @@
         </div>
       </template>
     </Search>
-
   </div>
 </template>
 

src/views/videoManage/wechatAudit/tabs/wechatAuditList/form/create.vue

@@ -3,7 +3,7 @@
     <div class="flex flex-row justify-between">
       <div class="w-full">
         <el-form-item label="剧目名称" prop="video_id">
-          <el-input v-model="formData.name" :disabled="props.primary?.id" v-if="props.primary?.id"
+          <el-input v-model="formData.name" :disabled="Boolean(props.primary?.id)" v-if="props.primary?.id"
             placeholder="请输入剧目制作方名称" />
           <el-select v-model="formData.video_id" v-else class="w-full" clearable filterable remote
             :remote-method="remoteMethod" placeholder="请选择剧目名称">

src/views/videoManage/wechatAudit/tabs/wechatAuditStatus/form/create.vue

@@ -3,7 +3,7 @@
     <div class="flex flex-row justify-between">
       <div class="w-full">
         <el-form-item label="剧目名称" prop="video_id">
-          <el-input v-model="formData.name" :disabled="props.primary?.id" v-if="props.primary?.id"
+          <el-input v-model="formData.name" :disabled="Boolean(props.primary?.id)" v-if="props.primary?.id"
             placeholder="请输入剧目制作方名称" />
           <el-select v-model="formData.video_id" v-else class="w-full" clearable filterable remote
             :remote-method="remoteMethod" placeholder="请选择剧目名称">