只能非合同收费

yudao-ui-admin-vue3/src/views/pressure/acceptorder/detail.vue

@@ -291,7 +291,7 @@
             <!-- 收费形式 feeType -->
             <el-form-item label="收费形式" prop="feeType">
               <el-radio-group v-model="formData.feeType">
-                <el-radio v-for="(item, key) in PressureFeeTypeMap" :key="key" :value="key" :label="item" :disabled="key == PressureFeeType.CONTRACT_DEDUCT"/>
+                <el-radio label="100">非合同收费</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -415,7 +415,7 @@
             </el-form-item>
             <el-form-item label="收费类型" prop="feeType">
               <el-select v-model="formData.feeType" class="!w-full">
-                <el-option v-for="(item, key) in PressureFeeTypeMap" :key="key" :label="item" :value="key" />
+                <el-option label="非合同收费" :value="100" />
               </el-select>
             </el-form-item>
             <el-form-item label="实收金额">

yudao-ui-admin-vue3/src/views/pressure/acceptorder/index.vue

@@ -260,10 +260,7 @@ import { PressureEquipMainTypeMap, allCheckTypeMap } from '@/utils/constants'
       width: 120,
       search: {
         type: 'select',
-        options: Object.entries(feeTypeMap).map(([value, label]) => ({
-          label,
-          value: parseInt(value)  // 确保值是数字类型
-        }))
+        options: [{ label: '非合同收费', value: 100 }]
       },
       render: (row, value) => {return !value ? '-' : feeTypeMap[value]}
     },

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

@@ -282,7 +282,7 @@
             <!-- 收费形式 feeType -->
             <el-form-item label="收费形式" prop="feeType">
               <el-radio-group v-model="formData.feeType">
-                <el-radio v-for="(item, key) in PressureFeeTypeMap" :key="key" :value="key" :label="item"/>
+                <el-radio label="100">非合同收费</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -399,7 +399,7 @@
             </el-form-item>
             <el-form-item label="收费类型" prop="feeType">
               <el-select v-model="formData.feeType" class="!w-full">
-                <el-option v-for="(item, key) in PressureFeeTypeMap" :key="key" :label="item" :value="key" />
+                <el-option label="非合同收费" :value="100" />
               </el-select>
             </el-form-item>
             <el-form-item label="实收金额">

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

@@ -230,10 +230,7 @@
       width: 120,
       search: {
         type: 'select',
-        options: Object.entries(feeTypeMap).map(([value, label]) => ({
-          label,
-          value: parseInt(value)  // 确保值是数字类型
-        }))
+        options: [{ label: '非合同收费', value: 100 }]
       },
       render: (row, value) => {return !value ? '-' : feeTypeMap[value]}
     },

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

@@ -282,7 +282,7 @@
             <!-- 收费形式 feeType -->
             <el-form-item label="收费形式" prop="feeType">
               <el-radio-group v-model="formData.feeType">
-                <el-radio v-for="(item, key) in PressureFeeTypeMap" :key="key" :value="key" :label="item"/>
+                <el-radio label="100">非合同收费</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>

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

@@ -229,10 +229,7 @@
       width: 120,
       search: {
         type: 'select',
-        options: Object.entries(feeTypeMap).map(([value, label]) => ({
-          label,
-          value: parseInt(value)  // 确保值是数字类型
-        }))
+        options: [{ label: '非合同收费', value: 100 }]
       },
       render: (row, value) => {return !value ? '-' : feeTypeMap[value]}
     },

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

@@ -153,7 +153,7 @@
             <el-col :span="24">
               <el-form-item label="收费形式" prop="feeType" label-width="120px">
                 <el-radio-group v-model="formData.feeType" disabled>
-                  <el-radio v-for="(item, key) in PressureFeeTypeMap" :key="key" :value="key" :label="item" />
+                  <el-radio label="100">非合同收费</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>

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

@@ -195,7 +195,7 @@
             <!-- 收费形式 feeType -->
             <el-form-item label="收费形式" prop="feeType" label-width="120px">
               <el-radio-group v-model="formData.feeType">
-                <el-radio v-for="(item, key) in PressureFeeTypeMap" :key="key" :value="key" :label="item"/>
+                <el-radio label="100">非合同收费</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>

yudao-ui-admin-vue3/src/views/pressure2/equipboilerscheduling/components/BoilerPlanScheduleDialog.vue

@@ -72,7 +72,6 @@
                 <el-select v-model="formData.inChargeType" placeholder="请选择收费形式"
                            class="!w-120px">
                   <el-option label="非合同收费" value="1"/>
-                  <el-option label="合同收费" value="2"/>
                 </el-select>
                 <span class="text-gray-600">是否免征:</span>
                 <el-select v-model="formData.inIsExempt" placeholder="请选择是否免征"
@@ -129,7 +128,6 @@
                 <el-select v-model="formData.outChargeType" placeholder="请选择收费形式"
                            class="!w-120px">
                   <el-option label="非合同收费" value="1"/>
-                  <el-option label="合同收费" value="2"/>
                 </el-select>
                 <span class="text-gray-600">是否免征:</span>
                 <el-select v-model="formData.outIsExempt" placeholder="请选择是否免征"
@@ -187,7 +185,6 @@
                 <el-select v-model="formData.preChargeType" placeholder="请选择收费形式"
                            class="!w-120px">
                   <el-option label="非合同收费" value="1"/>
-                  <el-option label="合同收费" value="2"/>
                 </el-select>
                 <span class="text-gray-600">是否免征:</span>
                 <el-select v-model="formData.preIsExempt" placeholder="请选择是否免征"

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

@@ -328,7 +328,7 @@
             <!-- 收费形式 feeType -->
             <el-form-item label="收费形式" prop="feeType">
               <el-radio-group v-model="formData.feeType">
-                <el-radio v-for="(item, key) in PressureFeeTypeMap" :key="key" :value="key" :label="item"/>
+                <el-radio label="100">非合同收费</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>

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

@@ -569,7 +569,7 @@
             <!-- 收费形式 feeType -->
             <el-form-item label="收费形式" prop="feeType">
               <el-radio-group v-model="formData.feeType">
-                <el-radio v-for="(item, key) in PressureFeeTypeMap" :key="key" :value="key" :label="item"/>
+                <el-radio label="100">非合同收费</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>

yudao-ui-admin-vue3/src/views/pressure2/pipescheduling/components/PipePlanScheduleDialog.vue

@@ -69,7 +69,6 @@
                 <el-select v-model="formData.legalChargeType" placeholder="请选择收费形式"
                            class="!w-120px">
                   <el-option label="非合同收费" value="1"/>
-                  <el-option label="合同收费" value="2"/>
                 </el-select>
                 <span class="text-gray-600">是否免征:</span>
                 <el-select v-model="formData.legalIsExempt" placeholder="请选择是否免征"
@@ -124,7 +123,6 @@
                 <el-select v-model="formData.yearChargeType" placeholder="请选择收费形式"
                            class="!w-120px">
                   <el-option label="非合同收费" value="1"/>
-                  <el-option label="合同收费" value="2"/>
                 </el-select>
                 <span class="text-gray-600">应收法定金额: {{ formData.yearShouldAmount }}</span>
                 <span class="text-gray-600">服务收费金额: {{ formData.yearServiceAmount }}</span>

yudao-ui-admin-vue3/src/views/pressure2/pipescheduling/components/PipePlanScheduleEquipDialog.vue

@@ -159,7 +159,6 @@
             <el-form-item label="收费形式" prop="feeType">
               <el-radio-group v-model="formData.feeType">
                 <el-radio label="100">非合同收费</el-radio>
-                <el-radio label="200">合同收费</el-radio>
               </el-radio-group>
             </el-form-item>
 
@@ -368,7 +367,7 @@ const formData = ref({
   // 收费性质
   feeNature: '',
   // 收费形式
-  feeType: '',
+  feeType: '100',
   // 收费总金额
   actualAmount: 0,
 })
@@ -699,7 +698,7 @@ const openDialogVisible = (type = '') => {
       annualCheckTeamList: [],
       feeNature:  '',
       actualAmount:  0,
-      feeType:  ''
+      feeType:  '100'
     }
   })
 }

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

@@ -153,7 +153,7 @@
             <el-col :span="24">
               <el-form-item label="收费形式" prop="feeType" label-width="120px">
                 <el-radio-group v-model="formData.feeType" disabled>
-                  <el-radio v-for="(item, key) in PressureFeeTypeMap" :key="key" :value="key" :label="item" />
+                  <el-radio label="100">非合同收费</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>

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

@@ -195,7 +195,7 @@
             <!-- 收费形式 feeType -->
             <el-form-item label="收费形式" prop="feeType" label-width="120px">
               <el-radio-group v-model="formData.feeType">
-                <el-radio v-for="(item, key) in PressureFeeTypeMap" :key="key" :value="key" :label="item"/>
+                <el-radio label="100">非合同收费</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>

yudao-ui-admin-vue3/src/views/pressure2/planNew/components/PlanScheduleEquipBoilerDialog.vue

@@ -200,7 +200,6 @@
             <el-form-item label="收费形式" prop="feeType">
               <el-radio-group v-model="formData.feeType">
                 <el-radio label="100">非合同收费</el-radio>
-                <el-radio label="200">合同收费</el-radio>
               </el-radio-group>
             </el-form-item>
 
@@ -393,7 +392,7 @@ const formData = ref({
   // 收费性质
   feeNature: '',
   // 收费形式
-  feeType: '',
+  feeType: '100',
   // 收费总金额
   actualAmount: 0,
 })
@@ -762,7 +761,7 @@ const openDialogVisible = (type = '') => {
       pressureIsOrderConfirm: true,
       feeNature:  '',
       actualAmount:  0,
-      feeType:  ''
+      feeType:  '100'
     }
   })
 }

yudao-ui-admin-vue3/src/views/pressure2/planNew/components/PlanScheduleEquipPipeDialog.vue

@@ -141,7 +141,6 @@
             <el-form-item label="收费形式" prop="feeType">
               <el-radio-group v-model="formData.feeType">
                 <el-radio label="100">非合同收费</el-radio>
-                <el-radio label="200">合同收费</el-radio>
               </el-radio-group>
             </el-form-item>
 
@@ -327,7 +326,7 @@ const formData = ref({
   // 收费性质
   feeNature: '',
   // 收费形式
-  feeType: '',
+  feeType: '100',
   // 收费总金额
   actualAmount: 0,
 })
@@ -584,7 +583,7 @@ const openDialogVisible = (type = '') => {
     annualIsOrderConfirm:true,
     feeNature:  '',
     actualAmount:  0,
-    feeType:  ''
+    feeType:  '100'
   }
 
   // 在重置表单后清除校验状态