Merge branch 'stable' of http://39.98.153.250:9080/yudao/yudao-admin-yiqun into stable

yudao-ui-admin-vue3/src/views/pressure2/boilerReportCheck/index.vue

@@ -297,7 +297,7 @@ const handleEdit = (row: Record<string, any>) => {
   router.push({ name: 'BoilerCheckerTaskDetail', query: { id:  row.orderItemId || row.id, type: 'reportAudit' } })
 }
 const handleRowDblclick = (row: Record<string, any>) => {
-  router.push({ name: 'BoilerCheckerTaskDetail', query: { id:  row.orderItemId || row.id, type: 'reportAudit' } })
+  // router.push({ name: 'BoilerCheckerTaskDetail', query: { id:  row.orderItemId || row.id, type: 'reportAudit' } })
 }
 
 //------------人员选择弹窗------------------------

yudao-ui-admin-vue3/src/views/pressure2/boilerReportPreparationList/index.vue

@@ -631,14 +631,23 @@ const resetQuery = () => {
 }
 
 // 修改后的编辑/查看详情操作
-const handleEdit = (id: string) => {
-  router.push({ name: 'BoilerCheckerTaskDetail', query: { id, type: 'BoilerReportPreparationList' } })
+const handleEdit = (row: Record<string, any>) => {
+
+  //判断报告编制时是否有结束检验日期
+  if (row.taskStatus >= PressureTaskOrderTaskStatus.REPORT_INPUT){
+    if (!row.endCheckDate) {
+      ElMessage.error('请添加结束检验时间再进行编制！')
+      return
+    }
+  }
+
+  router.push({ name: 'BoilerCheckerTaskDetail', query: { row.id, type: 'BoilerReportPreparationList' } })
 }
 const handleRowDblclick = (row: Record<string, any>) => {
   if (row.isClaim === false) {
     return
   }
-  router.push({ name: 'BoilerCheckerTaskDetail', query: { id: row.id, type: 'BoilerReportPreparationList' } })
+  // router.push({ name: 'BoilerCheckerTaskDetail', query: { id: row.id, type: 'BoilerReportPreparationList' } })
 }
 
 //------------人员选择弹窗------------------------

yudao-ui-admin-vue3/src/views/pressure2/boilerReportRatify/index.vue

@@ -297,7 +297,7 @@ const handleEdit = (row: Record<string, any>) => {
   router.push({ name: 'BoilerCheckerTaskDetail', query: { id: row.orderItemId || row.id, type: 'reportRatify' } })
 }
 const handleRowDblclick = (row: Record<string, any>) => {
-  router.push({ name: 'BoilerCheckerTaskDetail', query: { id:  row.orderItemId || row.id, type: 'reportRatify' } })
+  // router.push({ name: 'BoilerCheckerTaskDetail', query: { id:  row.orderItemId || row.id, type: 'reportRatify' } })
 }
 
 //------------人员选择弹窗------------------------

yudao-ui-admin-vue3/src/views/pressure2/boilerchecker/myTask.vue

@@ -1094,7 +1094,7 @@ const handleRowDblclick = (row: Record<string, any>) => {
   if (row.isClaim === false) {
     return
   }
-  router.push({ name: 'BoilerCheckerTaskDetail', query: { id: row.id, type: 'BoilerMyTask' } })
+  // router.push({ name: 'BoilerCheckerTaskDetail', query: { id: row.id, type: 'BoilerMyTask' } })
 }
 const filterFn = (data, type = '1') => {
   switch (type) {

yudao-ui-admin-vue3/src/views/pressure2/inspectionOpinion/indexBoilerTab.vue

@@ -176,6 +176,16 @@
           <el-option v-for="(item, key) in mpSendStatusMap" :key="key" :label="item" :value="key" />
         </el-select>
       </el-form-item>
+      <el-form-item label="出具月份" prop="ratifyMonth">
+        <el-date-picker
+          v-model="searchInfo.ratifyMonth"
+          type="month"
+          value-format="YYYY-MM"
+          placeholder="选择月份"
+          clearable
+          class="!w-200px"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button @click="search(1)"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="search(2)"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -356,6 +366,11 @@
           {{ formatArrayDate(row.checkDate) }}
         </template>
       </el-table-column>
+      <el-table-column label="审批通过日期" align="center" prop="ratifyTime" min-width="120px">
+        <template #default="{ row }">
+          {{ formatDate(row.ratifyTime, "YYYY-MM-DD") }}
+        </template>
+      </el-table-column>
       <!-- <el-table-column
         label="剩余回收时间"
         align="center"
@@ -804,6 +819,14 @@ const getList = async () => {
       pageNo: pagination.value.pageNo,
       pageSize: pagination.value.pageSize
     })
+    // 出具月份转换
+    if (params.ratifyMonth) {
+      const [y, m] = params.ratifyMonth.split('-')
+      params.ratifyTimeStart = `${y}-${m}-01 00:00:00`
+      const lastDay = new Date(Number(y), Number(m), 0).getDate()
+      params.ratifyTimeEnd = `${y}-${m}-${String(lastDay).padStart(2, '0')} 23:59:59`
+      delete params.ratifyMonth
+    }
     if (!params.tableStatus) delete params.tableStatus
     const res = await BoilerTaskOrderApi.getCheckBookList(params)
     dataSource.value = res?.list || []

yudao-ui-admin-vue3/src/views/pressure2/inspectionOpinion/indexPipeTab.vue

@@ -176,6 +176,16 @@
           <el-option v-for="(item, key) in mpSendStatusMap" :key="key" :label="item" :value="key" />
         </el-select>
       </el-form-item>
+      <el-form-item label="出具月份" prop="ratifyMonth">
+        <el-date-picker
+          v-model="searchInfo.ratifyMonth"
+          type="month"
+          value-format="YYYY-MM"
+          placeholder="选择月份"
+          clearable
+          class="!w-200px"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button @click="search(1)"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="search(2)"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -356,6 +366,11 @@
           {{ formatArrayDate(row.checkDate) }}
         </template>
       </el-table-column>
+      <el-table-column label="审批通过日期" align="center" prop="ratifyTime" min-width="120px">
+        <template #default="{ row }">
+          {{ formatDate(row.ratifyTime, "YYYY-MM-DD") }}
+        </template>
+      </el-table-column>
       <!-- <el-table-column
         label="剩余回收时间"
         align="center"
@@ -804,6 +819,14 @@ const getList = async () => {
       pageNo: pagination.value.pageNo,
       pageSize: pagination.value.pageSize
     })
+    // 出具月份转换
+    if (params.ratifyMonth) {
+      const [y, m] = params.ratifyMonth.split('-')
+      params.ratifyTimeStart = `${y}-${m}-01 00:00:00`
+      const lastDay = new Date(Number(y), Number(m), 0).getDate()
+      params.ratifyTimeEnd = `${y}-${m}-${String(lastDay).padStart(2, '0')} 23:59:59`
+      delete params.ratifyMonth
+    }
     if (!params.tableStatus) delete params.tableStatus
     const res = await PipeTaskOrderApi.getCheckBookList(params)
     dataSource.value = res?.list || []

yudao-ui-admin-vue3/src/views/pressure2/inspectionOpinion/reportIndexBoilerTab.vue

@@ -202,6 +202,16 @@
           <el-option v-for="(item, key) in mpSendStatusMap" :key="key" :label="item" :value="key" />
         </el-select>
       </el-form-item> -->
+      <el-form-item label="出具月份" prop="ratifyMonth">
+        <el-date-picker
+          v-model="searchInfo.ratifyMonth"
+          type="month"
+          value-format="YYYY-MM"
+          placeholder="选择月份"
+          clearable
+          class="!w-200px"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button @click="search(1)"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="search(2)"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -568,6 +578,11 @@
           {{ row.handleDate }}
         </template>
       </el-table-column>
+      <el-table-column label="审批通过日期" align="center" prop="ratifyTime" min-width="120px">
+        <template #default="{ row }">
+          {{ formatDate(row.ratifyTime, "YYYY-MM-DD") }}
+        </template>
+      </el-table-column>
       <!-- 主检人 -->
       <el-table-column label="主检人" align="center" prop="mainCheckerUser" min-width="200">
         <template #default="scope">
@@ -899,6 +914,14 @@ const getList = async () => {
       pageSize: pagination.value.pageSize,
       isFinish: mainTaskStatusEnd.value === '1' ? false : true
     })
+    // 出具月份转换
+    if (params.ratifyMonth) {
+      const [y, m] = params.ratifyMonth.split('-')
+      params.ratifyTimeStart = `${y}-${m}-01 00:00:00`
+      const lastDay = new Date(Number(y), Number(m), 0).getDate()
+      params.ratifyTimeEnd = `${y}-${m}-${String(lastDay).padStart(2, '0')} 23:59:59`
+      delete params.ratifyMonth
+    }
     if (params.taskStatus === 'all') delete params.taskStatus
     if (params.isReported === 'all') delete params.isReported
     if (params.isCloseReported === 'all') delete params.isCloseReported

yudao-ui-admin-vue3/src/views/pressure2/inspectionOpinion/reportIndexPipeTab.vue

@@ -202,6 +202,16 @@
           <el-option v-for="(item, key) in mpSendStatusMap" :key="key" :label="item" :value="key" />
         </el-select>
       </el-form-item> -->
+      <el-form-item label="出具月份" prop="ratifyMonth">
+        <el-date-picker
+          v-model="searchInfo.ratifyMonth"
+          type="month"
+          value-format="YYYY-MM"
+          placeholder="选择月份"
+          clearable
+          class="!w-200px"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button @click="search(1)"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="search(2)"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -568,6 +578,11 @@
           {{ row.handleDate }}
         </template>
       </el-table-column>
+      <el-table-column label="审批通过日期" align="center" prop="ratifyTime" min-width="120px">
+        <template #default="{ row }">
+          {{ formatDate(row.ratifyTime, "YYYY-MM-DD") }}
+        </template>
+      </el-table-column>
       <!-- 主检人 -->
       <el-table-column label="主检人" align="center" prop="mainInspector" min-width="200">
         <template #default="scope">
@@ -899,6 +914,14 @@ const getList = async () => {
       pageSize: pagination.value.pageSize,
       isFinish: mainTaskStatusEnd.value === '1' ? false : true
     })
+    // 出具月份转换
+    if (params.ratifyMonth) {
+      const [y, m] = params.ratifyMonth.split('-')
+      params.ratifyTimeStart = `${y}-${m}-01 00:00:00`
+      const lastDay = new Date(Number(y), Number(m), 0).getDate()
+      params.ratifyTimeEnd = `${y}-${m}-${String(lastDay).padStart(2, '0')} 23:59:59`
+      delete params.ratifyMonth
+    }
     if (params.taskStatus === 'all') delete params.taskStatus
     if (params.isReported === 'all') delete params.isReported
     if (params.isCloseReported === 'all') delete params.isCloseReported

yudao-ui-admin-vue3/src/views/pressure2/pipeReportCheck/index.vue

@@ -288,10 +288,10 @@ const resetQuery = () => {
 
 // 修改后的编辑/查看详情操作
 const handleEdit = (row: Record<string, any>) => {
-  router.push({ name: 'PipeCheckerTaskDetail', query: { id:  row.id , type: 'reportAudit' } })
+  router.push({ name: 'PipeCheckerTaskDetail', query: { id:row.id, orderId:row.orderId, type: 'reportAudit' } })
 }
 const handleRowDblclick = (row: Record<string, any>) => {
-  router.push({ name: 'PipeCheckerTaskDetail', query: { id:  row.id , type: 'reportAudit' } })
+  // router.push({ name: 'PipeCheckerTaskDetail', query: { id:row.id, orderId:row.orderId, type: 'reportAudit' } })
 }
 
 //------------人员选择弹窗------------------------

yudao-ui-admin-vue3/src/views/pressure2/pipeReportPreparationList/index.vue

@@ -331,7 +331,7 @@
       <el-table-column label="操作" align="center" min-width="150px" fixed="right">
         <template #default="scope">
           <div class="flex flex-col gap-1">
-            <el-button link type="primary" @click="handleEdit(scope.row.id)"> 编制报告 </el-button>
+            <el-button link type="primary" @click="handleEdit(scope.row)"> 编制报告 </el-button>
           </div>
         </template>
       </el-table-column>
@@ -694,14 +694,23 @@ const resetQuery = () => {
 }
 
 // 修改后的编辑/查看详情操作
-const handleEdit = (id: string) => {
-  router.push({ name: 'PipeCheckerTaskDetail', query: { id, type: 'PipeReportPreparationList' } })
+const handleEdit = (row: Record<string, any>) => {
+
+  //判断报告编制时是否有结束检验日期
+  if (row.taskStatus >= PressureTaskOrderTaskStatus.REPORT_INPUT){
+    if (!row.endCheckDate) {
+      ElMessage.error('请添加结束检验时间再进行编制！')
+      return
+    }
+  }
+
+  router.push({ name: 'PipeCheckerTaskDetail', query: { id:row.id, orderId:row.orderId, type: 'PipeReportPreparationList' } })
 }
 const handleRowDblclick = (row: Record<string, any>) => {
   if (row.isClaim === false) {
     return
   }
-  router.push({ name: 'PipeCheckerTaskDetail', query: { id: row.id, type: 'PipeReportPreparationList' } })
+  // router.push({ name: 'PipeCheckerTaskDetail', query: { id:row.id, orderId:row.orderId, type: 'PipeReportPreparationList' } })
 }
 
 //------------人员选择弹窗------------------------

yudao-ui-admin-vue3/src/views/pressure2/pipeReportRatify/index.vue

@@ -286,10 +286,10 @@ const resetQuery = () => {
 }
 
 const handleEdit = (row: Record<string, any>) => {
-  router.push({ name: 'PipeCheckerTaskDetail', query: { id: row.id || row.id, type: 'reportRatify' } })
+  router.push({ name: 'PipeCheckerTaskDetail', query: { id:row.id, orderId:row.orderId, type: 'reportRatify' } })
 }
 const handleRowDblclick = (row: Record<string, any>) => {
-  router.push({ name: 'PipeCheckerTaskDetail', query: { id: row.id || row.id, type: 'reportRatify' } })
+  // router.push({ name: 'PipeCheckerTaskDetail', query: { id:row.id, orderId:row.orderId, type: 'reportRatify' } })
 }
 
 //------------人员选择弹窗------------------------

yudao-ui-admin-vue3/src/views/pressure2/pipechecker/myTask.vue

@@ -922,7 +922,7 @@ const handleRowDblclick = (row: Record<string, any>) => {
   if (row.isClaim === false) {
     return
   }
-  router.push({ name: 'PipeCheckerTaskDetail', query: { id: row.id, type: 'PipeReportPreparationList' } })
+  // router.push({ name: 'PipeCheckerTaskDetail', query: { id: row.id, type: 'PipeReportPreparationList' } })
 }
 
 const handleClaim = (id: string) => {