fix: 操作费相关页面bug修复

src/common/components/base/CustomForm.vue

@@ -144,6 +144,7 @@ export default {
                   placeholder={item.placeholder || `请输入${item.name}`}
                   clearable
                   step={item.step || 1}
+                  min={item.min ?? -Infinity}
                   controls-position={item.position || 'right'}
                   style="width: 100%;"></el-input-number>
               )}
@@ -180,15 +181,15 @@ export default {
                   clearable
                   style="width: 100%;"></el-date-picker>
               )}
-              {item.type === 'radio' &&
-                item.radioOptions?.map((el, idx) => (
-                  <el-radio
-                    v-model={this.formData[item.prop]}
-                    label={el.value}
-                    key={idx}>
+              {item.type === 'radio' && (
+                <el-radio-group v-model={this.formData[item.prop]}>
+                  {item.radioOptions?.map((el, idx) => (
+                    <el-radio label={el.value} key={idx}>
                       {el.label}
                     </el-radio>
                   ))}
+                </el-radio-group>
+              )}
             </el-form-item>
           )
         })}

src/views/saasManage/indexPage.vue

@@ -584,7 +584,6 @@ export default {
   async created() {
     this.cloneEditForm = JSON.parse(JSON.stringify(this.editForm))
     await this.getList()
-    await this.getStatusList()
     await this.getOperationFee()
   },
   methods: {
@@ -719,6 +718,7 @@ export default {
         background: 'rgba(0, 0, 0, 0.3)'
       })
       try {
+        await this.getStatusList()
         const res = await getDataById(row.id)
         const parts = /^(.*)(\.(([^.]+)\.([^.]+)))$/.exec(res.data.domain)
         if (parts) {

src/views/system/operationFee.vue

@@ -122,7 +122,7 @@ export default {
             {
               required: true,
               message: '请选择服务类型',
-              trigger: 'blur'
+              trigger: 'change'
             }
           ]
         },
@@ -131,11 +131,35 @@ export default {
           type: 'inputNumber',
           name: '固定费用',
           step: 0.01,
+          min: 0,
           renderRules: (item) => [
             {
               required: true,
               message: '请输入固定费用',
-              trigger: 'blur'
+              trigger: 'change'
+            }
+          ],
+          isShow: (formData) => formData.type === 1
+        },
+        {
+          prop: 'unitType',
+          type: 'radio',
+          name: '计算单位',
+          radioOptions: [
+            {
+              value: 'order',
+              label: '按单'
+            },
+            {
+              value: 'product',
+              label: '按数量'
+            }
+          ],
+          renderRules: (item) => [
+            {
+              required: true,
+              message: '请选择计算单位',
+              trigger: 'change'
             }
           ],
           isShow: (formData) => formData.type === 1
@@ -145,11 +169,12 @@ export default {
           type: 'inputNumber',
           name: '起收费用',
           step: 0.01,
+          min: 0,
           renderRules: (item) => [
             {
               required: true,
               message: '请输入起收费用',
-              trigger: 'blur'
+              trigger: 'change'
             }
           ],
           isShow: (formData) => formData.type === 2
@@ -159,11 +184,12 @@ export default {
           type: 'inputNumber',
           name: '每件加收',
           step: 0.01,
+          min: 0,
           renderRules: (item) => [
             {
               required: true,
               message: '请输入每件加收',
-              trigger: 'blur'
+              trigger: 'change'
             }
           ],
           isShow: (formData) => formData.type === 2
@@ -173,11 +199,21 @@ export default {
           type: 'inputNumber',
           name: '上限费用 ',
           step: 0.01,
-          renderRules: (item) => [
+          min: 0,
+          renderRules: (formData) => [
             {
               required: true,
               message: '请输入上限费用',
-              trigger: 'blur'
+              trigger: 'change'
+            },
+            {
+              validator: (rule, value, callback) => {
+                if (Number(value) <= Number(formData.startFee)) {
+                  callback(new Error('上限费用必须大于起收费用'))
+                } else {
+                  callback()
+                }
+              }
             }
           ],
           isShow: (formData) => formData.type === 2
@@ -227,6 +263,20 @@ export default {
           width: '150'
         },
         {
+          label: '计算单位 ',
+          key: 'unitType',
+          width: '100',
+          render: (item) => (
+            <span key={item.id}>
+              {item.unitType === 'order' ? (
+                <el-tag type="danger">按单</el-tag>
+              ) : item.unitType === 'product' ? (
+                <el-tag type="primary">按数量</el-tag>
+              ) : null}
+            </span>
+          )
+        },
+        {
           label: '起收费用',
           key: 'startFee',
           width: '150'
@@ -337,7 +387,7 @@ export default {
       try {
         if (id) {
           this.is_title = 2
-          const url = '/serviceManagement/get'
+          const url = '/operationFeeManagement/get'
           const res = await axios.get(url, { params: { id } })
 
           this.formData = { ...res.data }
@@ -363,10 +413,11 @@ export default {
             name: '',
             id: '',
             type: '',
-            fixedFee: '',
-            startFee: '',
-            incrementalFee: '',
-            endFee: ''
+            fixedFee: 0,
+            startFee: 0,
+            incrementalFee: 0,
+            endFee: 0,
+            unitType: 'order'
           }
           for (const key in params) {
             params[key] = this.formData[key]
@@ -374,7 +425,6 @@ export default {
           resolve(params)
         })
       ])
-      console.log(isValid, postData)
 
       return { isValid, postData }
     },
@@ -388,7 +438,6 @@ export default {
       try {
         const { isValid, postData } = await this.checkData()
         if (isValid) {
-          console.log('add', this.formData)
           const finalData = isAdd ? { ...postData, id: undefined } : postData
           const res = await axios.post(url, finalData)
           if (res.code !== 200) {