xy 1 månad sedan
förälder
incheckning
55605f0f64

+ 1 - 1
yudao-ui-admin-vue3/src/views/pressure2/boilerchecker/BoilerAuditInspectionCommentsNotice.vue

@@ -27,7 +27,7 @@
         <el-radio-button label="已通过" value="200" />
         <el-radio-button label="审核中" value="100" />
         <el-radio-button label="已拒绝" value="300" />
-        <el-radio-button label="已作废" value="400" />
+<!--        <el-radio-button label="已作废" value="400" />-->
       </el-radio-group>
     </template>
   </SmartTable>

+ 1 - 1
yudao-ui-admin-vue3/src/views/pressure2/boilerchecker/taskDetail.vue

@@ -21,7 +21,7 @@
         <ContentWrap title="检验项目清单" class="h-full flex flex-col" :bodyStyle="{padding: '10px', flex: 1, overflow: 'hidden'}">
           <template #header>
             <el-button @click="handleAddItem" type="primary" size="small" :disabled="taskInfo?.taskStatus === PressureTaskOrderTaskStatus['REPORT_END'] || canAddReportItem">添加检验项目</el-button>
-            <el-button @click="handleAddItemPart" type="primary" size="small" v-if="taskOrderItem?.boilerType !== '2'"
+            <el-button @click="handleAddItemPart" type="primary" size="small" v-if="taskOrderItem?.boilerType === '1'"
                        :disabled="taskInfo?.taskStatus === PressureTaskOrderTaskStatus['REPORT_END'] || canAddReportItem">
               添加检验部件</el-button>
           </template>

+ 3 - 3
yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/review.vue

@@ -141,10 +141,10 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="检验员" align="center" prop="checkUsers" min-width="150px">
+      <el-table-column label="检验员" align="center" prop="appoinmentUser" min-width="150px">
         <template #default="scope">
-          <div v-if="scope.row.checkUsers && scope.row.checkUsers.length > 0">
-            <div v-for="user in scope.row.checkUsers" :key="user.id">
+          <div v-if="scope.row.appoinmentUser && scope.row.appoinmentUser.length > 0">
+            <div v-for="user in scope.row.appoinmentUser" :key="user.id">
               {{ user.nickname }} ({{ user.employeeNo }})
             </div>
           </div>

+ 1 - 1
yudao-ui-admin-vue3/src/views/pressure2/pipechecker/PipeAuditInspectionCommentsNotice.vue

@@ -27,7 +27,7 @@
         <el-radio-button label="已通过" value="200" />
         <el-radio-button label="审核中" value="100" />
         <el-radio-button label="已拒绝" value="300" />
-        <el-radio-button label="已作废" value="400" />
+<!--        <el-radio-button label="已作废" value="400" />-->
       </el-radio-group>
     </template>
   </SmartTable>

+ 3 - 3
yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/review.vue

@@ -141,10 +141,10 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="检验员" align="center" prop="checkUsers" min-width="150px">
+      <el-table-column label="检验员" align="center" prop="appoinmentUser" min-width="150px">
         <template #default="scope">
-          <div v-if="scope.row.checkUsers && scope.row.checkUsers.length > 0">
-            <div v-for="user in scope.row.checkUsers" :key="user.id">
+          <div v-if="scope.row.appoinmentUser && scope.row.appoinmentUser.length > 0">
+            <div v-for="user in scope.row.appoinmentUser" :key="user.id">
               {{ user.nickname }} ({{ user.employeeNo }})
             </div>
           </div>