解决冲突

src/views/finance/charge/index.vue

@@ -505,9 +505,9 @@
             v-model="queryParams.chargingMethod"
             placeholder="请选择收费方式"
             clearable
+            :disabled="notChange"
             style="width: 200px"
             size="small"
-            :disabled="notChange"
           >
             <el-option
               v-for="(dict, index) in methodOptions"
@@ -564,6 +564,7 @@
             v-model="queryParams.fSystemType"
             placeholder="请选择业务类型"
             size="small"
+            :disabled="notChange"
             style="width: 200px"
             disabled
           >

src/views/finance/payment/index.vue

@@ -421,8 +421,8 @@
             placeholder="请选择收费方式"
             clearable
             style="width: 200px"
-            size="small"
             :disabled="notChange"
+            size="small"
           >
             <el-option
               v-for="(dict, index) in methodOptions"
@@ -478,7 +478,7 @@
             v-model="queryParams.fSystemType"
             placeholder="请选择业务类型"
             size="small"
-            disabled
+            :disabled="notChange"
             style="width: 200px"
           >
             <el-option