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

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

@@ -113,8 +113,8 @@ const columns = ref<SmartTableColumn[]>([
     }
   },
   {
-    label: '工程号',
-    prop: 'projectNo',
+    label: '注册代码',
+    prop: 'equipCode',
     width: 200,
     search: {
       type: 'input'

yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/certificate.vue

@@ -82,7 +82,7 @@
           class="!w-240px"
         >
           <el-option
-            v-for="(item, key) in PressureBoilerCheckType"
+            v-for="(item, key) in PressureBoilerCheckTypeMap"
             :key="key"
             :label="item"
             :value="key"

yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/certificate.vue

@@ -82,7 +82,7 @@
           class="!w-240px"
         >
           <el-option
-            v-for="(item, key) in PressurePipeCheckType"
+            v-for="(item, key) in PressurePipeCheckTypeMap"
             :key="key"
             :label="item"
             :value="key"

yudao-ui-admin-vue3/src/views/pressure2/unqualifiedRecord/indexBoiler.vue

@@ -52,7 +52,7 @@
           class="!w-240px"
         >
           <el-option
-            v-for="(item, key) in PressureCheckTypeMap"
+            v-for="(item, key) in PressureBoilerCheckTypeMap"
             :key="key"
             :label="item"
             :value="key"
@@ -115,7 +115,11 @@
 import { ref, reactive, onMounted, computed } from 'vue'
 import { formatArrayDate } from '@/utils/formatTime'
 import { BoilerTaskOrderApi, TaskOrderVO } from '@/api/pressure2/boilertaskorder'
-import {PressureCheckTypeMap, PressureTaskOrderTaskStatus} from '@/utils/constants'
+import {
+  PressureBoilerCheckTypeMap,
+  PressureCheckTypeMap,
+  PressureTaskOrderTaskStatus
+} from '@/utils/constants'
 import { useRouter } from 'vue-router'
 
 const router = useRouter()

yudao-ui-admin-vue3/src/views/pressure2/unqualifiedRecord/indexPipe.vue

@@ -52,7 +52,7 @@
           class="!w-240px"
         >
           <el-option
-            v-for="(item, key) in PressureCheckTypeMap"
+            v-for="(item, key) in PressurePipeCheckTypeMap"
             :key="key"
             :label="item"
             :value="key"
@@ -115,7 +115,11 @@
 import { ref, reactive, onMounted, computed } from 'vue'
 import { formatArrayDate } from '@/utils/formatTime'
 import { PipeTaskOrderApi, TaskOrderVO } from '@/api/pressure2/pipetaskorder'
-import {PressureCheckTypeMap, PressureTaskOrderTaskStatus} from '@/utils/constants'
+import {
+  PressureCheckTypeMap,
+  PressurePipeCheckTypeMap,
+  PressureTaskOrderTaskStatus
+} from '@/utils/constants'
 import { useRouter } from 'vue-router'
 
 const router = useRouter()