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

yudao-ui-admin-vue3/src/views/pressure2/appointmentconfirmorderCityBureau/audit.vue

@@ -99,11 +99,10 @@ const route = useRoute()
 // 检验性质映射
 const checkTypeMap = {
   100: '定期检验',
-  200: '年度检查',
-  300: '超年限检验'
+  200: '年度检查'
 }
 const equipStatusList = dictStore.getDictMap[DICT_TYPE.SYSTEM_EQUIP_BOILER_STATUS]
-// const equipTypes = getStrDictOptions(DICT_TYPE.SYSTEM_EQUIP_CONTAINER_EQUIP_TYPE)
+const equipMainTypeList = dictStore.getDictMap[DICT_TYPE.PRESSURE2_EQUIP_MAIN_TYPE]
 const auditStatusOptions = getStrDictOptions(DICT_TYPE.BPM_AUDIT_STATUS)
 const statusMap = {
   '100': 'primary',
@@ -150,7 +149,7 @@ const columns = ref<SmartTableColumn[]>([
     }
   },
   {
-    label: '设备分类',
+    label: '设备类型',
     prop: 'equipMainType',
     fieldProps: {
       align: 'center',
@@ -158,14 +157,11 @@ const columns = ref<SmartTableColumn[]>([
     },
     search: {
       sort: 0,
-      type: 'input'
+      type: 'select',
+      options: equipMainTypeList
     },
-    render(row, value) {
-      return (
-        <div style="text-align:center">
-          <div>{value ? PressureEquipMainTypeMap[value] : '-'}</div>
-        </div>
-      )
+    render: (row, value) => {
+      return equipMainTypeList.find((x) => x.value == value)?.label || '-'
     }
   },
   {

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

@@ -83,11 +83,11 @@ const equipCategoryList = ref([])
 
 const checkTypeMap = {
   '100': '定期检验',
-  '200': '年度检查',
-  '300': '超年限检验'
+  '200': '年度检查'
 }
 
 const equipStatusList = dictStore.getDictMap[DICT_TYPE.SYSTEM_EQUIP_BOILER_STATUS]
+const equipMainTypeList = dictStore.getDictMap[DICT_TYPE.PRESSURE2_EQUIP_MAIN_TYPE]
 
 const columns = ref<SmartTableColumn[]>([
   {
@@ -145,7 +145,7 @@ const columns = ref<SmartTableColumn[]>([
     // ></el-switch>
   },
   {
-    label: '设备分类',
+    label: '设备类型',
     prop: 'equipMainType',
     fieldProps: {
       align: 'center',
@@ -153,14 +153,11 @@ const columns = ref<SmartTableColumn[]>([
     },
     search: {
       sort: 0,
-      type: 'input'
+      type: 'select',
+      options: equipMainTypeList
     },
-    render(row, value) {
-      return (
-        <div style="text-align:center">
-          <div>{value ? PressureEquipMainTypeMap[value] : '-'}</div>
-        </div>
-      )
+    render: (row, value) => {
+      return equipMainTypeList.find((x) => x.value == value)?.label || '-'
     }
   },
   {
@@ -334,8 +331,7 @@ const columns = ref<SmartTableColumn[]>([
       prop: 'checkType',
       options: [
         { label: '定期检验', value: '100' },
-        // { label: '年度检查', value: '200' },
-        { label: '超年限检验', value: '300' }
+        { label: '年度检查', value: '200' }
       ]
     },
     render: (_row, value) => {

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

@@ -51,13 +51,15 @@
               </el-form-item>
             </el-col>
             <el-col v-bind="ElColSpanConfig">
-              <el-form-item class="w-full" label="单位名称" prop="unitName">
-                <el-input
-                  class="w-full"
-                  v-model="queryParams.unitName"
-                  placeholder="请输入单位名称"
-                  clearable
-                />
+              <el-form-item class="w-full" label="设备类型" prop="equipMainType">
+                <el-select v-model="queryParams.equipMainType" placeholder="请选择设备类型" clearable>
+                  <el-option
+                    v-for="dict in equipMainTypeList"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -134,6 +136,16 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col v-bind="ElColSpanConfig">
+                <el-form-item class="w-full" label="单位名称" prop="unitName">
+                  <el-input
+                    class="w-full"
+                    v-model="queryParams.unitName"
+                    placeholder="请输入单位名称"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-collapse-transition>
         </el-form>
@@ -215,9 +227,9 @@
        </template>
       </el-table-column>
         <el-table-column label="区域" align="center" prop="equipDistrictName" min-width="130" />
-        <el-table-column label="设备分类" align="center" prop="equipMainType" min-width="120">
+        <el-table-column label="设备类型" align="center" prop="equipMainType" min-width="120">
           <template #default="{ row }">
-            {{ PressureEquipMainTypeMap[row.equipMainType] }}
+            {{ equipMainTypeList.find((x) => x.value == row.equipMainType)?.label || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="使用证编号" align="center" prop="useRegisterNo" min-width="130" />
@@ -343,6 +355,7 @@ const list = ref<AppointmentConfirmOrderRefuseItemVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const dictStore = useDictStore()
 const getReasonDictStatus = computed(() => dictStore.getDictMap['refuseInspectedCategory'])
+const equipMainTypeList = dictStore.getDictMap[DICT_TYPE.PRESSURE2_EQUIP_MAIN_TYPE]
 const queryParams = reactive<Recordable>({
   pageNo: 1,
   pageSize: 10,
@@ -358,8 +371,7 @@ const exportLoading = ref(false) // 导出的加载中
 
 const checkTypeMap = {
   '100': '定期检验',
-  '200': '年度检查',
-  '300': '超年限检验'
+  '200': '年度检查'
 }
 
 const processStatusMap = {

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

@@ -41,17 +41,28 @@
             </el-form-item>
           </el-col>
           <el-col v-bind="ElColSpanConfig">
-            <el-form-item label="检验性质" prop="checkType" class="w-full">
-              <el-select v-model="queryParams.checkType" placeholder="请选择" clearable>
-                <el-option
-                  v-for="(item, key) in checkTypeMap"
-                  :key="key"
-                  :label="item"
-                  :value="key"
-                />
-              </el-select>
+            <el-form-item class="w-full" label="产品编号" prop="productNo">
+              <el-input
+                v-model="queryParams.productNo"
+                placeholder="请输入产品编号"
+                clearable
+                @keyup.enter="handleQuery"
+                class="w-full"
+              />
             </el-form-item>
           </el-col>
+<!--          <el-col v-bind="ElColSpanConfig">-->
+<!--            <el-form-item label="检验性质" prop="checkType" class="w-full">-->
+<!--              <el-select v-model="queryParams.checkType" placeholder="请选择" clearable>-->
+<!--                <el-option-->
+<!--                  v-for="(item, key) in checkTypeMap"-->
+<!--                  :key="key"-->
+<!--                  :label="item"-->
+<!--                  :value="key"-->
+<!--                />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col v-bind="ElColSpanConfig">
             <el-form-item class="w-full" label="单位名称" prop="unitName">
               <el-input
@@ -65,17 +76,6 @@
         </el-row>
         <el-collapse-transition>
           <el-row getter="24" v-show="isSearchExpanded">
-            <el-col v-bind="ElColSpanConfig">
-              <el-form-item class="w-full" label="产品编号" prop="productNo">
-                <el-input
-                  v-model="queryParams.productNo"
-                  placeholder="请输入产品编号"
-                  clearable
-                  @keyup.enter="handleQuery"
-                  class="w-full"
-                />
-              </el-form-item>
-            </el-col>
             <el-col v-bind="ElColSpanConfig">
               <el-form-item class="w-full" label="区域" prop="equipDistrict">
                 <AreaSelect
@@ -88,10 +88,10 @@
               </el-form-item>
             </el-col>
             <el-col v-bind="ElColSpanConfig">
-              <el-form-item class="w-full" label="容器种类" prop="equipType">
-                <el-select v-model="queryParams.equipType" placeholder="请选择容器归类">
+              <el-form-item class="w-full" label="设备类型" prop="equipMainType">
+                <el-select v-model="queryParams.equipMainType" placeholder="请选择设备类型" clearable>
                   <el-option
-                    v-for="dict in getStrDictOptions(DICT_TYPE.SYSTEM_EQUIP_CONTAINER_EQUIP_TYPE)"
+                    v-for="dict in equipMainTypeList"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -132,14 +132,14 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="设备分类"
+        label="设备类型"
         align="center"
         prop="equipMainType"
         min-width="100"
         show-overflow-tooltip
       >
         <template #default="{row}">
-          <div>{{PressureEquipMainTypeMap[row.equipMainType]}}</div>
+          <div>{{equipMainTypeList.find((x) => x.value == row.equipMainType)?.label || '-'}}</div>
         </template>
       </el-table-column>
       <el-table-column label="设备注册代码" align="center" prop="equipCode" min-width="150">
@@ -249,8 +249,11 @@ import { useRouter } from 'vue-router'
 defineOptions({ name: 'RefuseAnnualInspection' })
 
 const router = useRouter()
+const dictStore = useDictStore()
+
 const equipStatusList = getStrDictOptions(DICT_TYPE.SYSTEM_EQUIP_CONTAINER_STATUS)
 const equipBoilerTypeOptions = getStrDictOptions(DICT_TYPE.SYSTEM_EQUIP_BOILER_TYPE)
+const equipMainTypeList = dictStore.getDictMap[DICT_TYPE.PRESSURE2_EQUIP_MAIN_TYPE]
 const equipPipeTypeOptions = getStrDictOptions(DICT_TYPE.PIPE_TYPE)
 const getEquipTypeLabel = (row) => {
 
@@ -303,7 +306,6 @@ import {
 } from '@/api/pressure2/appointmentconfirmorderrefuseitem'
 import {PressureEquipMainType, PressureEquipMainTypeMap} from "@/utils/constants";
 import download from "@/utils/download";
-const dictStore = useDictStore()
 const getReasonDictStatus = computed(() => dictStore.getDictMap['refuseInspectedCategory'])
 const getRowReason = (row) => {
   return getReasonDictStatus.value.find((x) => x.value == row.reasonDict)?.label || '-'

yudao-ui-admin-vue3/src/views/pressure2/rejectionInquiry/RefuseRegularCheckTab.vue

@@ -42,13 +42,15 @@
               </el-form-item>
             </el-col>
             <el-col v-bind="ElColSpanConfig">
-              <el-form-item class="w-full" label="单位名称" prop="unitName">
-                <el-input
-                  class="w-full"
-                  v-model="queryParams.unitName"
-                  placeholder="请输入单位名称"
-                  clearable
-                />
+              <el-form-item class="w-full" label="设备类型" prop="equipMainType">
+                <el-select v-model="queryParams.equipMainType" placeholder="请选择设备类型" clearable>
+                  <el-option
+                    v-for="dict in equipMainTypeList"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col v-bind="ElColSpanConfig">
@@ -121,22 +123,19 @@
                 </el-form-item>
               </el-col>
               <el-col v-bind="ElColSpanConfig">
-                <el-form-item class="w-full" label="提交时间" prop="submitTime">
-                  <el-date-picker
-                    v-model="queryParams.submitTime"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                    type="daterange"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+                <el-form-item class="w-full" label="单位名称" prop="unitName">
+                  <el-input
                     class="w-full"
+                    v-model="queryParams.unitName"
+                    placeholder="请输入单位名称"
+                    clearable
                   />
                 </el-form-item>
               </el-col>
               <el-col v-bind="ElColSpanConfig">
-                <el-form-item class="w-full" label="下次检验时间" prop="nextCheckDate">
+                <el-form-item class="w-full" label="提交时间" prop="submitTime">
                   <el-date-picker
-                    v-model="queryParams.nextCheckDate"
+                    v-model="queryParams.submitTime"
                     value-format="YYYY-MM-DD HH:mm:ss"
                     type="daterange"
                     start-placeholder="开始日期"
@@ -146,6 +145,19 @@
                   />
                 </el-form-item>
               </el-col>
+<!--              <el-col v-bind="ElColSpanConfig">-->
+<!--                <el-form-item class="w-full" label="下次检验时间" prop="nextCheckDate">-->
+<!--                  <el-date-picker-->
+<!--                    v-model="queryParams.nextCheckDate"-->
+<!--                    value-format="YYYY-MM-DD HH:mm:ss"-->
+<!--                    type="daterange"-->
+<!--                    start-placeholder="开始日期"-->
+<!--                    end-placeholder="结束日期"-->
+<!--                    :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"-->
+<!--                    class="w-full"-->
+<!--                  />-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
 <!--             <el-col v-bind="ElColSpanConfig">-->
 <!--                <el-form-item class="w-full" label="下次年检时间" prop="nextYearCheckDate">-->
 <!--                  <el-date-picker-->
@@ -217,9 +229,9 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="设备分类" align="center" prop="equipMainType" min-width="120">
+        <el-table-column label="设备类型" align="center" prop="equipMainType" min-width="120">
           <template #default="{ row }">
-            {{ PressureEquipMainTypeMap[row.equipMainType] }}
+            {{ equipMainTypeList.find((x) => x.value == row.equipMainType)?.label || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="区域" align="center" prop="equipDistrictName" min-width="130" />
@@ -355,7 +367,7 @@ const list = ref<AppointmentConfirmOrderRefuseItemVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const dictStore = useDictStore()
 const getReasonDictStatus = computed(() => dictStore.getDictMap['refuseInspectedCategory'])
-
+const equipMainTypeList = dictStore.getDictMap[DICT_TYPE.PRESSURE2_EQUIP_MAIN_TYPE]
 const queryParams = reactive<Recordable>({
   pageNo: 1,
   pageSize: 10,

yudao-ui-admin-vue3/src/views/pressure2/rejectionInquiry/RefuseYearCheckTab.vue

@@ -42,13 +42,15 @@
               </el-form-item>
             </el-col>
             <el-col v-bind="ElColSpanConfig">
-              <el-form-item class="w-full" label="单位名称" prop="unitName">
-                <el-input
-                  class="w-full"
-                  v-model="queryParams.unitName"
-                  placeholder="请输入单位名称"
-                  clearable
-                />
+              <el-form-item class="w-full" label="设备类型" prop="equipMainType">
+                <el-select v-model="queryParams.equipMainType" placeholder="请选择设备类型" clearable>
+                  <el-option
+                    v-for="dict in equipMainTypeList"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col v-bind="ElColSpanConfig">
@@ -121,35 +123,19 @@
                 </el-form-item>
               </el-col>
               <el-col v-bind="ElColSpanConfig">
-                <el-form-item class="w-full" label="提交时间" prop="submitTime">
-                  <el-date-picker
-                    v-model="queryParams.submitTime"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                    type="daterange"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-                    class="w-full"
-                  />
-                </el-form-item>
-              </el-col>
-               <el-col v-bind="ElColSpanConfig">
-                <el-form-item class="w-full" label="下次定检时间" prop="nextCheckDate">
-                  <el-date-picker
-                    v-model="queryParams.nextCheckDate"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                    type="daterange"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+                <el-form-item class="w-full" label="单位名称" prop="unitName">
+                  <el-input
                     class="w-full"
+                    v-model="queryParams.unitName"
+                    placeholder="请输入单位名称"
+                    clearable
                   />
                 </el-form-item>
               </el-col>
-             <el-col v-bind="ElColSpanConfig">
-                <el-form-item class="w-full" label="下次年检时间" prop="nextYearCheckDate">
+              <el-col v-bind="ElColSpanConfig">
+                <el-form-item class="w-full" label="提交时间" prop="submitTime">
                   <el-date-picker
-                    v-model="queryParams.nextYearCheckDate"
+                    v-model="queryParams.submitTime"
                     value-format="YYYY-MM-DD HH:mm:ss"
                     type="daterange"
                     start-placeholder="开始日期"
@@ -159,6 +145,32 @@
                   />
                 </el-form-item>
               </el-col>
+<!--               <el-col v-bind="ElColSpanConfig">-->
+<!--                <el-form-item class="w-full" label="下次检验时间" prop="nextCheckDate">-->
+<!--                  <el-date-picker-->
+<!--                    v-model="queryParams.nextCheckDate"-->
+<!--                    value-format="YYYY-MM-DD HH:mm:ss"-->
+<!--                    type="daterange"-->
+<!--                    start-placeholder="开始日期"-->
+<!--                    end-placeholder="结束日期"-->
+<!--                    :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"-->
+<!--                    class="w-full"-->
+<!--                  />-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
+<!--             <el-col v-bind="ElColSpanConfig">-->
+<!--                <el-form-item class="w-full" label="下次年检时间" prop="nextYearCheckDate">-->
+<!--                  <el-date-picker-->
+<!--                    v-model="queryParams.nextYearCheckDate"-->
+<!--                    value-format="YYYY-MM-DD HH:mm:ss"-->
+<!--                    type="daterange"-->
+<!--                    start-placeholder="开始日期"-->
+<!--                    end-placeholder="结束日期"-->
+<!--                    :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"-->
+<!--                    class="w-full"-->
+<!--                  />-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
             </el-row>
           </el-collapse-transition>
         </el-form>
@@ -217,9 +229,9 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="设备分类" align="center" prop="equipMainType" min-width="120">
+        <el-table-column label="设备类型" align="center" prop="equipMainType" min-width="120">
           <template #default="{ row }">
-            {{ PressureEquipMainTypeMap[row.equipMainType] }}
+            {{ equipMainTypeList.find((x) => x.value == row.equipMainType)?.label || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="区域" align="center" prop="equipDistrictName" min-width="130" />
@@ -340,6 +352,7 @@ import {
 } from './constants'
 import { useRefuseActions } from './composables/useRefuseActions'
 import {PressureEquipMainTypeMap} from "@/utils/constants";
+import {DICT_TYPE} from "@/utils/dict";
 
 defineOptions({ name: 'RefuseYearCheckTab' })
 
@@ -349,7 +362,7 @@ const list = ref<AppointmentConfirmOrderRefuseItemVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const dictStore = useDictStore()
 const getReasonDictStatus = computed(() => dictStore.getDictMap['refuseInspectedCategory'] || [])
-
+const equipMainTypeList = dictStore.getDictMap[DICT_TYPE.PRESSURE2_EQUIP_MAIN_TYPE]
 // 使用拒检操作 composable
 const { loading, handleReturnRecord, handleReturn } = useRefuseActions()