约检确认调整

yudao-ui-admin-vue3/src/views/pressure2/acceptorder/boilerDetail.vue

@@ -712,7 +712,8 @@
 
       <template #footer>
         <div class="flex justify-end items-center">
-          <!-- 拒绝约检：只在拒绝原因=检验项目调整(6)时显示"无需上报"按钮，不进入上报中心，只在约检单中删除设备 -->
+          <!-- 拒绝约检：拒绝原因=检验项目调整(6)时只显示"无需上报"(不进入上报中心，只在约检单中删除设备)；其他原因显示"上报市局" -->
+          <el-button v-if="rejectForm.reasonDict != '6'" type="primary" :loading="rejectLoading" @click="handleRejectConfirm(100)">上报市局</el-button>
           <el-button v-if="rejectForm.reasonDict == '6'" type="warning" @click="handleRejectConfirm(300)">无需上报</el-button>
           <el-button @click="rejectDialogVisible = false">取消</el-button>
         </div>

yudao-ui-admin-vue3/src/views/pressure2/acceptorder/pipeDetail.vue

@@ -648,7 +648,8 @@
 
       <template #footer>
         <div class="flex justify-end items-center">
-          <!-- 拒绝约检：只在拒绝原因=检验项目调整(6)时显示"无需上报"按钮，不进入上报中心，只在约检单中删除设备 -->
+          <!-- 拒绝约检：拒绝原因=检验项目调整(6)时只显示"无需上报"(不进入上报中心，只在约检单中删除设备)；其他原因显示"上报市局" -->
+          <el-button v-if="rejectForm.reasonDict != '6'" type="primary" :loading="rejectLoading" @click="handleRejectConfirm(100)">上报市局</el-button>
           <el-button v-if="rejectForm.reasonDict == '6'" type="warning" @click="handleRejectConfirm(300)">无需上报</el-button>
           <el-button @click="rejectDialogVisible = false">取消</el-button>
         </div>

yudao-ui-admin-vue3/src/views/pressure2/boilerchecker/get-checkitem.js

@@ -0,0 +1,45 @@
+// get-checkitem.js
+
+const url =
+  'http://192.168.20.70:28081/api/taskequipment_gd?apiKey=cecb02cf8d1c7be3a05987d6acc6d913666d9cb72cc061039ffb19ecaead1bb9&TABLENAME=boilerequipment'
+
+async function main() {
+  const response = await fetch(url)
+
+  if (!response.ok) {
+    throw new Error(`请求失败：${response.status} ${response.statusText}`)
+  }
+
+  const result = await response.json()
+
+  const checkItemMap = new Map()
+
+  ;(result.data || []).forEach((item) => {
+    if (!item.CHECKITEM || !item.ITEMCODES) return
+
+    const names = item.CHECKITEM.split(',')
+    const codes = item.ITEMCODES.split(',')
+
+    codes.forEach((code, index) => {
+      const itemCode = code.trim()
+      const itemName = names[index]?.trim()
+
+      // 按 code 去重，最终输出 code:name 格式
+      if (itemCode && itemName) {
+        checkItemMap.set(itemCode, itemName)
+      }
+    })
+  })
+
+  const checkItems = Array.from(checkItemMap, ([code, name]) => `${code}:${name}`)
+
+  console.log('项目总数：', checkItems.length)
+  console.log(checkItems)
+
+  // 如果需要换行显示，可以打开下面这行
+  // console.log(checkItems.join('\n'))
+}
+
+main().catch((error) => {
+  console.error('获取 CHECKITEM 失败：', error)
+})

yudao-ui-admin-vue3/src/views/pressure2/boilerchecker/get-checkitem_2.js

@@ -0,0 +1,46 @@
+// get-checkitem.js
+
+const url =
+  // 'http://192.168.20.70:28081/api/taskequipment_gd?apiKey=cecb02cf8d1c7be3a05987d6acc6d913666d9cb72cc061039ffb19ecaead1bb9&TYPECODE=DD&TABLENAME=pipeequipmentdetail'
+  'http://192.168.20.70:28081/api/taskequipment_gd?apiKey=cecb02cf8d1c7be3a05987d6acc6d913666d9cb72cc061039ffb19ecaead1bb9&TABLENAME=pipeequipmentdetail'
+
+async function main() {
+  const response = await fetch(url)
+
+  if (!response.ok) {
+    throw new Error(`请求失败：${response.status} ${response.statusText}`)
+  }
+
+  const result = await response.json()
+
+  const checkItemMap = new Map()
+
+  ;(result.data || []).forEach((item) => {
+    if (!item.CHECKITEM || !item.ITEMCODES) return
+
+    const names = item.CHECKITEM.split(',')
+    const codes = item.ITEMCODES.split(',')
+
+    codes.forEach((code, index) => {
+      const itemCode = code.trim()
+      const itemName = names[index]?.trim()
+
+      // 按 code 去重，最终输出 code:name 格式
+      if (itemCode && itemName) {
+        checkItemMap.set(itemCode, itemName)
+      }
+    })
+  })
+
+  const checkItems = Array.from(checkItemMap, ([code, name]) => `${code}:${name}`)
+
+  console.log('项目总数：', checkItems.length)
+  console.log(checkItems)
+
+  // 如果需要换行显示，可以打开下面这行
+  // console.log(checkItems.join('\n'))
+}
+
+main().catch((error) => {
+  console.error('获取 CHECKITEM 失败：', error)
+})

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

@@ -988,7 +988,8 @@
       </el-form-item>
     </el-form>
     <template #footer>
-      <!-- 拒绝约检：只在拒绝原因=检验项目调整(6)时显示"无需上报"按钮，不进入上报中心，只在约检单中删除设备 -->
+      <!-- 拒绝约检：拒绝原因=检验项目调整(6)时只显示"无需上报"(不进入上报中心，只在约检单中删除设备)；其他原因显示"上报市局" -->
+      <el-button v-if="formData.reasonDict != '6'" @click="submitForm" type="primary" :disabled="formLoading">上报市局</el-button>
       <el-button v-if="formData.reasonDict == '6'" @click="submitFormNoReport" :disabled="formLoading" style="background-color: #F56C6C; border-color: #F56C6C; color: #ffffff;">无需上报</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>

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

@@ -476,7 +476,8 @@
 
       <template #footer>
         <div class="flex justify-end items-center">
-          <!-- 拒绝约检：只在拒绝原因=检验项目调整(6)时显示"无需上报"按钮，不进入上报中心，只在约检单中删除设备 -->
+          <!-- 拒绝约检：拒绝原因=检验项目调整(6)时只显示"无需上报"(不进入上报中心，只在约检单中删除设备)；其他原因显示"上报市局" -->
+          <el-button v-if="rejectForm.reasonDict != '6'" type="primary" :loading="rejectLoading" @click="handleRejectConfirm(100)">上报市局</el-button>
           <el-button v-if="rejectForm.reasonDict == '6'" type="warning" @click="handleRejectConfirm(300)">无需上报</el-button>
           <el-button @click="rejectDialogVisible = false">取消</el-button>
         </div>

yudao-ui-admin-vue3/src/views/pressure2/orderConfirm/boilerDetail.vue

@@ -614,7 +614,8 @@
 
       <template #footer>
         <div class="flex justify-end items-center">
-          <!-- 拒绝约检：只在拒绝原因=检验项目调整(6)时显示"无需上报"按钮，不进入上报中心，只在约检单中删除设备 -->
+          <!-- 拒绝约检：拒绝原因=检验项目调整(6)时只显示"无需上报"(不进入上报中心，只在约检单中删除设备)；其他原因显示"上报市局" -->
+          <el-button v-if="rejectForm.reasonDict != '6'" type="primary" :loading="rejectLoading" @click="handleRejectConfirm(100)">上报市局</el-button>
           <el-button v-if="rejectForm.reasonDict == '6'" type="warning" :loading="rejectLoading" @click="handleRejectConfirm(300)">无需上报</el-button>
           <el-button @click="rejectDialogVisible = false">取消</el-button>
         </div>

yudao-ui-admin-vue3/src/views/pressure2/orderConfirm/pipeDetail.vue

@@ -658,7 +658,8 @@
 
       <template #footer>
         <div class="flex justify-end items-center">
-          <!-- 拒绝约检：只在拒绝原因=检验项目调整(6)时显示"无需上报"按钮，不进入上报中心，只在约检单中删除设备 -->
+          <!-- 拒绝约检：拒绝原因=检验项目调整(6)时只显示"无需上报"(不进入上报中心，只在约检单中删除设备)；其他原因显示"上报市局" -->
+          <el-button v-if="rejectForm.reasonDict != '6'" type="primary" :loading="rejectLoading" @click="handleRejectConfirm(100)">上报市局</el-button>
           <el-button v-if="rejectForm.reasonDict == '6'" type="warning" :loading="rejectLoading" @click="handleRejectConfirm(300)">无需上报</el-button>
           <el-button @click="rejectDialogVisible = false">取消</el-button>
         </div>

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

@@ -1003,7 +1003,8 @@
       </el-form-item>
     </el-form>
     <template #footer>
-      <!-- 拒绝约检：只在拒绝原因=检验项目调整(6)时显示"无需上报"按钮，不进入上报中心，只在约检单中删除设备 -->
+      <!-- 拒绝约检：拒绝原因=检验项目调整(6)时只显示"无需上报"(不进入上报中心，只在约检单中删除设备)；其他原因显示"上报市局" -->
+      <el-button v-if="formData.reasonDict != '6'" @click="submitForm" type="primary" :disabled="formLoading">上报市局</el-button>
       <el-button v-if="formData.reasonDict == '6'" @click="submitFormNoReport" :disabled="formLoading" style="background-color: #F56C6C; border-color: #F56C6C; color: #ffffff;">无需上报</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>

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

@@ -540,7 +540,8 @@
 
       <template #footer>
         <div class="flex justify-end items-center">
-          <!-- 拒绝约检：只在拒绝原因=检验项目调整(6)时显示"无需上报"按钮，不进入上报中心，只在约检单中删除设备 -->
+          <!-- 拒绝约检：拒绝原因=检验项目调整(6)时只显示"无需上报"(不进入上报中心，只在约检单中删除设备)；其他原因显示"上报市局" -->
+          <el-button v-if="rejectForm.reasonDict != '6'" type="primary" :loading="rejectLoading" @click="handleRejectConfirm(100)">上报市局</el-button>
           <el-button v-if="rejectForm.reasonDict == '6'" type="warning" @click="handleRejectConfirm(300)">无需上报</el-button>
           <el-button @click="rejectDialogVisible = false">取消</el-button>
         </div>