Bladeren bron

重大问题线索调整

xy 1 maand geleden
bovenliggende
commit
e4c1cfe87a

+ 2 - 2
yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/components/ServiceRecordList.vue

@@ -43,7 +43,7 @@
               </el-dropdown-menu>
             </template>
           </el-dropdown>
-          <el-button v-if="props.businessType === 400 ? isAddMainquestion !== 'view' : true" type="warning" plain @click="getSchemeReviewerList">提交审核</el-button>
+<!--          <el-button v-if="props.businessType === 400 ? isAddMainquestion !== 'view' : true" type="warning" plain @click="getSchemeReviewerList">提交审核</el-button>-->
 <!--          <el-button-->
 <!--            v-if="props.businessType === 400 ? isAddMainquestion !== 'view' : true"-->
 <!--            :disabled="wxPushDisabled"-->
@@ -626,7 +626,7 @@ const fetchHisVersionPage = async (bool = false) => {
   }
   handleGetCheckKeyInputs(templateParams.value.dataStr)
   // 重大问题线索新增直接打开葡萄城编辑
-  if (props.businessType === 400 && unref(isAddMainquestion) === 'add') {
+  if (props.businessType === 400 && unref(isAddMainquestion) === 'add' && curReportId.value === '') {
 
     //先生成报表
     const addReportFn = async (paramsData) => {

+ 6 - 1
yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/components/TaskOrderDetailDialog.vue

@@ -1724,7 +1724,12 @@ const supportingDocsAuditColumns = ref([
       switch(row.status) {
         case PressureTaskOrderStatus['AUDITING']:
         case PressureTaskOrderStatus['APPROVED']:
-          return <el-button link type="primary" onClick={() => newHandleOperationReport(row, 'view')}>查看详情</el-button>
+          return <div>
+            <el-button link type="primary" onClick={() => newHandleOperationReport(row, 'view')}>查看详情</el-button>
+            {row.reportType === PressureReportType.MAINQUESTION && (
+              <el-button link type="primary" onClick={() => handleCancelDocs(row)}>作废</el-button>
+            )}
+          </div>
         // case PressureTaskOrderStatus['APPROVED']:
         //   return <el-button link type="primary" onClick={() => handleAssociateEquipment(row)}>关联设备</el-button>
         case PressureTaskOrderStatus['REJECTED']:

+ 2 - 2
yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/components/ServiceRecordList.vue

@@ -42,7 +42,7 @@
               </el-dropdown-menu>
             </template>
           </el-dropdown>
-          <el-button v-if="props.businessType === 400 ? isAddMainquestion !== 'view' : true" type="warning" plain @click="getSchemeReviewerList">提交审核</el-button>
+<!--          <el-button v-if="props.businessType === 400 ? isAddMainquestion !== 'view' : true" type="warning" plain @click="getSchemeReviewerList">提交审核</el-button>-->
 <!--          <el-button-->
 <!--            v-if="props.businessType === 400 ? isAddMainquestion !== 'view' : true"-->
 <!--            :disabled="wxPushDisabled"-->
@@ -607,7 +607,7 @@ const fetchHisVersionPage = async (bool = false) => {
   }
   handleGetCheckKeyInputs(templateParams.value.dataStr)
   // 重大问题线索新增直接打开葡萄城编辑
-  if (props.businessType === 400 && unref(isAddMainquestion) === 'add') {
+  if (props.businessType === 400 && unref(isAddMainquestion) === 'add' && curReportId.value === '') {
 
     //先生成报表
     const addReportFn = async (paramsData) => {

+ 6 - 1
yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/components/TaskOrderDetailDialog.vue

@@ -1821,7 +1821,12 @@ const supportingDocsAuditColumns = ref([
       switch(row.status) {
         case PressureTaskOrderStatus['AUDITING']:
         case PressureTaskOrderStatus['APPROVED']:
-          return <el-button link type="primary" onClick={() => newHandleOperationReport(row, 'view')}>查看详情</el-button>
+          return <div>
+            <el-button link type="primary" onClick={() => newHandleOperationReport(row, 'view')}>查看详情</el-button>
+            {row.reportType === PressureReportType.MAINQUESTION && (
+              <el-button link type="primary" onClick={() => handleCancelDocs(row)}>作废</el-button>
+            )}
+          </div>
         // case PressureTaskOrderStatus['APPROVED']:
         //   return <el-button link type="primary" onClick={() => handleAssociateEquipment(row)}>关联设备</el-button>
         case PressureTaskOrderStatus['REJECTED']: