htc 1 viikko sitten
vanhempi
commit
6db10d66c3

+ 5 - 4
src/components/reportList/index.vue

@@ -55,11 +55,11 @@
         </el-table-column>
         <el-table-column label="操作" width="300">
             <template #default="scope">
-                <el-button link type="text" size="mini" @click="handleReive(scope.row)" v-if="[1,2].includes(scope.row.state)">查看</el-button>
+                <el-button link type="text" size="mini" @click="handleReive(scope.row)" v-if="[1,2].includes(scope.row.state)">预览</el-button>
                 <el-button link type="text" size="mini" @click="handledDelete(scope.row)" v-hasPermi="['core:report:delete']">删除</el-button>
-                <el-button link type="text" size="mini" @click="handleSend(scope.row)" v-if="scope.row.state>0&&scope.row.fileUrl">发送报告</el-button>
+                <el-button link type="text" size="mini" @click="handleSend(scope.row)" v-if="scope.row.state>0">发送报告</el-button>
                 <el-button link type="text" size="mini" @click="handleCreate(scope.row)" v-if="scope.row.state=='-1'">重新生成</el-button>
-                <el-button link type="text" size="mini" @click="handleExport(scope.row)" v-if="scope.row.state>0&&scope.row.fileUrl">导出报告</el-button>
+                <el-button link type="text" size="mini" @click="handleExport(scope.row)" v-if="scope.row.state>0">导出报告</el-button>
             </template>
         </el-table-column>
     </el-table>
@@ -158,6 +158,7 @@
   }
 
   const handleSend = (row) => {
+    if(!row.fileUrl) return proxy.$message.error('请先在预览页面生成PDF报告!');
     if(row.state==2){
       proxy.$modal.confirm('当前报告已发送,若继续发送会覆盖当前报告,是否继续发送?').then((res) => {
         if(res == 'confirm'){
@@ -170,7 +171,7 @@
     emit('reCreateReport', row?.id)
   }
   const handleExport = (row) => {
-    if(!row.fileUrl) return proxy.$message.error('PDF报告未生成,无法导出!');
+    if(!row.fileUrl) return proxy.$message.error('请先在预览页面生成PDF报告!');
     window.open(row.fileUrl)
   }
 </script>

+ 1 - 1
src/views/modules/agent/questionnaire/publish.vue

@@ -58,7 +58,7 @@
                             <div class="eg_title">按项目选</div>
                             <div class="egt_item adfacjb" v-for="(item,index) in companyList" :key="index">
                                 <div class="ei_l adfac">
-                                    <span>{{ item.name }}</span>
+                                    <span style="cursor: pointer;" @click="handleChooseUser(item)">{{ item.name }}</span>
                                     <span>{{ item.num }}人</span>
                                 </div>
                                 <div class="ei_r" @click="handleChooseUser(item)">

+ 6 - 6
src/views/modules/agent/questionnaire/schedule.vue

@@ -10,7 +10,7 @@
                     <div class="cl_title">作答进度</div>
                 </div>
                 <div class="ct_r adfac">
-                    <div class="eb_default" style="margin-left: 20px;" @click="handleReminds">批量提醒</div>
+                    <!-- <div class="eb_default" style="margin-left: 20px;" @click="handleReminds">批量提醒</div> -->
                     <!-- <el-button type="primary" style="margin-left: 20px;" @click="handleMoreSingleReport">批量个人报告</el-button> -->
                     <el-button type="primary" style="margin-left: 20px;" @click="handleTeamReport">生成报告</el-button>
                 </div>
@@ -27,7 +27,7 @@
                 <div class="cn_pre">未作答:<span style="color: #E22D48;">{{ questionnaireInfo.userNum-questionnaireInfo.finishNum }}</span> 人</div>
             </div>
             <el-table ref="multipleTable" :data="userList" border cell-class-name="vertical-top-cell" v-loading="loading" empty-text="暂无人员" max-height="672px" style="margin-top: 16px;" @selection-change="handleSelectionChange">
-                <el-table-column type="selection" width="55"></el-table-column>
+                <!-- <el-table-column type="selection" width="55"></el-table-column> -->
                 <el-table-column label="姓名" prop="realName"></el-table-column>
                 <el-table-column label="性别" prop="gender">
                     <template #default="{ row }">{{ genderCfg[row.gender]||'' }}</template>
@@ -51,12 +51,12 @@
                     </template>
                 </el-table-column>
                 <el-table-column label="提交时间" prop="submitTime"></el-table-column>
-                <el-table-column label="操作" width="150">
+                <!-- <el-table-column label="操作" width="150">
                     <template #default="scope">
-                        <!-- <el-button link type="text" size="mini" @click="handleReport(scope.row)" v-if="scope.row.status==='1'">生成报告</el-button> -->
+                        <el-button link type="text" size="mini" @click="handleReport(scope.row)" v-if="scope.row.status==='1'">生成报告</el-button>
                         <el-button link type="text" size="mini" @click="handleRemind(scope.row)" v-if="scope.row.status==='0'" v-hasPermi="['core:questionnaire:remind']">提醒作答</el-button>
                     </template>
-                </el-table-column>
+                </el-table-column> -->
             </el-table>
         </div>
         <div class="cus_dialog adffcacjc" v-if="reportShow" @click.prevent="closeReportAlert">
@@ -66,7 +66,7 @@
                 <img src="@/assets/images/agent/report.gif">
                 <p>{{ questionnaireInfo.enterpriseName }} - {{ questionnaireInfo.teamName }}</p>
                 <p>报告正在生成中,预计需要时间<span>7-10分钟</span></p>
-                <p>可去报告管理中查看结果~</p>
+                <p>可去<b>"报告管理"</b>中查看结果~</p>
                 <div class="zt_btn" @click.stop="closeReportAlert">我知道了</div>
             </div>
         </div>