管道使用登记表调整

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

@@ -34,8 +34,8 @@
 <script lang="tsx" setup>
 import SmartTable from '@/components/SmartTable/SmartTable'
 import {
-  BoilerAppointmentConfirmOrderRefuseItemApi,
-  BoilerAppointmentConfirmOrderRefuseItemVO
+  AppointmentConfirmOrderRefuseItemApi,
+  AppointmentConfirmOrderRefuseItemVO
 } from '@/api/pressure2/appointmentconfirmorderrefuseitem'
 import { has, get } from 'lodash'
 import { useRouter } from 'vue-router'
@@ -56,7 +56,7 @@ const pageNo = ref(1)
 const pageSize = ref(10)
 const total = ref(0)
 const searchFormData = ref({})
-const selectRow = ref<BoilerAppointmentConfirmOrderRefuseItemVO[]>([]) // table选中的checked
+const selectRow = ref<AppointmentConfirmOrderRefuseItemVO[]>([]) // table选中的checked
 const smartTableRef = ref<SmartInstanceExpose>()
 const equipCategoryList = ref([])
 
@@ -423,7 +423,7 @@ const getList = async () => {
   }
   try {
     const data =
-      await BoilerAppointmentConfirmOrderRefuseItemApi.getAppointmentConfirmOrderRefuseItemPage(params)
+      await AppointmentConfirmOrderRefuseItemApi.getAppointmentConfirmOrderRefuseItemPage(params)
     tableData.value = data.list
     total.value = data.total
   } catch (error) {
@@ -433,13 +433,13 @@ const getList = async () => {
 }
 
 /** 退回操作 */
-const handleReject = async (row: BoilerAppointmentConfirmOrderRefuseItemVO) => {
+const handleReject = async (row: AppointmentConfirmOrderRefuseItemVO) => {
   ElMessageBox.confirm('确认退回？', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning'
   }).then(() => {
-    BoilerAppointmentConfirmOrderRefuseItemApi.rollback({
+    AppointmentConfirmOrderRefuseItemApi.rollback({
       id: row.id,
       scene: row.scene,
       businessType: 1
@@ -454,7 +454,7 @@ const handleReject = async (row: BoilerAppointmentConfirmOrderRefuseItemVO) => {
 
 /**批量退回 */
 const handleBatchReturn = async () => {
-  const selectedRows: BoilerAppointmentConfirmOrderRefuseItemVO[] =
+  const selectedRows: AppointmentConfirmOrderRefuseItemVO[] =
     smartTableRef.value?.getTableRef().getSelectionRows() || []
   if (!selectedRows.length) return ElMessage.warning('请选择数据')
   const yearCheckIdVOS = selectedRows.map((row) => {
@@ -470,7 +470,7 @@ const handleBatchReturn = async () => {
     type: 'warning'
   }).then(() => {
     loading.value = true
-    BoilerAppointmentConfirmOrderRefuseItemApi.batchRollback({ yearCheckIdVOS })
+    AppointmentConfirmOrderRefuseItemApi.batchRollback({ yearCheckIdVOS })
       .then((res) => {
         if (res) {
           ElMessage.success('批量退回成功')
@@ -488,7 +488,7 @@ const handleReturnRecord = async () => {
 }
 /**备注 */
 const remarkFormRef = ref<InstanceType<typeof RefuseAnnualInspectionRemarkForm>>()
-const handleRemark = (row: BoilerAppointmentConfirmOrderRefuseItemVO) => {
+const handleRemark = (row: AppointmentConfirmOrderRefuseItemVO) => {
   remarkFormRef.value?.open('备注', row.id)
 }
 
@@ -524,7 +524,7 @@ const handleExport = async () => {
   }
   // 获取excel文件流
   const result =
-    await BoilerAppointmentConfirmOrderRefuseItemApi.exportExcelAppointmentConfirmOrder(params)
+    await AppointmentConfirmOrderRefuseItemApi.exportExcelAppointmentConfirmOrder(params)
 
   const downloadUrl = window.URL.createObjectURL(result)
   const a = document.createElement('a')
@@ -572,7 +572,7 @@ const handleUpdateReportCityStatus = async (row?: any, value?: any) => {
 }
 //获取容器归类
 const getEquipCategoryDictData = async () => {
-  const res = await BoilerAppointmentConfirmOrderRefuseItemApi.getEquipCategoryDictData({
+  const res = await AppointmentConfirmOrderRefuseItemApi.getEquipCategoryDictData({
     pageNo: 1,
     pageSize: 9999,
     label: '',
@@ -589,7 +589,7 @@ const handleEditRemark = (row) => {
 }
 const handleSaveRemark = async (row?: any) => {
   const result =
-    await BoilerAppointmentConfirmOrderRefuseItemApi.updateAppointmentConfirmOrderStatusOrRemark({
+    await AppointmentConfirmOrderRefuseItemApi.updateAppointmentConfirmOrderStatusOrRemark({
       ids: [row.id],
       remark: row.remark
     })

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

@@ -100,7 +100,10 @@
           <el-row class="form-group" :gutter="24">
             <el-col :span="8">
               <el-form-item label="检验部门" prop="deptId">
-                <el-input v-model="formData.deptName" placeholder="检验部门" />
+                <DeptSelect
+                  v-model="formData.deptId"
+                  placeholder="请选择部门"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -231,6 +234,7 @@ import {
   PressureFeeTypeMap,
   PressureBoilerCheckTypeMap
 } from '@/utils/constants'
+import DeptSelect from "@/views/pressure2/equipboilerscheduling/components/DeptSelect.vue";
 
 defineOptions({ name: 'BoilerTaskOrderDetailViewDialog' })
 
@@ -289,7 +293,7 @@ const formData = ref({
   useUnitZipcode: '',
   useUnitContact: '',
   useUnitPhone: '',
-  deptName: '',
+  deptId: '',
   deptPhone: '',
   checkDate: '',
   feeNature: '',
@@ -349,7 +353,7 @@ const initFormData = () => {
     useUnitZipcode: data.useUnitZipcode || '',
     useUnitContact: data.useUnitContact || '',
     useUnitPhone: data.useUnitPhone || '',
-    deptName: data.deptName || '',
+    deptId: data.deptId || '',
     deptPhone: data.deptPhone || '',
     checkDate: dateVal,
     feeNature: String(data.feeNature || ''),

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

@@ -1158,7 +1158,7 @@ const submitAcceptance = async (reason: string) => {
       ...formData.value,
       checkDate: formData.value.checkDate,
       unitName: orderDetail.value?.unitName,
-      unitAddress: orderDetail.value?.unitAddress,
+      unitAddress: formData.value.unitAddress,
       unitContact: formData.value.unitContact,
       //unitContactDept: formData.value.unitContactDept,
       unitPhone: formData.value.unitPhone,

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

@@ -100,7 +100,10 @@
           <el-row class="form-group" :gutter="24">
             <el-col :span="8">
               <el-form-item label="检验部门" prop="deptId">
-                <el-input v-model="formData.deptName" placeholder="检验部门" />
+                <DeptSelect
+                  v-model="formData.deptId"
+                  placeholder="请选择部门"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -236,6 +239,7 @@ import {
   PressureFeeTypeMap,
   PressurePipeCheckTypeMap
 } from '@/utils/constants'
+import DeptSelect from "@/views/pressure2/equipboilerscheduling/components/DeptSelect.vue";
 
 defineOptions({ name: 'PipeTaskOrderDetailViewDialog' })
 
@@ -288,7 +292,7 @@ const formData = ref({
   useUnitZipcode: '',
   useUnitContact: '',
   useUnitPhone: '',
-  deptName: '',
+  deptId:'',
   deptPhone: '',
   checkDate: '',
   feeNature: '',
@@ -348,7 +352,7 @@ const initFormData = () => {
     useUnitZipcode: data.useUnitZipcode || '',
     useUnitContact: data.useUnitContact || '',
     useUnitPhone: data.useUnitPhone || '',
-    deptName: data.deptName || '',
+    deptId: data.deptId || '',
     deptPhone: data.deptPhone || '',
     checkDate: dateVal,
     feeNature: String(data.feeNature || ''),

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

@@ -1322,7 +1322,7 @@ const submitAcceptance = async (reason: string) => {
       ...formData.value,
       checkDate: formData.value.checkDate,
       unitName: orderDetail.value?.unitName,
-      unitAddress: orderDetail.value?.unitAddress,
+      unitAddress: formData.value.unitAddress,
       unitContact: formData.value.unitContact,
       //unitContactDept: formData.value.unitContactDept,
       unitPhone: formData.value.unitPhone,