Bladeren bron

问题调整

xy 8 uur geleden
bovenliggende
commit
655377ea91

+ 3 - 2
yudao-ui-admin-vue3/src/views/pressure2/boilerchecker/recordCheck.vue

@@ -387,11 +387,12 @@ const queryParams = reactive<Recordable>({
   unitName: undefined,
   checkType: undefined,
   checkProject: undefined,
-  checkUserStrIds: [userInfo.value.id], //检验员, 用户id集合
+  // checkUserStrIds: [userInfo.value.id], //检验员, 用户id集合
+  checkUserStrIds: [], //检验员, 用户id集合
   checkedDays: undefined,
   //status: 'all',
   recheckStrIds: [userInfo.value.id],
-  managerStrIds: [userInfo.value.id], //项目负责人,用户id集合
+  managerStrIds: [], //项目负责人,用户id集合
   recheckStatus: '100'
 })
 

+ 8 - 6
yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/components/AddInspectionplanDetail.vue

@@ -307,15 +307,17 @@ const handleSubmitOperationReport = async (manualUrl = '') => {
 }
 const handleSubmitConfirm = () => {
   approvalUserVisible.value = false
-  if(props.isEdit === 'add'){
-    fileList.value[0]?.url ? handleSubmitOperationReport(fileList.value[0].url) : uploadRef.value.submit()
-  } else {
-    handleSubmitOperationReport()
-  }
+  // if(props.isEdit === 'add'){
+  //   fileList.value[0]?.url ? handleSubmitOperationReport(fileList.value[0].url) : uploadRef.value.submit()
+  // } else {
+  //   handleSubmitOperationReport()
+  // }
+  fileList.value[0]?.url ? handleSubmitOperationReport(fileList.value[0].url) : uploadRef.value.submit()
 }
 const handleSubmitBefore = () => {
   // console.log(props.editInspectionplanParams, 'props.editInspectionplanParams')
-  if (props.isEdit === 'add' && !fileList.value.length) return ElMessage.error('请先上传方案文件')
+  // if (props.isEdit === 'add' && !fileList.value.length) return ElMessage.error('请先上传方案文件')
+  if (!fileList.value.length) return ElMessage.error('请先上传方案文件')
   getSchemeReviewerList()
 }
 

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

@@ -1722,6 +1722,7 @@ const supportingDocsAuditColumns = ref([
           </div>
         case 0:
           return <div>
+            <el-button link type="primary" onClick={() => handleCancelDocs(row)}>作废</el-button>
             <el-button link type="primary" onClick={() => newHandleOperationReport(row, 'edit')}>编辑</el-button>
           </div>
         default:

+ 8 - 6
yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/components/AddInspectionplanDetail.vue

@@ -318,15 +318,17 @@ const handleSubmitOperationReport = async (manualUrl = '') => {
 }
 const handleSubmitConfirm = () => {
   approvalUserVisible.value = false
-  if(props.isEdit === 'add'){
-    fileList.value[0]?.url ? handleSubmitOperationReport(fileList.value[0].url) : uploadRef.value.submit()
-  } else {
-    handleSubmitOperationReport()
-  }
+  // if(props.isEdit === 'add'){
+  //   fileList.value[0]?.url ? handleSubmitOperationReport(fileList.value[0].url) : uploadRef.value.submit()
+  // } else {
+  //   handleSubmitOperationReport()
+  // }
+  fileList.value[0]?.url ? handleSubmitOperationReport(fileList.value[0].url) : uploadRef.value.submit()
 }
 const handleSubmitBefore = () => {
   // console.log(props.editInspectionplanParams, 'props.editInspectionplanParams')
-  if (props.isEdit === 'add' && !fileList.value.length) return ElMessage.error('请先上传方案文件')
+  // if (props.isEdit === 'add' && !fileList.value.length) return ElMessage.error('请先上传方案文件')
+  if (!fileList.value.length) return ElMessage.error('请先上传方案文件')
   getSchemeReviewerList()
 }
 

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

@@ -1803,6 +1803,7 @@ const supportingDocsAuditColumns = ref([
         case 0:
           return <div>
             <el-button link type="primary" onClick={() => newHandleOperationReport(row, 'edit')}>编辑</el-button>
+            <el-button link type="primary" onClick={() => handleCancelDocs(row)}>作废</el-button>
           </div>
         default:
           return '-'