瑞都报表添加权限判断，日报详情查询条件拆分2个分为项目和任务

locale/en.json

@@ -146,6 +146,10 @@
 	"ruiDuReport.filterTitle": "Filter conditions",
 	"ruiDuReport.searchKey": "Search key",
 	"ruiDuReport.searchKeyPlaceholder": "Please enter search key",
+	"ruiDuReport.project": "Project",
+	"ruiDuReport.projectPlaceholder": "Please enter project",
+	"ruiDuReport.task": "Task",
+	"ruiDuReport.taskPlaceholder": "Please enter task",
 	"ruiDuReport.dept": "Department",
 	"ruiDuReport.constructionBrief": "Brief",
 	"ruiDuReport.createTime": "Create time",

locale/ja.json

@@ -146,6 +146,10 @@
 	"ruiDuReport.filterTitle": "フィルター条件",
 	"ruiDuReport.searchKey": "検索条件",
 	"ruiDuReport.searchKeyPlaceholder": "検索条件を入力してください",
+	"ruiDuReport.project": "プロジェクト",
+	"ruiDuReport.projectPlaceholder": "プロジェクトを入力してください",
+	"ruiDuReport.task": "タスク",
+	"ruiDuReport.taskPlaceholder": "タスクを入力してください",
 	"ruiDuReport.dept": "部門",
 	"ruiDuReport.constructionBrief": "施工概要",
 	"ruiDuReport.createTime": "作成時間",

locale/ru.json

@@ -146,6 +146,10 @@
 	"ruiDuReport.filterTitle": "Фильтры",
 	"ruiDuReport.searchKey": "Ключ поиска",
 	"ruiDuReport.searchKeyPlaceholder": "Введите ключ поиска",
+	"ruiDuReport.project": "Проект",
+	"ruiDuReport.projectPlaceholder": "Введите проект",
+	"ruiDuReport.task": "Задача",
+	"ruiDuReport.taskPlaceholder": "Введите задачу",
 	"ruiDuReport.dept": "Отдел",
 	"ruiDuReport.constructionBrief": "Сводка",
 	"ruiDuReport.createTime": "Время создания",

locale/zh-Hans.json

@@ -190,11 +190,15 @@
   "ruiDuReport.selectTitle": "选择瑞都报表",
   "ruiDuReport.dailyDetail": "日报详情",
   "ruiDuReport.dailyTeamStatistic": "日报单井队统计",
-  "ruiDuReport.filterAction": "筛选",
-  "ruiDuReport.filterTitle": "筛选条件",
-  "ruiDuReport.searchKey": "查询条件",
-  "ruiDuReport.searchKeyPlaceholder": "请输入查询条件",
-  "ruiDuReport.dept": "部门",
+  "ruiDuReport.filterAction": "筛选",
+  "ruiDuReport.filterTitle": "筛选条件",
+  "ruiDuReport.searchKey": "查询条件",
+  "ruiDuReport.searchKeyPlaceholder": "请输入查询条件",
+  "ruiDuReport.project": "项目",
+  "ruiDuReport.projectPlaceholder": "请输入项目",
+  "ruiDuReport.task": "任务",
+  "ruiDuReport.taskPlaceholder": "请输入任务",
+  "ruiDuReport.dept": "部门",
   "ruiDuReport.constructionBrief": "施工简报",
   "ruiDuReport.createTime": "创建时间",
   // --------------------------------------- 保养查询 ----------------------------------------

locale/zh-Hant.json

@@ -126,11 +126,15 @@
   "ruiDuReport.selectTitle": "选择瑞都报表",
   "ruiDuReport.dailyDetail": "日报详情",
   "ruiDuReport.dailyTeamStatistic": "日报单井队统计",
-  "ruiDuReport.filterAction": "筛选",
-  "ruiDuReport.filterTitle": "筛选条件",
-  "ruiDuReport.searchKey": "查询条件",
-  "ruiDuReport.searchKeyPlaceholder": "请输入查询条件",
-  "ruiDuReport.dept": "部门",
+  "ruiDuReport.filterAction": "筛选",
+  "ruiDuReport.filterTitle": "筛选条件",
+  "ruiDuReport.searchKey": "查询条件",
+  "ruiDuReport.searchKeyPlaceholder": "请输入查询条件",
+  "ruiDuReport.project": "项目",
+  "ruiDuReport.projectPlaceholder": "请输入项目",
+  "ruiDuReport.task": "任务",
+  "ruiDuReport.taskPlaceholder": "请输入任务",
+  "ruiDuReport.dept": "部门",
   "ruiDuReport.constructionBrief": "施工简报",
   "ruiDuReport.createTime": "创建时间",
   "maintenanceSearch.title": "保养查询",

pages/home/index.vue

@@ -169,7 +169,8 @@
         <!-- 瑞都报表 -->
         <view
           class="card-cell flex-row align-center justify-between"
-          @click="openRuiDuReportPopup">
+          @click="openRuiDuReportPopup"
+          v-if="rdReportStatisticsFlag">
           <image src="/static/home/ribao.svg" mode="aspectFill"></image>
           <view class="cell-con flex-row align-center justify-between">
             <view class="cell-text flex-row align-center justify-start">
@@ -486,8 +487,9 @@ onMounted(async () => {
 });
 
 // 是否展示瑞都日报入口
-const isShowRuiduDaily = ref(false);
-const rhReportFlag = ref(false);
+const isShowRuiduDaily = ref(false);
+const rdReportStatisticsFlag = ref(false);
+const rhReportFlag = ref(false);
 const rhTaskFlag = ref(false);
 const rhReportApprovalFlag = ref(false);
 const ryReportFlag = ref(false);
@@ -498,9 +500,10 @@ const userInfo = ref({});
 const getLoginUser = async () => {
   const response = await getLoginUserInfo();
   if (response.code === 0) {
-    userInfo.value = response.data;
-    isShowRuiduDaily.value = response.data.rdReportFlag;
-    // isShowRuiduDaily.value = true;
+    userInfo.value = response.data;
+    isShowRuiduDaily.value = response.data.rdReportFlag;
+    rdReportStatisticsFlag.value = response.data.rdReportStatisticsFlag;
+    // isShowRuiduDaily.value = true;
     rhReportFlag.value = response.data.rhReportFlag;
     rhTaskFlag.value = response.data.rhReportFlag;
     // rhTaskFlag.value = true;

pages/ruiDuReport/daily-detail.vue

@@ -21,6 +21,10 @@
               }}</text>
               <text class="field-value">{{ item.deptName || "--" }}</text>
             </view>
+            <view class="field-row">
+              <text class="field-label">{{ $t("ruiDu.project") }}</text>
+              <text class="field-value">{{ item.contractName || "--" }}</text>
+            </view>
             <view class="field-row">
               <text class="field-label">{{ $t("ruiDu.task") }}</text>
               <text class="field-value">{{ item.taskName || "--" }}</text>
@@ -77,12 +81,21 @@
 
         <view class="filter-body">
           <view class="filter-item">
-            <view class="filter-label">{{ $t("ruiDuReport.searchKey") }}</view>
+            <view class="filter-label">{{ $t("ruiDuReport.project") }}</view>
+            <uni-easyinput
+              v-model="filterForm.contractName"
+              :inputBorder="false"
+              :styles="inputStyles"
+              :placeholder="$t('ruiDuReport.projectPlaceholder')" />
+          </view>
+
+          <view class="filter-item">
+            <view class="filter-label">{{ $t("ruiDuReport.task") }}</view>
             <uni-easyinput
-              v-model="filterForm.searchKey"
+              v-model="filterForm.taskName"
               :inputBorder="false"
               :styles="inputStyles"
-              :placeholder="$t('ruiDuReport.searchKeyPlaceholder')" />
+              :placeholder="$t('ruiDuReport.taskPlaceholder')" />
           </view>
 
           <view class="filter-item">
@@ -161,7 +174,8 @@ const fabPattern = reactive({
 });
 
 const filterForm = reactive({
-  searchKey: "",
+  contractName: "",
+  taskName: "",
   deptId: "",
   createTime: [],
 });
@@ -243,7 +257,8 @@ const queryList = (pageNo, pageSize) => {
   getRuiduReportPage({
     pageNo,
     pageSize: 10,
-    searchKey: filterForm.searchKey,
+    contractName: filterForm.contractName,
+    taskName: filterForm.taskName,
     deptId: filterForm.deptId,
     createTime: filterForm.createTime,
   })
@@ -298,7 +313,8 @@ const viewDetail = (item) => {
 };
 
 const resetFilter = () => {
-  filterForm.searchKey = "";
+  filterForm.contractName = "";
+  filterForm.taskName = "";
   filterForm.deptId = "";
   filterForm.createTime = [];
 };